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 4f56ce0 (Aug 21st 2023) #1013

Merged
merged 6 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,19 @@ build:coverage --define=ENVOY_CONFIG_COVERAGE=1
build:coverage --cxxopt="-DENVOY_CONFIG_COVERAGE=1"
build:coverage --test_env=HEAPCHECK=
build:coverage --combined_report=lcov
build:coverage --strategy=TestRunner=sandboxed,local
build:coverage --strategy=TestRunner=remote,sandboxed,local
build:coverage --strategy=CoverageReport=sandboxed,local
build:coverage --experimental_use_llvm_covmap
build:coverage --experimental_generate_llvm_lcov
build:coverage --experimental_split_coverage_postprocessing
build:coverage --experimental_fetch_all_coverage_outputs
build:coverage --collect_code_coverage
build:coverage --instrumentation_filter="^//source(?!/common/quic/platform)[/:],^//envoy[/:],^//contrib(?!/.*/test)[/:]"
build:coverage --remote_download_toplevel
build:coverage --remote_download_minimal
build:coverage --define=tcmalloc=gperftools
build:coverage --define=no_debug_info=1
build:coverage --linkopt=-Wl,-s
build:coverage --test_env=ENVOY_IP_TEST_VERSIONS=v4only

build:test-coverage --test_arg="-l trace"
build:test-coverage --test_arg="--log-path /dev/null"
Expand Down Expand Up @@ -490,7 +496,7 @@ build:rbe-engflow --remote_cache=grpcs://envoy.cluster.engflow.com
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 --experimental_credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:rbe-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:rbe-engflow --grpc_keepalive_time=30s
build:rbe-engflow --remote_timeout=3600s
build:rbe-engflow --bes_timeout=3600s
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.1
6.3.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 = "8004b60fc9902f65b58c4a9153eb065d1a4152dc"
ENVOY_SHA = "030d940a0eab63eacc21c9b0b1296ac8f2313a13fc01c54138be83443dbb2ccb"
ENVOY_COMMIT = "4f56ce072beb86d9195da8df879e9aae7311db75"
ENVOY_SHA = "a33da8b42f7fca066ff1d5c7383eacf35cc3a181240b6f7c0e759cc0207887cc"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
1 change: 1 addition & 0 deletions ci/run_envoy_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ docker run --rm \
-e BAZEL_EXTRA_TEST_OPTIONS \
-e BAZEL_FAKE_SCM_REVISION \
-e BAZEL_REMOTE_CACHE \
-e BAZEL_STARTUP_EXTRA_OPTIONS \
-e CI_TARGET_BRANCH \
-e DOCKERHUB_USERNAME \
-e DOCKERHUB_PASSWORD \
Expand Down
1 change: 1 addition & 0 deletions include/nighthawk/adaptive_load/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ envoy_basic_cc_library(
"//api/adaptive_load:adaptive_load_proto_cc_proto",
"@com_google_absl//absl/status",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/common:pure_lib",
],
)

Expand Down
1 change: 1 addition & 0 deletions include/nighthawk/sink/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ envoy_basic_cc_library(
deps = [
"//api/client:grpc_service_lib",
"@envoy//envoy/common:base_includes",
"@envoy//envoy/common:pure_lib",
"@envoy//source/common/common:statusor_lib_with_external_headers",
],
)
6 changes: 3 additions & 3 deletions source/client/stream_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void StreamDecoder::decodeHeaders(Envoy::Http::ResponseHeaderMapPtr&& headers, b
response_headers_ = std::move(headers);
response_header_sizes_statistic_.addValue(response_headers_->byteSize());
const uint64_t response_code = Envoy::Http::Utility::getResponseStatus(*response_headers_);
stream_info_.response_code_ = static_cast<uint32_t>(response_code);
stream_info_.setResponseCode(static_cast<uint32_t>(response_code));
if (!latency_response_header_name_.empty()) {
const auto timing_header_name = Envoy::Http::LowerCaseString(latency_response_header_name_);
const Envoy::Http::HeaderMap::GetResult& timing_header =
Expand Down Expand Up @@ -69,9 +69,9 @@ void StreamDecoder::onComplete(bool success) {
if (success && measure_latencies_) {
latency_statistic_.addValue((time_source_.monotonicTime() - request_start_).count());
// At this point StreamDecoder::decodeHeaders() should have been called.
if (stream_info_.response_code_.has_value()) {
if (stream_info_.responseCode().has_value()) {
decoder_completion_callback_.exportLatency(
stream_info_.response_code_.value(),
stream_info_.responseCode().value(),
(time_source_.monotonicTime() - request_start_).count());
} else {
ENVOY_LOG_EVERY_POW_2(warn, "response_code is not available in onComplete");
Expand Down