merge fix

Signed-off-by: Kuat Yessenov <kuat@google.com>

Author: kyessenov

.azure-pipelines/stage/linux.yml

@@ -26,6 +26,9 @@ parameters:
 - name: bazelBuildExtraOptions
   type: string
   default: ""
+- name: bazelConfigRBE
+  type: string
+  default: --config=remote-ci --config=rbe-google --jobs=$(RbeJobs)
 
 - name: managedAgent
   type: boolean
@@ -63,6 +66,7 @@ jobs:
       managedAgent: ${{ parameters.managedAgent }}
       ciTarget: $(target.value)
       cacheName: "release"
+      bazelConfigRBE: ${{ parameters.bazelConfigRBE }}
       bazelBuildExtraOptions: ${{ parameters.bazelBuildExtraOptions }}
       cacheTestResults: ${{ parameters.cacheTestResults }}
       cacheVersion: $(cacheKeyBazel)

.azure-pipelines/stages.yml

@@ -70,6 +70,7 @@ stages:
   - template: stage/linux.yml
     parameters:
       cacheTestResults: ${{ parameters.cacheTestResults }}
+      bazelConfigRBE: --config=remote-ci --config=rbe-google --jobs=200
       pool: envoy-x64-large
       # these are parsed differently and _must_ be expressed in this way
       runBuild: variables['RUN_BUILD']

.github/dependabot.yml

@@ -227,6 +227,12 @@ updates:
     interval: daily
     time: "06:00"
 
+- package-ecosystem: "gomod"
+  directory: "/contrib/golang/filters/http/test/test_data/action"
+  schedule:
+    interval: daily
+    time: "06:00"
+
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/buffer"
   schedule:

.github/workflows/mobile-compile_time_options.yml

@@ -74,6 +74,7 @@ jobs:
              --copt=-fno-unwind-tables \
              --copt=-fno-exceptions \
              --define=google_grpc=disabled \
+             --define=envoy_mobile_xds=disabled \
              //test/performance:test_binary_size //library/cc/...
 
   cc_test:
@@ -100,8 +101,8 @@ jobs:
             --test_output=all \
             --config=mobile-remote-ci \
             --define=signal_trace=disabled \
-            --define=envoy_mobile_request_compression=disabled \
             --define=google_grpc=disabled \
+            --define=envoy_mobile_xds=disabled \
             --@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
             $TARGETS
 
@@ -130,10 +131,10 @@ jobs:
             --config=ios \
             --config=mobile-remote-ci-macos \
             --define=signal_trace=disabled \
-            --define=envoy_mobile_request_compression=disabled \
             --define=envoy_mobile_stats_reporting=disabled \
             --define=envoy_mobile_swift_cxx_interop=disabled \
             --define=google_grpc=disabled \
+            --define=envoy_mobile_xds=disabled \
             --@envoy//bazel:http3=False \
             --@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
             //library/swift:ios_framework
@@ -168,9 +169,9 @@ jobs:
             --config=mobile-remote-ci-macos \
             --fat_apk_cpu=x86_64 \
             --define=signal_trace=disabled \
-            --define=envoy_mobile_request_compression=disabled \
             --define=envoy_enable_http_datagrams=disabled \
             --define=google_grpc=disabled \
+            --define=envoy_mobile_xds=disabled \
             --define=envoy_yaml=disabled \
             --@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
             //:android_dist

.github/workflows/mobile-core.yml

@@ -34,8 +34,8 @@ jobs:
       image: ${{ needs.env.outputs.build_image_ubuntu }}
     steps:
     - uses: actions/checkout@v4
-    - name: Ensure no listener leaks
-      run: rm source/extensions/listener_managers/listener_manager/listener_manager_impl.h
+    - name: Avoid dependencies leaking back in
+      run: rm source/extensions/listener_managers/listener_manager/listener_manager_impl.h source/common/quic/http_datagram_handler.h
     - name: Add safe directory
       run: git config --global --add safe.directory /__w/envoy/envoy
     - name: 'Run tests'

.github/workflows/mobile-perf.yml

@@ -29,6 +29,8 @@ jobs:
         CXX: /opt/llvm/bin/clang++
     steps:
     - uses: actions/checkout@v4
+    - name: Ensure files don't leak back into the main binary
+      run: rm source/extensions/listener_managers/listener_manager/listener_manager_impl.h source/server/overload_manager_impl.cc source/common/network/listen_socket_impl.h source/common/network/tcp_listener_impl.h source/server/guarddog_impl.h source/server/watchdog_impl.h source/server/options_impl.cc
     - name: Add safe directory
       run: git config --global --add safe.directory /__w/envoy/envoy
     - name: 'Build test binary'

.github/workflows/mobile-release.yml

