Skip to content

Commit 111c02d

Browse files
authored
Update Envoy version to 8817b5f (Apr 6th) (#1516)
- Update NH to the latest Envoy. - Implement `initManager` in `source/client/process_impl.cc` to accommodate envoyproxy/envoy#44100. - Include a `--path` argument to `tools/check_format.sh` to resolve a Bazel failure after running the newly added rust format check in envoyproxy/envoy#44131. - Skip assertion in `source/client/flush_worker_impl.cc` as a workaround to accommodate the newly introduced assertion in envoyproxy/envoy#44015. Signed-off-by: jiajunye <jiajunye@google.com> Signed-off-by: Jason Ye <jiajunye@google.com>
1 parent 9726c0f commit 111c02d

6 files changed

Lines changed: 31 additions & 19 deletions

File tree

.bazelrc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ build:compile-time-options --config=boringssl-fips
225225
build:compile-time-options --define=log_debug_assert_in_release=enabled
226226
build:compile-time-options --define=path_normalization_by_default=true
227227
build:compile-time-options --define=deprecated_features=disabled
228-
build:compile-time-options --define=tcmalloc=gperftools
229228
build:compile-time-options --define=zlib=ng
230229
build:compile-time-options --define=uhv=enabled
231230
# gRPC has a lot of deprecated-enum-enum-conversion warnings with C++20
@@ -254,6 +253,15 @@ common:aws-lc-fips --@envoy//bazel:ssl=@aws_lc//:ssl
254253
common:aws-lc-fips --@envoy//bazel:crypto=@aws_lc//:crypto
255254
common:aws-lc-fips --@envoy//bazel:http3=False
256255

256+
# OpenSSL
257+
common:openssl --//bazel:ssl=//compat/openssl:ssl
258+
common:openssl --//bazel:crypto=//compat/openssl:crypto
259+
common:openssl --copt=-DENVOY_SSL_OPENSSL
260+
common:openssl --host_copt=-DENVOY_SSL_OPENSSL
261+
common:openssl --@envoy//bazel:http3=False
262+
common:openssl --test_tag_filters=-nofips
263+
common:openssl --build_tag_filters=-nofips
264+
257265

258266
#############################################################################
259267
# sanitizers
@@ -406,7 +414,7 @@ build:clang-pch --define=ENVOY_CLANG_PCH=1
406414

407415
# Clang-tidy
408416
build:clang-tidy --@envoy_toolshed//format/clang_tidy:executable=@envoy//tools/clang-tidy
409-
build:clang-tidy --@envoy_toolshed//format/clang_tidy:config=//:clang_tidy_config
417+
build:clang-tidy --@envoy_toolshed//format/clang_tidy:config=@envoy//:clang_tidy_config
410418
build:clang-tidy --aspects @envoy_toolshed//format/clang_tidy:clang_tidy.bzl%clang_tidy_aspect
411419
build:clang-tidy --output_groups=report
412420
build:clang-tidy --build_tag_filters=-notidy

bazel/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3-
ENVOY_COMMIT = "d078b74b140a7b1d610145d8918f2f0b62df73d6"
4-
ENVOY_SHA = "786ad16cf44170d369beb5187bdd2e8d8d7b2372b04328301ee6365ee3ca464c"
3+
ENVOY_COMMIT = "8817b5f1e1cec2b0ca41831ac957befe3381e7bc"
4+
ENVOY_SHA = "6581b652aee216ecb7d5d6831525c2969aaafce8df18818a8d9065dcfc2277ef"
55

66
HDR_HISTOGRAM_C_VERSION = "0.11.8" # June 18th, 2025
77
HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"

source/client/flush_worker_impl.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ void FlushWorkerImpl::shutdownThread() {
3636
}
3737

3838
void FlushWorkerImpl::flushStats() {
39+
Envoy::Thread::SkipAsserts skip;
3940
// Create a snapshot and flush to all sinks. Even if there are no sinks,
4041
// creating the snapshot has the important property that it latches all counters on a periodic
4142
// basis.

source/client/process_impl.cc

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve
208208

209209
Envoy::Regex::Engine& regexEngine() override { return regex_engine_; }
210210

211-
Envoy::Init::Manager& initManager() override {
212-
PANIC("NighthawkServerFactoryContext::initManager not implemented");
213-
};
211+
Envoy::Init::Manager& initManager() override { return server_.initManager(); };
214212

215213
Envoy::Grpc::Context& grpcContext() override { return server_.grpcContext(); };
216214

@@ -274,7 +272,7 @@ class NighthawkServerFactoryContext : public Envoy::Server::Configuration::Serve
274272
class NighthawkServerInstance : public Envoy::Server::Instance {
275273
public:
276274
NighthawkServerInstance(Envoy::OptRef<Envoy::Server::Admin> admin, Envoy::Api::Api& api,
277-
Envoy::Event::Dispatcher& dispatcher,
275+
Envoy::Init::Manager& init_manager, Envoy::Event::Dispatcher& dispatcher,
278276
Envoy::AccessLog::AccessLogManager& log_manager,
279277
Envoy::Server::Options& options, Envoy::Runtime::Loader& runtime,
280278
Envoy::Singleton::Manager& singleton_manager,
@@ -284,11 +282,11 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
284282
Envoy::Grpc::Context& grpc_context, Envoy::Http::Context& http_context,
285283
Envoy::Router::Context& router_context, Envoy::Stats::StoreRoot& store,
286284
Envoy::Secret::SecretManagerImpl& secret_manager)
287-
: admin_(admin), api_(api), dispatcher_(dispatcher), log_manager_(log_manager),
288-
options_(options), runtime_(runtime), singleton_manager_(singleton_manager),
289-
stats_store_(store), tls_(tls), local_info_(local_info),
290-
validation_context_(validation_context), grpc_context_(grpc_context),
291-
http_context_(http_context), router_context_(router_context),
285+
: admin_(admin), api_(api), init_manager_(init_manager), dispatcher_(dispatcher),
286+
log_manager_(log_manager), options_(options), runtime_(runtime),
287+
singleton_manager_(singleton_manager), stats_store_(store), tls_(tls),
288+
local_info_(local_info), validation_context_(validation_context),
289+
grpc_context_(grpc_context), http_context_(http_context), router_context_(router_context),
292290
server_factory_context_(*this),
293291
http_server_properties_cache_manager_(
294292
server_factory_context_, Envoy::ProtobufMessage::getStrictValidationVisitor(), tls),
@@ -331,9 +329,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
331329
Envoy::Server::HotRestart& hotRestart() override {
332330
PANIC("NighthawkServerInstance::hotRestart not implemented");
333331
}
334-
Envoy::Init::Manager& initManager() override {
335-
PANIC("NighthawkServerInstance::initManager not implemented");
336-
}
332+
Envoy::Init::Manager& initManager() override { return init_manager_; }
337333
Envoy::Server::ListenerManager& listenerManager() override {
338334
PANIC("NighthawkServerInstance::listenerManager not implemented");
339335
}
@@ -405,6 +401,7 @@ class NighthawkServerInstance : public Envoy::Server::Instance {
405401
private:
406402
Envoy::OptRef<Envoy::Server::Admin> admin_;
407403
Envoy::Api::Api& api_;
404+
Envoy::Init::Manager& init_manager_;
408405
Envoy::Event::Dispatcher& dispatcher_;
409406
Envoy::AccessLog::AccessLogManager& log_manager_;
410407
Envoy::Server::Options& options_;
@@ -1001,9 +998,9 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const UriPtr& tracing_
1001998
runtime_loader_ = *std::move(loader);
1002999

10031000
server_ = std::make_unique<NighthawkServerInstance>(
1004-
admin_, *api_, *dispatcher_, access_log_manager_, envoy_options_, *runtime_loader_.get(),
1005-
*singleton_manager_, tls_, *local_info_, validation_context_, grpc_context_,
1006-
http_context_, router_context_, store_root_, secret_manager_);
1001+
admin_, *api_, init_manager_, *dispatcher_, access_log_manager_, envoy_options_,
1002+
*runtime_loader_.get(), *singleton_manager_, tls_, *local_info_, validation_context_,
1003+
grpc_context_, http_context_, router_context_, store_root_, secret_manager_);
10071004
ssl_context_manager_ =
10081005
std::make_unique<Envoy::Extensions::TransportSockets::Tls::ContextManagerImpl>(
10091006
server_->serverFactoryContext());

tools/check_format.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ TO_CHECK="${2:-$FULL_CHECK}"
88
# TODO(https://github.com/envoyproxy/nighthawk/issues/165): fully excluding everything
99
# from the build fixer isn't ideal.
1010
bazel run @envoy//tools/code_format:check_format -- \
11+
--path=${PWD} \
1112
--config_path=${PWD}/tools/code_format/config.yaml \
1213
--skip_envoy_build_rule_check --namespace_check Nighthawk \
1314
--build_fixer_check_excluded_paths=$TO_CHECK \

tools/code_format/config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ paths:
4242
- bazel/external/http_parser/
4343
- bazel/rbe/toolchains/configs/
4444
- bazel-
45+
- compat/openssl/
4546
- build
4647
- contrib/contrib_build_config.bzl
4748
- examples/wasm-cc
@@ -105,6 +106,7 @@ paths:
105106
- source/extensions/watchdog/profile_action/config.cc
106107
- source/common/router/route_config_update_receiver_impl.cc
107108
- source/common/upstream/upstream_impl.cc
109+
- source/common/matcher/actions/string_returning_action.cc
108110
- source/common/network/listen_socket_impl.cc
109111
- source/common/network/io_socket_handle_base_impl.cc
110112
- source/common/network/address_impl.cc
@@ -323,9 +325,12 @@ paths:
323325
include:
324326
- api/bazel/cc_proto_descriptor_library/file_descriptor_generator.cc
325327
- contrib/config/source/kv_store_xds_delegate.cc
328+
- contrib/kafka/stat_sinks/source/kafka_stats_sink_impl.cc
326329
- contrib/istio/filters/network/metadata_exchange/source/metadata_exchange.cc
327330
- contrib/istio/filters/network/metadata_exchange/test/metadata_exchange_test.cc
328331
- contrib/istio/filters/http/peer_metadata/source/peer_metadata.cc
332+
- contrib/istio/filters/network/peer_metadata/source/peer_metadata.cc
333+
- contrib/istio/filters/network/peer_metadata/test/peer_metadata_test.cc
329334
- source/common/protobuf/utility.h
330335
- source/common/protobuf/utility.cc
331336
- source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc

0 commit comments

Comments
 (0)