From c9fe76680105b273a6dbf50d18caac1d78f3fa81 Mon Sep 17 00:00:00 2001 From: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> Date: Tue, 4 Aug 2026 14:44:48 +0000 Subject: [PATCH 1/3] Updating Envoy version to 4d6c488 (Aug 3, 2026) Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> --- .github/config.yml | 15 +++++++++++++++ bazel/repositories.bzl | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/config.yml b/.github/config.yml index 18698387d..dc72f4e76 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -35,6 +35,7 @@ checks: on-run: - check-build - check-build-openssl + - check-build-openssl-presubmit - check-coverage - check-runtime - check-san @@ -181,6 +182,20 @@ run: check-build-openssl: paths: - "**/*" + check-build-openssl-presubmit: + paths: + - compat/openssl/**/* + - source/common/tls/**/* + - source/common/crypto/**/* + - source/extensions/transport_sockets/tls/**/* + - test/common/tls/**/* + - test/common/crypto/**/* + - test/extensions/transport_sockets/tls/**/* + - envoy/ssl/**/* + - envoy/extensions/transport_sockets/tls/**/* + - bazel/**/* + - .bazelrc + - ci/do_ci.sh check-coverage: paths: - "**/*" diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index e22446ba2..7bf411b86 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 = "e4532b6349e89f5aa381b6fd3f4e917388bf6bd0" -ENVOY_SHA = "16fcae940c519571ffecdeb1645a0aa5ebb641b218bddb9b4f1f98b1eea5b2fd" +ENVOY_COMMIT = "4d6c488f2889cb7d8a72ab1631d4cf087f356fc8" +ENVOY_SHA = "954a823603f8422a2b6e22e13a75f1a5dff98bd58a89ecaf6299c7ed9accbe15" HDR_HISTOGRAM_C_VERSION = "0.11.8" # June 18th, 2025 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94" From e914db9f0f83393530529e3a630827190736b836 Mon Sep 17 00:00:00 2001 From: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> Date: Tue, 4 Aug 2026 21:42:55 +0000 Subject: [PATCH 2/3] Kick CI Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> From 67404b156f98b75635b52f2c0dc051dd1351b599 Mon Sep 17 00:00:00 2001 From: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> Date: Fri, 7 Aug 2026 18:12:36 +0000 Subject: [PATCH 3/3] Move Envoy::OptionsImplPlatform::getCpuCount() to only be executed if concurrency is set to auto Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com> --- source/client/process_impl.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 3ea580e35..ddb7614c1 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -89,15 +89,17 @@ class BootstrapFactory : public Envoy::Logger::Loggable // Determines the concurrency Nighthawk should use based on configuration // (options) and the available machine resources. static uint32_t determineConcurrency(const Options& options) { - uint32_t cpu_cores_with_affinity = Envoy::OptionsImplPlatform::getCpuCount(); bool autoscale = options.concurrency() == "auto"; - // TODO(oschaaf): Maybe, in the case where the concurrency flag is left out, but - // affinity is set / we don't have affinity with all cores, we should default to autoscale. - // (e.g. we are called via taskset). - uint32_t concurrency = autoscale ? cpu_cores_with_affinity : std::stoi(options.concurrency()); - + uint32_t concurrency; if (autoscale) { + uint32_t cpu_cores_with_affinity = Envoy::OptionsImplPlatform::getCpuCount(); ENVOY_LOG(info, "Detected {} (v)CPUs with affinity..", cpu_cores_with_affinity); + concurrency = cpu_cores_with_affinity; + } else { + // TODO(oschaaf): Maybe, in the case where the concurrency flag is left out, but + // affinity is set / we don't have affinity with all cores, we should default to autoscale. + // (e.g. we are called via taskset). + concurrency = std::stoi(options.concurrency()); } std::string duration_as_string = options.noDuration() ? "No time limit"