@@ -163,16 +163,16 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       working-directory: mobile
       run: |
-        # --define=google_grpc=enabled must be defined last because
-        # --config=mobile-release-android has --define=google_grpc=disabled
+        # --define=envoy_mobile_xds=enabled must be defined last because
+        # --config=mobile-release-android has --define=envoy_mobile_xds=disabled
         version="0.5.0.$(date '+%Y%m%d')"
         ./bazelw build \
           --config=mobile-remote-release-clang \
           --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
           --fat_apk_cpu=x86,x86_64,armeabi-v7a,arm64-v8a \
           --define=pom_version="$version" \
           --config=mobile-release-android \
-          --define=google_grpc=enabled \
+          --define=envoy_mobile_xds=enabled \
           --linkopt=-fuse-ld=lld \
           //:android_xds_dist
     - name: 'Tar artifacts'

.github/workflows/mobile-tsan.yml

@@ -47,4 +47,5 @@ jobs:
         ./bazelw test \
             --test_env=ENVOY_IP_TEST_VERSIONS=v4only \
             --config=mobile-remote-ci-linux-tsan \
-            //test/common/...
+            //test/common/... \
+            //test/cc/...

CODEOWNERS

@@ -32,7 +32,7 @@ extensions/filters/common/original_src @klarose @mattklein123
 # grpc_http1_reverse_bridge http filter extension
 /*/extensions/filters/http/grpc_http1_reverse_bridge @zuercher @mattklein123
 # alts transport socket extension
-/*/extensions/transport_sockets/alts @adisuissa @yangminzhu
+/*/extensions/transport_sockets/alts @adisuissa @matthewstevenson88
 # tcp_stats transport socket extension
 /*/extensions/transport_sockets/tcp_stats @ggreenway @mattklein123
 # tls transport socket extension
@@ -305,10 +305,10 @@ extensions/filters/http/oauth2 @derekargueta @mattklein123
 # Dubbo codec
 /*/extensions/common/dubbo @wbpcode @lizan
 # upstream load balancing policies
-/*/extensions/load_balancing_policies/common @wbpcode @UNOWNED
-/*/extensions/load_balancing_policies/least_request @wbpcode @UNOWNED
-/*/extensions/load_balancing_policies/random @wbpcode @UNOWNED
-/*/extensions/load_balancing_policies/round_robin @wbpcode @UNOWNED
+/*/extensions/load_balancing_policies/common @wbpcode @tonya11en
+/*/extensions/load_balancing_policies/least_request @wbpcode @tonya11en
+/*/extensions/load_balancing_policies/random @wbpcode @tonya11en
+/*/extensions/load_balancing_policies/round_robin @wbpcode @tonya11en
 /*/extensions/load_balancing_policies/ring_hash @wbpcode @UNOWNED
 /*/extensions/load_balancing_policies/maglev @wbpcode @UNOWNED
 /*/extensions/load_balancing_policies/subset @wbpcode @zuercher

CONTRIBUTING.md

@@ -237,18 +237,19 @@ Please note that if adding a runtime guarded feature, your [release notes](chang
 * Typically we try to turn around reviews within one business day.
 * See [OWNERS.md](OWNERS.md) for the current list of maintainers.
 * It is generally expected that a senior maintainer should review every PR to
-  core code. Test-only or extension-only changes need only be reviewed by a
-  maintainer, or senior extension maintainer.
+  core code. Changes which only touch tests, extensions, tools, docs or comments
+  need only be reviewed by a maintainer, or senior extension maintainer.
 * It is also generally expected that a "domain expert" for the code the PR touches should review the
   PR. This person does not necessarily need to have commit access.
-* The previous two points generally mean that every PR should have two approvals. (Exceptions can
-  be made by the senior maintainers).
-* The above rules may be waived for PRs which only update docs or comments, or trivial changes to
-  tests and tools (where trivial is decided by the maintainer in question).
-* In general, we should also attempt to make sure that at least one of the approvals is *from an
+* For new extensions (contrib or otherwise) and features, at least one of the approvals should be *from an
   organization different from the PR author.* E.g., if Lyft authors a PR, at least one approver
   should be from an organization other than Lyft. This helps us make sure that we aren't putting
   organization specific shortcuts into the code.
+  new HTTP/3 features are largely exempt from cross-company approvals as all of the
+  area experts work at a single company, but HTTP/3 changes which impact general
+  functionality still merit a cross-company check.
+* contrib extensions do not need senior maintainer or maintainer review only contrib owner review and
+  a maintainer stamp to merge.
 * If there is a question on who should review a PR please discuss in Slack.
 * Anyone is welcome to review any PR that they want, whether they are a maintainer or not.
 * Please make sure that the PR title, commit message, and description are updated if the PR changes