Skip to content

Commit

Permalink
Update Envoy to 8ffdf98 (Oct 28, 2024) (#1245)
Browse files Browse the repository at this point in the history
- Update the ENVOY_COMMIT and ENVOY_SHA in bazel/repositories.bzl to the latest Envoy's commit.
- Update .bazelrc to envoyproxy/envoy#36730 and envoyproxy/envoy#36810
- Update source/client/stream_decoder.cc to match API changes in envoyproxy/envoy#36773
- Update tools/base/requirements.txt dependencies

Signed-off-by: Tom Zhang <[email protected]>
  • Loading branch information
tomjzzhang authored Oct 30, 2024
1 parent e632038 commit 2d0b94f
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 103 deletions.
14 changes: 8 additions & 6 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ build:rbe-engflow --remote_executor=grpcs://envoy.cluster.engflow.com
build:rbe-engflow --bes_backend=grpcs://envoy.cluster.engflow.com/
build:rbe-engflow --bes_results_url=https://envoy.cluster.engflow.com/invocation/
build:rbe-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:rbe-engflow --grpc_keepalive_time=30s
build:rbe-engflow --grpc_keepalive_time=60s
build:rbe-engflow --grpc_keepalive_timeout=30s
build:rbe-engflow --remote_timeout=3600s
build:rbe-engflow --bes_timeout=3600s
build:rbe-engflow --bes_upload_mode=fully_async
Expand All @@ -530,16 +531,17 @@ build:rbe-engflow --nolegacy_important_outputs
# RBE (Engflow Envoy)
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:common-envoy-engflow --grpc_keepalive_time=60s
build:common-envoy-engflow --grpc_keepalive_timeout=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
Expand Down
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 = "421034071875c4bd266b6d0c16cf19a2f0846b5f"
ENVOY_SHA = "4926e67dc5b18291492762f86a48385585719ffc885027375e156d3d5115d3e3"
ENVOY_COMMIT = "8ffdf9857801e53428c6e13757ef113648fcbd2a"
ENVOY_SHA = "ceffb7d7ee75a7891993c2d3115080c24fd99c0fc59bc4ab2e399f702b0c11bb"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 1 addition & 1 deletion source/client/stream_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void StreamDecoder::setupForTracing() {
envoy::extensions::request_id::uuid::v3::UuidRequestIdConfig uuid_request_id_config;
Envoy::Extensions::RequestId::UUIDRequestIDExtension uuid_generator(uuid_request_id_config,
random_generator_);
uuid_generator.set(*headers_copy, true);
uuid_generator.set(*headers_copy, /* edge_request= */ true, /* keep_external_id= */ false);
uuid_generator.setTraceReason(*headers_copy, Envoy::Tracing::Reason::ClientForced);
Envoy::Tracing::HttpTraceContext trace_context(*headers_copy);
active_span_ = tracer_->startSpan(config_, trace_context, stream_info_, tracing_decision);
Expand Down
Loading

0 comments on commit 2d0b94f

Please sign in to comment.