Merge branch 'envoyproxy:main' into master

.azure-pipelines/bazel.yml

@@ -57,7 +57,7 @@ steps:
       BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}"
       BAZEL_REMOTE_CACHE: $(LocalBuildCache)
 
-  displayName: "Run CI script"
+  displayName: "Run CI script ${{ parameters.ciTarget }}"
 
 - bash: |
     echo "disk space at end of build:"

.azure-pipelines/pipelines.yml

@@ -13,57 +13,37 @@ pr: none
 stages:
 - stage: precheck
   jobs:
-  - job: format_pre
+  - job: format
     dependsOn: []
     pool:
       vmImage: "ubuntu-18.04"
     steps:
     - task: Cache@2
       inputs:
-        key: "format_pre | ./WORKSPACE | **/*.bzl"
+        key: "format | ./WORKSPACE | **/*.bzl"
         path: $(Build.StagingDirectory)/repository_cache
       continueOnError: true
 
-    - script: ci/run_envoy_docker.sh 'ci/do_ci.sh format_pre'
+    - script: ci/run_envoy_docker.sh 'ci/do_ci.sh format'
       workingDirectory: $(Build.SourcesDirectory)
       env:
         ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
         BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
         BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
         GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
-      displayName: "Run format pre-checks"
+      displayName: "Run format checks"
     - task: PublishBuildArtifacts@1
       inputs:
-        pathtoPublish: "$(Build.StagingDirectory)/fix_format_pre.diff"
+        pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff"
         artifactName: format
       # not all have fixes so improve condition/handling
       condition: failed()
 
-  - job: tooling
+  - job: proto_format
     dependsOn: []
     pool:
       vmImage: "ubuntu-18.04"
     steps:
-    - task: Cache@2
-      inputs:
-        key: "tooling | ./WORKSPACE | **/*.bzl"
-        path: $(Build.StagingDirectory)/repository_cache
-      continueOnError: true
-
-    - script: ci/run_envoy_docker.sh 'ci/do_ci.sh tooling'
-      workingDirectory: $(Build.SourcesDirectory)
-      env:
-        ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
-        BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
-        BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
-        GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
-      displayName: "Run tooling checks"
-
-  - job: format
-    dependsOn: ["format_pre"]
-    pool:
-      vmImage: "ubuntu-18.04"
-    steps:
     - task: Cache@2
       inputs:
         key: "format | ./WORKSPACE | **/*.bzl"
@@ -81,7 +61,7 @@ stages:
 
     - task: PublishBuildArtifacts@1
       inputs:
-        pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff"
+        pathtoPublish: "$(Build.StagingDirectory)/fix_proto_format.diff"
         artifactName: format
       condition: failed()
 
@@ -204,8 +184,6 @@ stages:
     pool:
       vmImage: "ubuntu-18.04"
     steps:
-    - bash: .azure-pipelines/cleanup.sh
-      displayName: "Removing tools from agent"
     - template: bazel.yml
       parameters:
         ciTarget: bazel.release
@@ -367,8 +345,6 @@ stages:
     pool:
       vmImage: "ubuntu-18.04"
     steps:
-    - bash: .azure-pipelines/cleanup.sh
-      displayName: "Removing tools from agent"
     - bash: |
         echo "disk space at beginning of build:"
         df -h

.github/actions/pr_notifier/requirements.txt

@@ -111,9 +111,9 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via pynacl
-slack-sdk==3.17.0 \
-    --hash=sha256:0816efc43d1d2db8286e8dbcbb2e86fd0f71c206c01c521c2cb054ecb40f9ced \
-    --hash=sha256:860cd0e50c454b955f14321c8c5486a47cc1e0e84116acdb009107f836752feb
+slack-sdk==3.17.2 \
+    --hash=sha256:60302e32d48db6b4ea5453d92f23ecf3f7b843f799f61eaf271315264d7cb281 \
+    --hash=sha256:70d5a55a5d52ba7128d5347ed995425e1f83e729667ab296035bcf6c1b13a049
     # via -r requirements.in
 urllib3==1.26.6 \
     --hash=sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4 \

.github/workflows/codeql-daily.yml

@@ -28,7 +28,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@27ea8f8fe5977c00f5b37e076ab846c5bd783b96
+      uses: github/codeql-action/init@41a4ada31ba866a7f1196b9602703a89edd69e22
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -55,4 +55,4 @@ jobs:
         git clean -xdf
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@27ea8f8fe5977c00f5b37e076ab846c5bd783b96
+      uses: github/codeql-action/analyze@41a4ada31ba866a7f1196b9602703a89edd69e22

.github/workflows/codeql-push.yml

@@ -41,7 +41,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@27ea8f8fe5977c00f5b37e076ab846c5bd783b96
+      uses: github/codeql-action/init@41a4ada31ba866a7f1196b9602703a89edd69e22
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -71,4 +71,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       if: env.BUILD_TARGETS != ''
-      uses: github/codeql-action/analyze@27ea8f8fe5977c00f5b37e076ab846c5bd783b96
+      uses: github/codeql-action/analyze@41a4ada31ba866a7f1196b9602703a89edd69e22

