auto-merge envoyproxy/envoy[release/v1.31] into envoyproxy/envoy-open…

…ssl[release/v1.31] * upstream/release/v1.31: ci/rbe: Boost cpu for another flakey integration test repo: Dev v1.31.4 repo: Release v1.31.3 ci: Fix coverage/docs upload redirect path (#36423) build(deps): bump distroless/base-nossl-debian12 from `e130c09` to `aa91f01` in /ci (#36847) bazel/ci: Add repo customizations (#36831) ci/codeql: Only run on main branch (#36806) ci/rbe: Boost quic integration test (#36805) deps/release: Bump Ubuntu -> 0e5e4a5 (#36723) ci/tests: Revert some integration tests to `2core` (#36784) ci/rbe: Switch rbe pools `2core` -> `6gig` (#36761) ocsp/formatting: Fix format issue in generated cert (#36763) test/ocsp: Renew certificates (#36755) ci/rbe: Switch backend RBE cluster (#36730) Signed-off-by: tedjpoole <[email protected]>
envoyproxy · Nov 6, 2024 · 12424e3 · 12424e3
2 parents de293d8 + e5ef1c4
commit 12424e3
Show file tree

Hide file tree

Showing 389 changed files with 1,624 additions and 1,602 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -526,21 +526,20 @@ build:common-envoy-engflow --google_default_credentials=false
 build:common-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
 build:common-envoy-engflow --grpc_keepalive_time=30s
 
-build:cache-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com
+build:cache-envoy-engflow --remote_cache=grpcs://mordenite.cluster.engflow.com
 build:cache-envoy-engflow --remote_timeout=3600s
-build:bes-envoy-engflow --bes_backend=grpcs://morganite.cluster.engflow.com/
-build:bes-envoy-engflow --bes_results_url=https://morganite.cluster.engflow.com/invocation/
+build:bes-envoy-engflow --bes_backend=grpcs://mordenite.cluster.engflow.com/
+build:bes-envoy-engflow --bes_results_url=https://mordenite.cluster.engflow.com/invocation/
 build:bes-envoy-engflow --bes_timeout=3600s
 build:bes-envoy-engflow --bes_upload_mode=fully_async
 build:bes-envoy-engflow --nolegacy_important_outputs
-build:rbe-envoy-engflow --remote_executor=grpcs://morganite.cluster.engflow.com
+build:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
 build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2
 build:rbe-envoy-engflow --jobs=200
 build:rbe-envoy-engflow --define=engflow_rbe=true
 
 build:remote-envoy-engflow --config=common-envoy-engflow
 build:remote-envoy-engflow --config=cache-envoy-engflow
-build:remote-envoy-engflow --config=bes-envoy-engflow
 build:remote-envoy-engflow --config=rbe-envoy-engflow
 
 #############################################################################
@@ -565,6 +564,7 @@ common:debug --config=debug-sandbox
 common:debug --config=debug-coverage
 common:debug --config=debug-tests
 
+try-import %workspace%/repo.bazelrc
 try-import %workspace%/clang.bazelrc
 try-import %workspace%/user.bazelrc
 try-import %workspace%/local_tsan.bazelrc

diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml
@@ -8,9 +8,11 @@ on:
     paths:
     - include/**
     - source/common/**
-    branches-ignore:
-    - dependabot/**
+    branches:
+    - main
   pull_request:
+    branches:
+    - main
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}-${{ github.workflow }}

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.31.3-dev
+1.31.4-dev
diff --git a/changelogs/1.29.10.yaml b/changelogs/1.29.10.yaml
@@ -0,0 +1,6 @@
+date: October 29, 2024
+
+bug_fixes:
+- area: tracing
+  change: |
+    Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present.
diff --git a/changelogs/1.30.7.yaml b/changelogs/1.30.7.yaml
@@ -0,0 +1,6 @@
+date: October 29, 2024
+
+bug_fixes:
+- area: tracing
+  change: |
+    Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present.
diff --git a/changelogs/1.31.3.yaml b/changelogs/1.31.3.yaml
@@ -0,0 +1,6 @@
+date: October 29, 2024
+
+bug_fixes:
+- area: tracing
+  change: |
+    Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present.
diff --git a/changelogs/current.yaml b/changelogs/current.yaml
@@ -8,9 +8,6 @@ minor_behavior_changes:
 
 bug_fixes:
 # *Changes expected to improve the state of the world and are unlikely to have negative effects*
-- area: tracing
-  change: |
-    Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present.
 
 removed_config_or_runtime:
 # *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`

diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy
@@ -1,5 +1,5 @@
 ARG BUILD_OS=ubuntu
-ARG BUILD_TAG=22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe
+ARG BUILD_TAG=22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97
 ARG ENVOY_VRP_BASE_IMAGE=envoy-base
 
 
@@ -58,7 +58,7 @@ COPY --chown=0:0 --chmod=755 \
 
 
 # STAGE: envoy-distroless
-FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:e130c09889f3b6c05dacd52d2612c30811e04eefe3280a6659037cfdd018de6c AS envoy-distroless
+FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:aa91f01b56d02af049a3984dd5dd7c0ea39c97f398ac415cfc92b085bd63f6fd AS envoy-distroless
 EXPOSE 10000
 ENTRYPOINT ["/usr/local/bin/envoy"]
 CMD ["-c", "/etc/envoy/envoy.yaml"]

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -57,6 +57,7 @@ FETCH_PROTO_TARGETS=(
     @com_github_bufbuild_buf//:bin/buf
     //tools/proto_format/...)
 
+
 retry () {
     local n wait iterations
     wait="${1}"

diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
@@ -157,15 +157,14 @@ docker run --rm \
        -e ENVOY_PUBLISH_DRY_RUN \
        -e ENVOY_REPO \
        -e ENVOY_TARBALL_DIR \
-       -e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \
        -e GCS_ARTIFACT_BUCKET \
+       -e GCS_REDIRECT_PATH \
        -e GITHUB_REF_NAME \
        -e GITHUB_REF_TYPE \
        -e GITHUB_TOKEN \
        -e GITHUB_APP_ID \
        -e GITHUB_INSTALL_ID \
        -e MOBILE_DOCS_CHECKOUT_DIR \
-       -e BUILD_SOURCEBRANCHNAME \
        -e BAZELISK_BASE_URL \
        -e ENVOY_BUILD_ARCH \
        -e SYSTEM_STAGEDISPLAYNAME \

diff --git a/contrib/checksum/filters/http/test/BUILD b/contrib/checksum/filters/http/test/BUILD
@@ -11,7 +11,7 @@ envoy_contrib_package()
 envoy_cc_test(
     name = "checksum_filter_test",
     srcs = ["checksum_filter_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/checksum/filters/http/source:checksum_filter_lib",
         "//source/common/buffer:buffer_lib",
@@ -26,7 +26,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "config_test",
     srcs = ["config_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/checksum/filters/http/source:config",
         "//test/mocks/server:factory_context_mocks",

diff --git a/contrib/client_ssl_auth/filters/network/test/BUILD b/contrib/client_ssl_auth/filters/network/test/BUILD
@@ -12,7 +12,7 @@ envoy_cc_test(
     name = "client_ssl_auth_test",
     srcs = ["client_ssl_auth_test.cc"],
     data = glob(["test_data/**"]),
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/client_ssl_auth/filters/network/source:client_ssl_auth",
         "//test/mocks/network:network_mocks",
@@ -29,7 +29,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "config_test",
     srcs = ["config_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/client_ssl_auth/filters/network/source:config",
         "//source/common/protobuf:utility_lib",

diff --git a/contrib/cryptomb/private_key_providers/test/BUILD b/contrib/cryptomb/private_key_providers/test/BUILD
@@ -50,7 +50,7 @@ envoy_cc_test(
     data = [
         "//contrib/cryptomb/private_key_providers/test/test_data:certs",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":test_fake_factory",
         "//source/common/common:random_generator_lib",

diff --git a/contrib/dlb/test/BUILD b/contrib/dlb/test/BUILD
@@ -14,7 +14,7 @@ envoy_cc_test(
         "//bazel:linux_x86_64": ["config_test.cc"],
         "//conditions:default": [],
     }),
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/dlb/source:connection_balancer",
         "//source/common/protobuf:utility_lib",

diff --git a/contrib/dynamo/filters/http/test/BUILD b/contrib/dynamo/filters/http/test/BUILD
@@ -47,7 +47,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "config_test",
     srcs = ["config_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/dynamo/filters/http/source:config",
         "//test/mocks/server:factory_context_mocks",

diff --git a/contrib/exe/BUILD b/contrib/exe/BUILD
@@ -30,7 +30,7 @@ SELECTED_CONTRIB_EXTENSIONS = select({
 
 envoy_cc_binary(
     name = "envoy-static",
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     stamped = True,
     visibility = ["//visibility:public"],
     deps = ["//source/exe:envoy_main_entry_lib"] + SELECTED_CONTRIB_EXTENSIONS,
@@ -48,7 +48,7 @@ envoy_cc_test(
         "DISABLE_TEST_MERGE": "true",
         "GODEBUG": "cgocheck=0",
     },
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//test/config_test:example_configs_test_lib",
     ] + SELECTED_CONTRIB_EXTENSIONS,

diff --git a/contrib/generic_proxy/filters/network/test/BUILD b/contrib/generic_proxy/filters/network/test/BUILD
@@ -26,7 +26,7 @@ envoy_cc_test(
     srcs = [
         "route_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
         "//contrib/generic_proxy/filters/network/source:route_lib",
@@ -45,7 +45,7 @@ envoy_cc_test(
     srcs = [
         "proxy_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
         "//contrib/generic_proxy/filters/network/source:proxy_lib",
@@ -64,7 +64,7 @@ envoy_cc_test(
     srcs = [
         "config_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
         "//contrib/generic_proxy/filters/network/source:config",
@@ -88,7 +88,7 @@ envoy_cc_test(
     srcs = [
         "integration_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     tags = [
         "cpu:3",
     ],
@@ -120,7 +120,7 @@ envoy_cc_test(
     srcs = [
         "match_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
         "//contrib/generic_proxy/filters/network/source:match_lib",
@@ -133,7 +133,7 @@ envoy_cc_test(
     srcs = [
         "access_log_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
         "//contrib/generic_proxy/filters/network/source:access_log_lib",

diff --git a/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD b/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD
@@ -13,7 +13,7 @@ envoy_cc_test(
     srcs = [
         "config_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/generic_proxy/filters/network/source/codecs/dubbo:config",
         "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks",

diff --git a/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD b/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD
@@ -13,7 +13,7 @@ envoy_cc_test(
     srcs = [
         "config_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/generic_proxy/filters/network/source/codecs/http1:config",
         "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks",

diff --git a/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD b/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD
@@ -13,7 +13,7 @@ envoy_cc_test(
     srcs = [
         "config_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/generic_proxy/filters/network/source/codecs/kafka:config",
         "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks",

diff --git a/contrib/generic_proxy/filters/network/test/mocks/BUILD b/contrib/generic_proxy/filters/network/test/mocks/BUILD
@@ -12,7 +12,7 @@ envoy_cc_mock(
     name = "filter_mocks",
     srcs = ["filter.cc"],
     hdrs = ["filter.h"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/generic_proxy/filters/network/source/interface:config_interface",
         "//contrib/generic_proxy/filters/network/source/interface:filter_interface",

diff --git a/contrib/generic_proxy/filters/network/test/router/BUILD b/contrib/generic_proxy/filters/network/test/router/BUILD
@@ -13,7 +13,7 @@ envoy_cc_test(
     srcs = [
         "router_test.cc",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/generic_proxy/filters/network/source/router:router_lib",
         "//contrib/generic_proxy/filters/network/test:fake_codec_lib",

diff --git a/contrib/golang/filters/http/test/BUILD b/contrib/golang/filters/http/test/BUILD
@@ -16,7 +16,7 @@ envoy_cc_test(
     data = [
         "//contrib/golang/filters/http/test/test_data/passthrough:filter.so",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/filters/http/source:config",
         "//test/mocks/server:factory_context_mocks",
@@ -31,7 +31,7 @@ envoy_cc_test(
         "//contrib/golang/filters/http/test/test_data/passthrough:filter.so",
         "//contrib/golang/filters/http/test/test_data/routeconfig:filter.so",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/filters/http/source:golang_filter_lib",
         "//source/common/stream_info:stream_info_lib",
@@ -62,7 +62,7 @@ envoy_cc_test(
         "//contrib/golang/filters/http/test/test_data/property:filter.so",
         "//contrib/golang/filters/http/test/test_data/routeconfig:filter.so",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/filters/http/source:config",
         "//source/exe:main_common_lib",
@@ -88,7 +88,7 @@ envoy_cc_fuzz_test(
     name = "golang_filter_fuzz_test",
     srcs = ["golang_filter_fuzz_test.cc"],
     corpus = "golang_filter_corpus",
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         ":golang_filter_fuzz_proto_cc_proto",
         "//contrib/golang/common/dso/test:dso_mocks",
@@ -110,7 +110,7 @@ envoy_cc_test(
     data = [
         "//contrib/golang/filters/http/test/test_data/websocket:filter.so",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     tags = [
         "cpu:3",
     ],

diff --git a/contrib/golang/filters/network/test/BUILD b/contrib/golang/filters/network/test/BUILD
@@ -14,7 +14,7 @@ envoy_cc_test(
     data = [
         "//contrib/golang/filters/network/test/test_data:filter.so",
     ],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/filters/network/source:config",
         "//test/mocks/server:factory_context_mocks",
@@ -26,7 +26,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "filter_test",
     srcs = ["filter_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/common/dso/test:dso_mocks",
         "//contrib/golang/filters/network/source:golang",
@@ -45,7 +45,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "upstream_test",
     srcs = ["upstream_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/common/dso/test:dso_mocks",
         "//contrib/golang/filters/network/source:upstream",

diff --git a/contrib/golang/router/cluster_specifier/test/BUILD b/contrib/golang/router/cluster_specifier/test/BUILD
@@ -15,7 +15,7 @@ envoy_cc_test(
         "//contrib/golang/router/cluster_specifier/test/test_data/simple:plugin.so",
     ],
     env = {"GODEBUG": "cgocheck=0"},
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/golang/router/cluster_specifier/source:config",
         "//source/exe:main_common_lib",

diff --git a/contrib/hyperscan/matching/input_matchers/test/BUILD b/contrib/hyperscan/matching/input_matchers/test/BUILD
@@ -12,7 +12,7 @@ envoy_contrib_package()
 envoy_cc_test(
     name = "config_test",
     srcs = ["config_test.cc"],
-    rbe_pool = "2core",
+    rbe_pool = "6gig",
     deps = [
         "//contrib/hyperscan/matching/input_matchers/source:config",
         "//test/mocks/server:factory_context_mocks",