Skip to content

Update Envoy to 36e0548 (Feb 24th 2021) #634

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.

Sign up for GitHub

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

Closed
jiajunye wants to merge 3 commits into from
Closed

Update Envoy to 36e0548 (Feb 24th 2021) #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3fe87f
Merge pull request #1 from envoyproxy/main
jiajunye Feb 24, 2021
92f0645
update Nighthawk to Envoy dependecies
jiajunye Feb 25, 2021
64dad67
fix format
jiajunye Feb 25, 2021
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
2 changes: 2 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ build:asan --config=sanitizer
# ASAN install its signal handler, disable ours so the stacktrace will be printed by ASAN
build:asan --define signal_trace=disabled
build:asan --define ENVOY_CONFIG_ASAN=1
build:asan --copt -fsanitize=address,undefined
build:asan --linkopt -fsanitize=address,undefined
# The following two lines were manually edited due to #593. # unique
# Flag undefined was dropped from both the lines to allow CI/ASAN to pass. # unique
build:asan --copt -fsanitize=address # unique
Expand Down
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
View file
Open in desktop
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 = "a96ebf4a9b4dae50c17469c64b179930e57c802e" # Feb 16th, 2021
ENVOY_SHA = "dbfa3325ce843e184950c794f549fbec70663a46e85331f78cf1d4a13aa22398"
ENVOY_COMMIT = "36e05482cc27b4d2b5765fdebcdb5fef16f07d84" # Feb 24th, 2021
ENVOY_SHA = "23e4a32a8754773ad93d8054f7067f24ea5115e4f13885abfb7e6d3058a8ade8"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
4 changes: 2 additions & 2 deletions ci/run_envoy_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ docker run --rm \
-e REPO_URI \
-e SYSTEM_STAGEDISPLAYNAME \
-e SYSTEM_JOBDISPLAYNAME \
-e SYSTEM_PULLREQUEST_PULLREQUESTID \
-e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \
"${ENVOY_BUILD_IMAGE}" \
"${START_COMMAND[@]}"


6 changes: 5 additions & 1 deletion source/client/process_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "external/envoy/source/extensions/tracers/zipkin/zipkin_tracer_impl.h"
#endif
#include "external/envoy/source/extensions/transport_sockets/well_known_names.h"
#include "external/envoy/source/server/options_impl.h"
#include "external/envoy/source/server/options_impl_platform.h"

#include "api/client/options.pb.h"
Expand Down Expand Up @@ -525,11 +526,14 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const std::vector<UriP
ssl_context_manager_ =
std::make_unique<Envoy::Extensions::TransportSockets::Tls::ContextManagerImpl>(
time_system_);
const char* fake_argv[] = {"", nullptr};
const Envoy::OptionsImpl envoy_options(
1, fake_argv, [](bool) { return "disable"; }, spdlog::level::info);
cluster_manager_factory_ = std::make_unique<ClusterManagerFactory>(
admin_, Envoy::Runtime::LoaderSingleton::get(), store_root_, tls_,
dispatcher_->createDnsResolver({}, false), *ssl_context_manager_, *dispatcher_,
*local_info_, secret_manager_, validation_context_, *api_, http_context_, grpc_context_,
router_context_, access_log_manager_, *singleton_manager_);
router_context_, access_log_manager_, *singleton_manager_, envoy_options);
cluster_manager_factory_->setConnectionReuseStrategy(
options_.h1ConnectionReuseStrategy() == nighthawk::client::H1ConnectionReuseStrategy::LRU
? Http1PoolImpl::ConnectionReuseStrategy::LRU
Expand Down