.github/workflows/depsreview.yml

@@ -9,4 +9,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@a9c83d3af6b9031e20feba03b904645bb23d1dab
+        uses: actions/dependency-review-action@1c59cdf2a9c7f29c90e8da32237eb04b81bad9f0

.python-version

@@ -0,0 +1 @@
+3.10

CODEOWNERS

@@ -20,8 +20,6 @@
 extensions/filters/common/original_src @snowp @klarose
 # dubbo_proxy extension
 /*/extensions/filters/network/dubbo_proxy @zyfjeff @lizan @wbpcode
-# thrift_proxy extension
-/*/extensions/filters/network/thrift_proxy @zuercher @rgs1
 # cdn_loop extension
 /*/extensions/filters/http/cdn_loop @justin-mp @penguingao @alyssawilk
 # external processing filter
@@ -31,8 +29,6 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/filters/http/jwt_authn @qiwzhang @lizan
 # grpc_http1_reverse_bridge http filter extension
 /*/extensions/filters/http/grpc_http1_reverse_bridge @snowp @zuercher
-# header_to_metadata extension
-/*/extensions/filters/http/header_to_metadata @rgs1 @zuercher
 # alts transport socket extension
 /*/extensions/transport_sockets/alts @antoniovicente @adisuissa @yangminzhu
 # tcp_stats transport socket extension
@@ -47,6 +43,8 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/transport_sockets/common @alyssawilk @wez470
 # starttls transport socket
 /*/extensions/transport_sockets/starttls @cpakulski @lizan
+# internal upstream transport socket
+/*/extensions/transport_sockets/internal_upstream @kyessenov @lambdai
 # sni_cluster extension
 /*/extensions/filters/network/sni_cluster @rshriram @lizan
 # sni_dynamic_forward_proxy extension
@@ -57,12 +55,12 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/tracers/xray @abaptiste @suniltheta @mattklein123
 # tracers.skywalking extension
 /*/extensions/tracers/skywalking @wbpcode @lizan @Shikugawa
+# tracers.opentelemetry extension
+/*/extensions/tracers/opentelemetry @alexanderellis @htuch
 # quic extension
 /*/extensions/quic/ @alyssawilk @danzh2010 @mattklein123 @mpwarres @wu-bin @ggreenway
 # UDP packet writer
 /*/extensions/udp_packet_writer/ @danzh2010 @RyanTheOptimist @alyssawilk
-# zookeeper_proxy extension
-/*/extensions/filters/network/zookeeper_proxy @rgs1 @snowp
 # redis cluster extension
 /*/extensions/clusters/redis @msukalski @henryyyang @mattklein123 @weisisea
 /*/extensions/common/redis @msukalski @henryyyang @mattklein123 @weisisea
@@ -141,7 +139,7 @@ extensions/filters/common/original_src @snowp @klarose
 # support for on-demand VHDS requests
 /*/extensions/filters/http/on_demand @dmitri-d @htuch @lambdai
 /*/extensions/filters/network/connection_limit @mattklein123 @alyssawilk @delong-coder
-/*/extensions/filters/http/aws_request_signing @rgs1 @derekargueta @mattklein123 @marcomagdy @tonya11en
+/*/extensions/filters/http/aws_request_signing @derekargueta @mattklein123 @marcomagdy @tonya11en
 /*/extensions/filters/http/aws_lambda @mattklein123 @marcomagdy @lavignes @tonya11en
 /*/extensions/filters/http/buffer @alyssawilk @mattklein123
 /*/extensions/transport_sockets/raw_buffer @alyssawilk @mattklein123
@@ -151,10 +149,10 @@ extensions/filters/common/original_src @snowp @klarose
 extensions/upstreams/http @alyssawilk @snowp @mattklein123
 extensions/upstreams/tcp @alyssawilk @ggreenway @mattklein123
 # OAuth2
-extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
+extensions/filters/http/oauth2 @derekargueta @snowp
 # HTTP Local Rate Limit
-/*/extensions/filters/http/local_ratelimit @rgs1 @mattklein123 @wbpcode
-/*/extensions/filters/common/local_ratelimit @mattklein123 @rgs1 @wbpcode
+/*/extensions/filters/http/local_ratelimit @mattklein123 @wbpcode
+/*/extensions/filters/common/local_ratelimit @mattklein123 @wbpcode
 # HTTP Kill Request
 /*/extensions/filters/http/kill_request @qqustc @htuch
 # Rate limit expression descriptor
@@ -177,8 +175,8 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 # HTTP Bandwidth Limit
 /*/extensions/filters/http/bandwidth_limit @nitgoy @mattklein123 @yanavlasov @tonya11en
 # Original IP detection
-/*/extensions/http/original_ip_detection/custom_header @rgs1 @alyssawilk @antoniovicente
-/*/extensions/http/original_ip_detection/xff @rgs1 @alyssawilk @antoniovicente
+/*/extensions/http/original_ip_detection/custom_header @alyssawilk @antoniovicente
+/*/extensions/http/original_ip_detection/xff @alyssawilk @antoniovicente
 # set_metadata extension
 /*/extensions/filters/http/set_metadata @aguinet @snowp
 # Formatters
