From c5991c647b70bd7815fa60064671150df8b4d94d Mon Sep 17 00:00:00 2001
From: Jakub Sobon <mumak@google.com>
Date: Tue, 8 Jun 2021 13:04:25 -0400
Subject: [PATCH] Update Envoy to 14cca0a (Jun 08, 2021).

- Removing reference to header file `transport_sockets/well_known_names.h` that was deleted by Envoy (https://github.com/envoyproxy/envoy/commit/97d4792449b9c42d6d2f6d727f7cc47ee20d2243).
- Undoing temporary workaround for Nighthawk's pool access now that https://github.com/envoyproxy/envoy/pull/16865 was merged in.

Fixes #695.

Signed-off-by: Jakub Sobon <mumak@google.com>
---
 bazel/repositories.bzl                 |  4 ++--
 source/client/BUILD                    |  1 -
 source/client/benchmark_client_impl.cc | 13 +++++--------
 source/client/benchmark_client_impl.h  | 15 ---------------
 source/client/process_impl.cc          |  1 -
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 6c6c4539d..dea6e80cf 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 = "72bf41fb0ecc039f196be02f534bfc2c9c69f348"  # Jun 4, 2021
-ENVOY_SHA = "db07426cf02fa2f8ed9891e64adf67ced39e72cdcce9ba121d420b471cc96766"
+ENVOY_COMMIT = "14cca0ab26c6e65adc4ef9b6e756ca48fac9b886"  # Jun 8, 2021
+ENVOY_SHA = "760f7f75263b51933e5e7c3e0a4c52583553d9460b4f407bb389e16c0191d44f"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/source/client/BUILD b/source/client/BUILD
index aa00b9bd0..def43a33c 100644
--- a/source/client/BUILD
+++ b/source/client/BUILD
@@ -103,7 +103,6 @@ envoy_cc_library(
         "@envoy//source/exe:platform_impl_lib",
         "@envoy//source/exe:process_wide_lib_with_external_headers",
         "@envoy//source/extensions/request_id/uuid:config_with_external_headers",
-        "@envoy//source/extensions/transport_sockets:well_known_names_with_external_headers",
         "@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers",
         "@envoy//source/server:server_lib_with_external_headers",
         "@envoy//source/server/config_validation:admin_lib_with_external_headers",
diff --git a/source/client/benchmark_client_impl.cc b/source/client/benchmark_client_impl.cc
index a7d7bd251..5be49b791 100644
--- a/source/client/benchmark_client_impl.cc
+++ b/source/client/benchmark_client_impl.cc
@@ -108,20 +108,17 @@ BenchmarkClientHttpImpl::BenchmarkClientHttpImpl(
 
 void BenchmarkClientHttpImpl::terminate() {
   absl::optional<Envoy::Upstream::HttpPoolData> pool_data = pool();
-  if (pool_data.has_value() &&
-      Envoy::Upstream::HttpPoolDataPeer(pool_data.value()).getPool()->hasActiveConnections()) {
+  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
     // track the way we configure it today, as that exceeds the max that it can record.
     // No harm is done, but it does result in log lines warning about it. Avoid that, by
     // disabling latency measurement here.
     setShouldMeasureLatencies(false);
-    Envoy::Upstream::HttpPoolDataPeer(pool_data.value())
-        .getPool()
-        ->addDrainedCallback([this]() -> void {
-          drain_timer_->disableTimer();
-          dispatcher_.exit();
-        });
+    pool_data.value().addDrainedCallback([this]() -> void {
+      drain_timer_->disableTimer();
+      dispatcher_.exit();
+    });
     // Set up a timer with a callback which caps the time we wait for the pool to drain.
     drain_timer_ = dispatcher_.createTimer([this]() -> void {
       ENVOY_LOG(info, "Wait for the connection pool drain timed out, proceeding to hard shutdown.");
diff --git a/source/client/benchmark_client_impl.h b/source/client/benchmark_client_impl.h
index 6fd19becc..950718394 100644
--- a/source/client/benchmark_client_impl.h
+++ b/source/client/benchmark_client_impl.h
@@ -25,21 +25,6 @@
 #include "source/client/stream_decoder.h"
 #include "source/common/statistic_impl.h"
 
-// TODO(#695): temporary hack to until Envoy::Upstream::HttpPoolData supports
-// hasActiveConnections
-namespace Envoy {
-namespace Upstream {
-class HttpPoolDataPeer {
-public:
-  HttpPoolDataPeer(HttpPoolData& data) : data_(data) {}
-  Http::ConnectionPool::Instance* getPool() { return data_.pool_; };
-
-private:
-  HttpPoolData& data_;
-};
-} // namespace Upstream
-} // namespace Envoy
-
 namespace Nighthawk {
 namespace Client {
 
diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc
index 6302afdf0..49ae0b403 100644
--- a/source/client/process_impl.cc
+++ b/source/client/process_impl.cc
@@ -38,7 +38,6 @@
 #ifdef ZIPKIN_ENABLED
 #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"