Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Envoy to 66cc217 (Dec 20, 2024) #1267

Merged
merged 30 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
86a8e19
Update Envoy to 66cc217 (Dec 20, 2024)
sebastianavila5 Dec 20, 2024
ffdcecc
Retrigger CI
sebastianavila5 Dec 20, 2024
588a2a1
Debugging benchmark in pipeline.
sebastianavila5 Dec 21, 2024
dbef6ae
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
4eeffb4
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
bb54df6
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
0d1c393
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
1bbb4b0
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
3e803c6
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
d6d5f97
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
62ef626
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
45fbbff
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
442b552
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
9eee1aa
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
3cf866d
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
8a84959
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
af42203
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
b01b1ca
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
338e700
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
ece7d15
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
4b7e4fa
Debugging benchmark by pusblishing test log artifact
sebastianavila5 Dec 23, 2024
16539f1
Triggering benchmark with bazel 6.5.0
sebastianavila5 Dec 24, 2024
5b0b2fc
Verbose failures
sebastianavila5 Dec 24, 2024
cb46052
printing env
sebastianavila5 Dec 24, 2024
830d9b6
setting log level to debug
sebastianavila5 Dec 24, 2024
7f9235c
Increasing stdout size
sebastianavila5 Dec 25, 2024
459b178
Removing hack
sebastianavila5 Dec 25, 2024
c2b13d7
Removing hack
sebastianavila5 Dec 26, 2024
c1fb674
Removing hack
sebastianavila5 Dec 26, 2024
61841b4
Cleaning up, final commit.
sebastianavila5 Dec 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ build:macos --copt -UDEBUG
# Startup options cannot be selected via config.
startup --host_jvm_args=-Xmx3g

common --noenable_bzlmod

fetch --color=yes
run --color=yes

Expand Down Expand Up @@ -98,6 +100,7 @@ build:clang --action_env=BAZEL_COMPILER=clang
build:clang --linkopt=-fuse-ld=lld
build:clang --action_env=CC=clang --host_action_env=CC=clang
build:clang --action_env=CXX=clang++ --host_action_env=CXX=clang++
build:clang --incompatible_enable_cc_toolchain_resolution=false

# Flags for Clang + PCH
build:clang-pch --spawn_strategy=local
Expand All @@ -123,6 +126,7 @@ build:gcc --cxxopt=-Wno-missing-requires
# not in GCC 11 and GCC 11 is what is used in docker-gcc
# configuration currently
build:gcc --cxxopt=-Wno-unknown-warning
build:gcc --incompatible_enable_cc_toolchain_resolution=false

# Clang-tidy
# TODO(phlax): enable this, its throwing some errors as well as finding more issues
Expand Down Expand Up @@ -232,6 +236,7 @@ build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
build:libc++ --define force_libcpp=enabled
build:clang-libc++ --config=libc++
build:clang-libc++ --action_env=ARFLAGS=r

build:libc++20 --config=libc++
# gRPC has a lot of deprecated-enum-enum-conversion warning. Remove once it is addressed
Expand Down Expand Up @@ -283,6 +288,7 @@ build:cache-local --remote_cache=grpc://localhost:9092

# Remote execution: https://docs.bazel.build/versions/master/remote-execution.html
build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:rbe-toolchain --incompatible_enable_cc_toolchain_resolution=false

build:rbe-toolchain-clang --config=rbe-toolchain
build:rbe-toolchain-clang --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_clang_platform
Expand Down Expand Up @@ -390,7 +396,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request

# Docker sandbox
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:f94a38f62220a2b017878b790b6ea98a0f6c5f9c@sha256:2dd96b6f43c08ccabd5f4747fce5854f5f96af509b32e5cf6493f136e9833649
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:d2be0c198feda0c607fa33209da01bf737ef373f@sha256:026fb6710a3e55716cc1aba129f613f9834212d2deb4ea875ac9d2c37ca19aa3
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
Expand Down Expand Up @@ -559,7 +565,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
common:bes-envoy-engflow --bes_upload_mode=fully_async
common:bes-envoy-engflow --nolegacy_important_outputs
common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:6e494ff9bcfa96868cb43f1200f2126cdab39d62db52a5dda80c8ec1694a93ee
common:rbe-envoy-engflow --jobs=200
common:rbe-envoy-engflow --define=engflow_rbe=true

Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.1.2
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "6c6f6200b7d3236ea1de96dfcf7ac78b81d1452f"
ENVOY_SHA = "c9abbdd6973ebe69cd21989dceed79b56bc81e2a3bab1e6c8db86bbf28e6bec5"
ENVOY_COMMIT = "66cc2175fe5044117c9f00af8d09293012778000"
ENVOY_SHA = "7afe1aca43b540aa6dcddb3c50e87baf087e0f52ea3d9407351726e421b11e53"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/dynamic_benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
sys.path += [os.path.dirname(__file__)]

if __name__ == '__main__':
path = os.path.dirname(os.path.realpath(__file__))
path = os.path.dirname(__file__)
r = pytest.main([
"--rootdir=" + path, "-x", (path + '/dynamic_test/'), "-p", "no:cacheprovider", "--log-level",
"INFO", "--log-cli-level", "INFO", *sys.argv
Expand Down
1 change: 0 additions & 1 deletion ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ fi
export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only ${BAZEL_EXTRA_TEST_OPTIONS}"
export BAZEL_BUILD_OPTIONS=" \
--verbose_failures ${BAZEL_OPTIONS} --action_env=HOME --action_env=PYTHONUSERBASE \
--experimental_local_memory_estimate \
--experimental_generate_json_trace_profile ${BAZEL_BUILD_EXTRA_OPTIONS}"

echo "Running with ${NUM_CPUS} cpus and BAZEL_BUILD_OPTIONS: ${BAZEL_BUILD_OPTIONS}"
Expand Down
4 changes: 1 addition & 3 deletions tools/code_format/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@ paths:
- source/extensions/compression/zstd/common/dictionary_manager.h
- source/extensions/filters/http/adaptive_concurrency/controller
- source/extensions/filters/http/admission_control
- source/extensions/filters/http/api_key_auth
- source/extensions/filters/http/aws_lambda
- source/extensions/filters/http/bandwidth_limit
- source/extensions/filters/http/basic_auth
- source/extensions/filters/http/cache
- source/extensions/filters/http/cdn_loop
Expand All @@ -185,7 +183,6 @@ paths:
- source/extensions/filters/http/grpc_json_reverse_transcoder
- source/extensions/filters/http/grpc_json_transcoder
- source/extensions/filters/http/grpc_stats
- source/extensions/filters/http/header_mutation
- source/extensions/filters/http/header_to_metadata
- source/extensions/filters/http/health_check
- source/extensions/filters/http/ip_tagging
Expand Down Expand Up @@ -477,6 +474,7 @@ visibility_excludes:
- source/extensions/clusters/static/
- source/extensions/clusters/original_dst/
- source/extensions/clusters/logical_dns/
- source/extensions/clusters/dns/
- source/extensions/early_data/BUILD
- source/extensions/filters/http/buffer/BUILD
- source/extensions/filters/network/common/BUILD
Expand Down