From 92f06450f23c39730c620e268423d5b8cb764247 Mon Sep 17 00:00:00 2001 From: jiajunye Date: Thu, 25 Feb 2021 17:28:14 +0000 Subject: [PATCH 1/2] update Nighthawk to Envoy dependecies Signed-off-by: jiajunye --- .bazelrc | 2 ++ bazel/repositories.bzl | 4 ++-- ci/run_envoy_docker.sh | 4 ++-- source/client/process_impl.cc | 5 ++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bazelrc b/.bazelrc index 6023b902e..c83d8eedc 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 66798f15d..7797bb1d9 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -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" diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index 0ba9c5ec9..e62944c00 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -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[@]}" - \ No newline at end of file + diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index f19f00cfc..a5771c4a1 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -38,6 +38,7 @@ #endif #include "external/envoy/source/extensions/transport_sockets/well_known_names.h" #include "external/envoy/source/server/options_impl_platform.h" +#include "external/envoy/source/server/options_impl.h" #include "api/client/options.pb.h" #include "api/client/output.pb.h" @@ -525,11 +526,13 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const std::vector( 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( 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 From 64dad679f728c6a31dd7d109c5eb7af7dba720a4 Mon Sep 17 00:00:00 2001 From: jiajunye Date: Thu, 25 Feb 2021 17:51:40 +0000 Subject: [PATCH 2/2] fix format Signed-off-by: jiajunye --- source/client/process_impl.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index a5771c4a1..87686f2b3 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -37,8 +37,8 @@ #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_platform.h" #include "external/envoy/source/server/options_impl.h" +#include "external/envoy/source/server/options_impl_platform.h" #include "api/client/options.pb.h" #include "api/client/output.pb.h" @@ -526,8 +526,9 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const std::vector( time_system_); - const char *fake_argv[] = { "", nullptr }; - const Envoy::OptionsImpl envoy_options(1, fake_argv, [](bool) { return "disable"; }, spdlog::level::info); + 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( admin_, Envoy::Runtime::LoaderSingleton::get(), store_root_, tls_, dispatcher_->createDnsResolver({}, false), *ssl_context_manager_, *dispatcher_,