@@ -224,15 +222,15 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 # local rate limit
 /*/extensions/filters/network/local_ratelimit @mattklein123 @wbpcode
 # proxy protocol
-/*/extensions/filters/listener/proxy_protocol @ggreenway @soulxu @rgs1
+/*/extensions/filters/listener/proxy_protocol @ggreenway @soulxu
 # access loggers
-/*/extensions/access_loggers/grpc @wbpcode @cpakulski @rgs1 @giantcroc @gyohuangxin
+/*/extensions/access_loggers/grpc @wbpcode @cpakulski @giantcroc @gyohuangxin
 # stats
 /*/extensions/stat_sinks/statsd @mattklein123 @suniltheta
 /*/extensions/stat_sinks/common @mattklein123 @suniltheta
 /*/extensions/stat_sinks/common/statsd @mattklein123 @suniltheta
 # access loggers
-/*/extensions/access_loggers/file @wbpcode @cpakulski @rgs1 @giantcroc
+/*/extensions/access_loggers/file @wbpcode @cpakulski @giantcroc
 # Stateful session
 /*/extensions/http/stateful_session/cookie @wbpcode @cpakulski
 /*/extensions/filters/http/stateful_session @wbpcode @cpakulski
@@ -251,35 +249,39 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 # mongo proxy
 /*/extensions/filters/network/mongo_proxy @mythra @giantcroc @mattklein123
 # formatter
-/*/extensions/formatter/req_without_query @alyssawilk @tsaarni @rgs1 @giantcroc
-# IP tagging
-/*/extensions/filters/http/ip_tagging @rgs1 @alyssawilk
+/*/extensions/formatter/req_without_query @alyssawilk @tsaarni @giantcroc
 # cors
 /*/extensions/filters/http/cors @wbpcode @daixiang0
 # Header Validators
 /*/extensions/http/header_validators/envoy_default @yanavlasov @alyssawilk
+# Thrift
+/*/extensions/filters/network/thrift_proxy @zuercher @JuniorHsu
 
 # Intentionally exempt (treated as core code)
 /*/extensions/filters/common @UNOWNED @UNOWNED
 /*/extensions/filters/http/common @UNOWNED @UNOWNED
 /*/extensions/filters/network/common @UNOWNED @UNOWNED
 
-# To be moved to Contrib
-/*/extensions/filters/http/dynamo @UNOWNED @UNOWNED
+# secondary owner needed or moving to contrib next release.
+/*/extensions/filters/http/ip_tagging @alyssawilk @UNOWNED
+/*/extensions/filters/http/header_to_metadata @zuercher @UNOWNED
+/*/extensions/filters/network/zookeeper_proxy @snowp @UNOWNED
 /*/extensions/tracers/lightstep @UNOWNED @UNOWNED
-/*/extensions/filters/network/client_ssl_auth @UNOWNED @UNOWNED
 
 # Contrib
 /contrib/exe/ @mattklein123 @lizan
+/contrib/client_ssl_auth/ @UNOWNED @UNOWNED
 /contrib/common/sqlutils/ @cpakulski @cpakulski
+/contrib/dynamo/ @UNOWNED @UNOWNED
 /contrib/squash/ @yuval-k @alyssawilk
 /contrib/kafka/ @mattklein123 @adamkotwasinski
 /contrib/rocketmq_proxy/ @aaron-ai @lizhanhui @lizan
 /contrib/mysql_proxy/ @rshriram @venilnoronha
 /contrib/postgres_proxy/ @fabriziomello @cpakulski
-/contrib/sxg/ @cpapazian @rgs1 @alyssawilk
+/contrib/sxg/ @cpapazian @alyssawilk
 /contrib/sip_proxy/ @durd07 @nearbyfly @dorisd0102
 /contrib/cryptomb/ @ipuustin @VillePihlava
 /contrib/vcl/ @florincoras @KfreeZ
 /contrib/hyperscan/ @zhxie @soulxu
 /contrib/language/ @diceride @diceride
+/contrib/dlb/ @mattklein123 @daixiang0

OWNERS.md

@@ -90,6 +90,8 @@ contributors to envoy-setec and relevant Slack channels from:
   * Ralf Weinmann ([rpw-x41](https://github.com/rpw-x41))
   * Dr. Andre Vehreschild ([vehre-x41](https://github.com/vehre-x41))
 * Kevin Baichoo ([KBaichoo](https://github.com/KBaichoo)) expiring 12/31/2022. Review fixes for OSS-Fuzz bugs.
+* Boteng Yao ([botengyao](https://github.com/botengyao)) expiring 12/31/2022. Review fixes for OSS-Fuzz bugs.
+* Tianyu Xia ([tyxia](https://github.com/tyxia)) expiring 12/31/2022. Review fixes for OSS-Fuzz bugs.
 
 # Emeritus maintainers