Envoy update to 467ee8f (Jun 30, 2026) (#1554)

- Update NH to the latest Envoy commit.
- Migrate NH's codebase from absl::optional, absl::nullopt to std::optional, std::nullopt to accommodate envoyproxy/envoy@8873877.
- Suppress nodiscard warnings like what envoyproxy/envoy@6976f62 does.

Signed-off-by: jiajunye <jiajunye@google.com>
Signed-off-by: Jason Ye <jiajunye@google.com>

Author: jiajunye

bazel/repositories.bzl

@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "c8c459d3da9ef0cd02e5bd8dd05bd278614a3306"
-ENVOY_SHA = "514f70c62c740dd0576c2da6177c81d195b81bd1132df384e308b04defc60e30"
+ENVOY_COMMIT = "467ee8f7e8a2eb982d666eff439f180740f48767"
+ENVOY_SHA = "caecbb91f974bddd8770a28be5b57abaf19c7e49d3d075549eaec1409da61f63"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.8"  # June 18th, 2025
 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"

include/nighthawk/client/options.h

@@ -3,6 +3,7 @@
 #include <chrono>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "envoy/common/pure.h"
@@ -20,8 +21,6 @@
 
 #include "api/client/options.pb.h"
 
-#include "absl/types/optional.h"
-
 namespace Nighthawk {
 namespace Client {
 
@@ -39,21 +38,21 @@ class Options {
   virtual std::chrono::seconds duration() const PURE;
   virtual std::chrono::seconds timeout() const PURE;
   // URI is absent when the user specified --multi-target-* instead.
-  virtual absl::optional<std::string> uri() const PURE;
+  virtual std::optional<std::string> uri() const PURE;
 
   // The protocol to encapsulate requests in.
   // Defaults to HTTP/1.1 if the user doesn't make an explicit selection.
   virtual Envoy::Http::Protocol protocol() const PURE;
 
   // The following sets specific protocol options for http3.
-  virtual const absl::optional<envoy::config::core::v3::Http3ProtocolOptions>&
+  virtual const std::optional<envoy::config::core::v3::Http3ProtocolOptions>&
   http3ProtocolOptions() const PURE;
 
   // HTTP CONNECT/CONNECT-UDP Tunneling related options.
   virtual Envoy::Http::Protocol tunnelProtocol() const PURE;
   virtual std::string tunnelUri() const PURE;
   virtual uint32_t encapPort() const PURE;
-  virtual const absl::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
+  virtual const std::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
   tunnelTlsContext() const PURE;
 
   virtual std::string concurrency() const PURE;
@@ -67,9 +66,8 @@ class Options {
   virtual uint32_t requestBodySize() const PURE;
   virtual const envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext&
   tlsContext() const PURE;
-  virtual const absl::optional<envoy::config::core::v3::BindConfig>&
-  upstreamBindConfig() const PURE;
-  virtual const absl::optional<envoy::config::core::v3::TransportSocket>&
+  virtual const std::optional<envoy::config::core::v3::BindConfig>& upstreamBindConfig() const PURE;
+  virtual const std::optional<envoy::config::core::v3::TransportSocket>&
   transportSocket() const PURE;
   virtual uint32_t maxPendingRequests() const PURE;
   virtual uint32_t maxActiveRequests() const PURE;
@@ -82,7 +80,7 @@ class Options {
   virtual nighthawk::client::SequencerIdleStrategy::SequencerIdleStrategyOptions
   sequencerIdleStrategy() const PURE;
   virtual std::string requestSource() const PURE;
-  virtual const absl::optional<envoy::config::core::v3::TypedExtensionConfig>&
+  virtual const std::optional<envoy::config::core::v3::TypedExtensionConfig>&
   requestSourcePluginConfig() const PURE;
   virtual std::string trace() const PURE;
   virtual nighthawk::client::H1ConnectionReuseStrategy::H1ConnectionReuseStrategyOptions
@@ -104,8 +102,8 @@ class Options {
   virtual Envoy::Protobuf::Duration statsFlushIntervalDuration() const PURE;
   virtual std::string responseHeaderWithLatencyInput() const PURE;
 
-  virtual absl::optional<Envoy::SystemTime> scheduled_start() const PURE;
-  virtual absl::optional<std::string> executionId() const PURE;
+  virtual std::optional<Envoy::SystemTime> scheduled_start() const PURE;
+  virtual std::optional<std::string> executionId() const PURE;
   virtual const std::vector<envoy::config::core::v3::TypedExtensionConfig>&
   userDefinedOutputPluginConfigs() const PURE;
 

include/nighthawk/client/output_collector.h

@@ -1,14 +1,13 @@
 #pragma once
 
 #include <memory>
+#include <optional>
 
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"
 
 #include "nighthawk/common/statistic.h"
 
-#include "absl/types/optional.h"
-
 namespace Nighthawk {
 namespace Client {
 
@@ -34,7 +33,7 @@ class OutputCollector {
       absl::string_view name, const std::vector<StatisticPtr>& statistics,
       const std::map<std::string, uint64_t>& counters,
       const std::chrono::nanoseconds execution_duration,
-      const absl::optional<Envoy::SystemTime>& first_acquisition_time,
+      const std::optional<Envoy::SystemTime>& first_acquisition_time,
       const std::vector<nighthawk::client::UserDefinedOutput>& user_defined_output_results) PURE;
   /**
    * Directly sets the output value.

include/nighthawk/common/rate_limiter.h

@@ -2,12 +2,11 @@
 
 #include <chrono>
 #include <memory>
+#include <optional>
 
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"
 
-#include "absl/types/optional.h"
-
 namespace Nighthawk {
 
 /**
@@ -35,9 +34,9 @@ class RateLimiter {
   virtual Envoy::TimeSource& timeSource() PURE;
 
   /**
-   * @return absl::optional<Envoy::SystemTime> Time of the first acquisition, if any.
+   * @return std::optional<Envoy::SystemTime> Time of the first acquisition, if any.
    */
-  virtual absl::optional<Envoy::SystemTime> firstAcquisitionTime() const PURE;
+  virtual std::optional<Envoy::SystemTime> firstAcquisitionTime() const PURE;
 
   /**
    * @return std::chrono::nanoseconds elapsed since the first call to tryAcquireOne(). Used by some
@@ -70,4 +69,4 @@ class DiscreteNumericDistributionSampler {
 
 using DiscreteNumericDistributionSamplerPtr = std::unique_ptr<DiscreteNumericDistributionSampler>;
 
-} // namespace Nighthawk
+} // namespace Nighthawk

source/client/benchmark_client_impl.cc

@@ -110,7 +110,7 @@ BenchmarkClientHttpImpl::BenchmarkClientHttpImpl(
 }
 
 void BenchmarkClientHttpImpl::terminate() {
-  absl::optional<Envoy::Upstream::HttpPoolData> pool_data = pool();
+  std::optional<Envoy::Upstream::HttpPoolData> pool_data = pool();
   if (pool_data.has_value() && pool_data.value().hasActiveConnections()) {
     // We don't report what happens after this call in the output, but latencies may still be
     // reported via callbacks. This may happen after a long time (60s), which HdrHistogram can't
@@ -151,7 +151,7 @@ StatisticPtrMap BenchmarkClientHttpImpl::statistics() const {
 };
 
 bool BenchmarkClientHttpImpl::tryStartRequest(CompletionCallback caller_completion_callback) {
-  absl::optional<Envoy::Upstream::HttpPoolData> pool_data = pool();
+  std::optional<Envoy::Upstream::HttpPoolData> pool_data = pool();
   if (!pool_data.has_value()) {
     return false;
   }

source/client/benchmark_client_impl.h

@@ -147,7 +147,7 @@ class BenchmarkClientHttpImpl : public BenchmarkClient,
   void handleResponseData(const Envoy::Buffer::Instance& response_data) override;
 
   // Helpers
-  absl::optional<::Envoy::Upstream::HttpPoolData> pool() {
+  std::optional<::Envoy::Upstream::HttpPoolData> pool() {
     const auto thread_local_cluster = cluster_manager_->getThreadLocalCluster(cluster_name_);
     Envoy::Upstream::HostConstSharedPtr host =
         Envoy::Upstream::LoadBalancer::onlyAllowSynchronousHostSelection(

source/client/factories_impl.cc

@@ -55,7 +55,6 @@ BenchmarkClientPtr BenchmarkClientFactoryImpl::create(
       api, dispatcher, scope, statistic, options_.protocol(), cluster_manager, tracer, cluster_name,
       request_generator.get(), !options_.openLoop(), options_.responseHeaderWithLatencyInput(),
       std::move(user_defined_output_plugins));
-  auto request_options = options_.toCommandLineOptions()->request_options();
   benchmark_client->setConnectionLimit(options_.connections());
   benchmark_client->setMaxPendingRequests(options_.maxPendingRequests());
   benchmark_client->setMaxActiveRequests(options_.maxActiveRequests());

source/client/options_impl.cc

@@ -3,6 +3,7 @@
 #include <cerrno>
 #include <cstdint>
 #include <exception>
+#include <optional>
 
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
@@ -18,7 +19,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
-#include "absl/types/optional.h"
 #include "fmt/ranges.h"
 
 namespace Nighthawk {
@@ -1094,7 +1094,7 @@ CommandLineOptionsPtr OptionsImpl::toCommandLineOptionsInternal() const {
   }
 
   // Only set the tls context if needed, to avoid a warning being logged about field deprecation.
-  // Ideally this would follow the way transport_socket uses absl::optional below.
+  // Ideally this would follow the way transport_socket uses std::optional below.
   // But as this field is about to get eliminated this minimal effort shortcut may be more suitable.
   if (tls_context_.ByteSizeLong() > 0) {
     *(command_line_options->mutable_tls_context()) = tls_context_;

source/client/options_impl.h

@@ -3,6 +3,7 @@
 #include <chrono>
 #include <cmath>
 #include <cstdint>
+#include <optional>
 #include <string>
 
 #include "nighthawk/client/options.h"
@@ -11,7 +12,6 @@
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
-#include "absl/types/optional.h"
 #include "tclap/CmdLine.h"
 
 namespace Nighthawk {
@@ -36,19 +36,19 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   uint32_t connections() const override { return connections_; }
   std::chrono::seconds duration() const override { return std::chrono::seconds(duration_); }
   std::chrono::seconds timeout() const override { return std::chrono::seconds(timeout_); }
-  absl::optional<std::string> uri() const override { return uri_; }
+  std::optional<std::string> uri() const override { return uri_; }
 
   Envoy::Http::Protocol protocol() const override;
 
   Envoy::Http::Protocol tunnelProtocol() const override;
   std::string tunnelUri() const override { return tunnel_uri_; }
   uint32_t encapPort() const override { return encap_port_; }
-  virtual const absl::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
+  virtual const std::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
   tunnelTlsContext() const override {
     return tunnel_tls_context_;
   }
 
-  const absl::optional<envoy::config::core::v3::Http3ProtocolOptions>&
+  const std::optional<envoy::config::core::v3::Http3ProtocolOptions>&
   http3ProtocolOptions() const override {
     return http3_protocol_options_;
   }
@@ -70,10 +70,10 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   tlsContext() const override {
     return tls_context_;
   };
-  const absl::optional<envoy::config::core::v3::BindConfig>& upstreamBindConfig() const override {
+  const std::optional<envoy::config::core::v3::BindConfig>& upstreamBindConfig() const override {
     return upstream_bind_config_;
   }
-  const absl::optional<envoy::config::core::v3::TransportSocket>& transportSocket() const override {
+  const std::optional<envoy::config::core::v3::TransportSocket>& transportSocket() const override {
     return transport_socket_;
   }
   uint32_t maxPendingRequests() const override { return max_pending_requests_; }
@@ -85,7 +85,7 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
     return sequencer_idle_strategy_;
   }
   std::string requestSource() const override { return request_source_; }
-  const absl::optional<envoy::config::core::v3::TypedExtensionConfig>&
+  const std::optional<envoy::config::core::v3::TypedExtensionConfig>&
   requestSourcePluginConfig() const override {
     return request_source_plugin_config_;
   }
@@ -121,8 +121,8 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   std::string responseHeaderWithLatencyInput() const override {
     return latency_response_header_name_;
   };
-  absl::optional<Envoy::SystemTime> scheduled_start() const override { return scheduled_start_; }
-  absl::optional<std::string> executionId() const override { return execution_id_; }
+  std::optional<Envoy::SystemTime> scheduled_start() const override { return scheduled_start_; }
+  std::optional<std::string> executionId() const override { return execution_id_; }
 
   const std::vector<envoy::config::core::v3::TypedExtensionConfig>&
   userDefinedOutputPluginConfigs() const override {
@@ -140,19 +140,19 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   uint32_t connections_{100};
   uint32_t duration_{5};
   uint32_t timeout_{30};
-  absl::optional<std::string> uri_;
+  std::optional<std::string> uri_;
 
   bool h2_{false}; // Deprecated.
   nighthawk::client::Protocol::ProtocolOptions protocol_{nighthawk::client::Protocol::HTTP1};
-  absl::optional<envoy::config::core::v3::Http3ProtocolOptions> http3_protocol_options_;
+  std::optional<envoy::config::core::v3::Http3ProtocolOptions> http3_protocol_options_;
 
   std::string concurrency_;
 
   // Tunnel related options.
   nighthawk::client::Protocol::ProtocolOptions tunnel_protocol_{nighthawk::client::Protocol::HTTP1};
   std::string tunnel_uri_;
   uint32_t encap_port_{0};
-  absl::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
+  std::optional<envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext>
       tunnel_tls_context_;
 
   nighthawk::client::Verbosity::VerbosityOptions verbosity_{nighthawk::client::Verbosity::WARN};
@@ -167,9 +167,9 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   std::vector<std::string> request_headers_;
   uint32_t request_body_size_{0};
   envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext tls_context_;
-  absl::optional<envoy::config::core::v3::BindConfig> upstream_bind_config_;
-  absl::optional<envoy::config::core::v3::TransportSocket> transport_socket_;
-  absl::optional<envoy::config::core::v3::TypedExtensionConfig> request_source_plugin_config_;
+  std::optional<envoy::config::core::v3::BindConfig> upstream_bind_config_;
+  std::optional<envoy::config::core::v3::TransportSocket> transport_socket_;
+  std::optional<envoy::config::core::v3::TypedExtensionConfig> request_source_plugin_config_;
 
   uint32_t max_pending_requests_{0};
   // This default is based the minimum recommendation for SETTINGS_MAX_CONCURRENT_STREAMS over at
@@ -200,8 +200,8 @@ class OptionsImpl : public Options, public Envoy::Logger::Loggable<Envoy::Logger
   uint32_t stats_flush_interval_{5};
   Envoy::Protobuf::Duration stats_flush_interval_duration_;
   std::string latency_response_header_name_;
-  absl::optional<Envoy::SystemTime> scheduled_start_;
-  absl::optional<std::string> execution_id_;
+  std::optional<Envoy::SystemTime> scheduled_start_;
+  std::optional<std::string> execution_id_;
   std::vector<envoy::config::core::v3::TypedExtensionConfig> user_defined_output_plugin_configs_;
 };
 

source/client/output_collector_impl.cc

@@ -27,7 +27,7 @@ void OutputCollectorImpl::addResult(
     absl::string_view name, const std::vector<StatisticPtr>& statistics,
     const std::map<std::string, uint64_t>& counters,
     const std::chrono::nanoseconds execution_duration,
-    const absl::optional<Envoy::SystemTime>& first_acquisition_time,
+    const std::optional<Envoy::SystemTime>& first_acquisition_time,
     const std::vector<nighthawk::client::UserDefinedOutput>& user_defined_output_results) {
   auto result = output_.add_results();
   result->set_name(name.data(), name.size());