Merge b2c9a09 into f38fa29

envoyproxy · Nov 20, 2024 · 1b8232a · 1b8232a
2 parents f38fa29 + b2c9a09
commit 1b8232a
Show file tree

Hide file tree

Showing 28 changed files with 141 additions and 42 deletions.
diff --git a/envoy/server/instance.h b/envoy/server/instance.h
@@ -317,5 +317,11 @@ class Instance {
   virtual Config::XdsManager& xdsManager() PURE;
 };
 
+// Pick a class HdsDelegate inherits from
+class HdsDelegateApi : public Logger::Loggable<Logger::Id::upstream> {
+public:
+  virtual ~HdsDelegateApi() = default;
+};
+
 } // namespace Server
 } // namespace Envoy
diff --git a/mobile/library/cc/BUILD b/mobile/library/cc/BUILD
@@ -35,6 +35,7 @@ envoy_cc_library(
         "@envoy_api//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/decompressor/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/http/header_formatters/preserve_case/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/network/dns_resolver/apple/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/network/dns_resolver/getaddrinfo/v3:pkg_cc_proto",

diff --git a/mobile/library/cc/engine_builder.cc b/mobile/library/cc/engine_builder.cc
@@ -10,6 +10,7 @@
 #include "envoy/extensions/filters/http/alternate_protocols_cache/v3/alternate_protocols_cache.pb.h"
 #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
+#include "envoy/extensions/filters/http/router/v3/router.pb.h"
 #include "envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.h"
 
 #if defined(__APPLE__)

diff --git a/mobile/library/common/engine_common.cc b/mobile/library/common/engine_common.cc
@@ -68,6 +68,12 @@ class ServerLite : public Server::InstanceBase {
   std::unique_ptr<Server::GuardDog> maybeCreateGuardDog(absl::string_view) override {
     return nullptr;
   }
+  std::unique_ptr<Server::HdsDelegateApi>
+  maybeCreateHdsDelegate(Server::Configuration::ServerFactoryContext&, Stats::Scope&,
+                         Grpc::RawAsyncClientPtr&&, Envoy::Stats::Store&, Ssl::ContextManager&,
+                         Upstream::ClusterInfoFactory&) override {
+    return nullptr;
+  }
 };
 
 EngineCommon::EngineCommon(std::shared_ptr<Envoy::OptionsImplBase> options) : options_(options) {

diff --git a/mobile/test/common/integration/test_server.cc b/mobile/test/common/integration/test_server.cc
@@ -2,6 +2,7 @@
 
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
+#include "envoy/extensions/filters/http/router/v3/router.pb.h"
 #include "envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.h"
 
 #include "source/common/listener_manager/connection_handler_impl.h"

diff --git a/mobile/test/performance/files_em_does_not_use b/mobile/test/performance/files_em_does_not_use
@@ -10,6 +10,7 @@ source/common/network/tcp_listener_impl.h
 source/server/guarddog_impl.h
 source/server/watchdog_impl.h
 source/server/options_impl.cc
+source/common/upstream/health_discovery_service.h
 source/extensions/access_loggers/common/file_access_log_impl.h
 source/common/router/scoped_rds.h
 source/extensions/load_balancing_policies/subset/subset_lb.h

diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD
@@ -296,6 +296,15 @@ envoy_cc_library(
     ],
 )
 
+envoy_cc_library(
+    name = "prod_cluster_info_factory_lib",
+    srcs = ["prod_cluster_info_factory.cc"],
+    hdrs = ["prod_cluster_info_factory.h"],
+    deps = [
+        ":upstream_includes",
+    ],
+)
+
 envoy_cc_library(
     name = "health_discovery_service_lib",
     srcs = ["health_discovery_service.cc"],

diff --git a/source/common/upstream/health_discovery_service.cc b/source/common/upstream/health_discovery_service.cc
@@ -534,32 +534,6 @@ void HdsCluster::updateHosts(
 
 ClusterSharedPtr HdsCluster::create() { return nullptr; }
 
-ClusterInfoConstSharedPtr
-ProdClusterInfoFactory::createClusterInfo(const CreateClusterInfoParams& params) {
-  Envoy::Stats::ScopeSharedPtr scope =
-      params.stats_.createScope(fmt::format("cluster.{}.", params.cluster_.name()));
-
-  Envoy::Server::Configuration::TransportSocketFactoryContextImpl factory_context(
-      params.server_context_, params.ssl_context_manager_, *scope,
-      params.server_context_.clusterManager(), params.server_context_.messageValidationVisitor());
-
-  // TODO(JimmyCYJ): Support SDS for HDS cluster.
-  Network::UpstreamTransportSocketFactoryPtr socket_factory = THROW_OR_RETURN_VALUE(
-      Upstream::createTransportSocketFactory(params.cluster_, factory_context),
-      Network::UpstreamTransportSocketFactoryPtr);
-  auto socket_matcher = THROW_OR_RETURN_VALUE(
-      TransportSocketMatcherImpl::create(params.cluster_.transport_socket_matches(),
-                                         factory_context, socket_factory, *scope),
-      std::unique_ptr<TransportSocketMatcherImpl>);
-
-  return THROW_OR_RETURN_VALUE(
-      ClusterInfoImpl::create(params.server_context_.initManager(), params.server_context_,
-                              params.cluster_, params.bind_config_,
-                              params.server_context_.runtime(), std::move(socket_matcher),
-                              std::move(scope), params.added_via_api_, factory_context),
-      std::unique_ptr<ClusterInfoImpl>);
-}
-
 void HdsCluster::initHealthchecks() {
   for (auto& health_check : cluster_.health_checks()) {
     auto health_checker_or_error =

diff --git a/source/common/upstream/health_discovery_service.h b/source/common/upstream/health_discovery_service.h
@@ -5,6 +5,7 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/address.pb.h"
 #include "envoy/event/dispatcher.h"
+#include "envoy/server/instance.h"
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/service/health/v3/hds.pb.h"
 #include "envoy/ssl/context_manager.h"
@@ -33,11 +34,6 @@ using HealthCheckerMap =
     absl::flat_hash_map<envoy::config::core::v3::HealthCheck, Upstream::HealthCheckerSharedPtr,
                         HealthCheckerHash, HealthCheckerEqualTo>;
 
-class ProdClusterInfoFactory : public ClusterInfoFactory, Logger::Loggable<Logger::Id::upstream> {
-public:
-  ClusterInfoConstSharedPtr createClusterInfo(const CreateClusterInfoParams& params) override;
-};
-
 // TODO(lilika): Add HdsClusters to the /clusters endpoint to get detailed stats about each HC host.
 
 /**
@@ -138,7 +134,7 @@ struct HdsDelegateStats {
  * back the results.
  */
 class HdsDelegate : Grpc::AsyncStreamCallbacks<envoy::service::health::v3::HealthCheckSpecifier>,
-                    Logger::Loggable<Logger::Id::upstream> {
+                    public Server::HdsDelegateApi {
 public:
   HdsDelegate(Server::Configuration::ServerFactoryContext& server_context, Stats::Scope& scope,
               Grpc::RawAsyncClientPtr async_client, Envoy::Stats::Store& stats,

diff --git a/source/common/upstream/prod_cluster_info_factory.cc b/source/common/upstream/prod_cluster_info_factory.cc
@@ -0,0 +1,40 @@
+#include "source/common/upstream/prod_cluster_info_factory.h"
+
+#include "envoy/stats/scope.h"
+
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/upstream_impl.h"
+
+namespace Envoy {
+namespace Upstream {
+
+ClusterInfoConstSharedPtr
+ProdClusterInfoFactory::createClusterInfo(const CreateClusterInfoParams& params) {
+  Envoy::Stats::ScopeSharedPtr scope =
+      params.stats_.createScope(fmt::format("cluster.{}.", params.cluster_.name()));
+
+  Envoy::Server::Configuration::TransportSocketFactoryContextImpl factory_context(
+      params.server_context_, params.ssl_context_manager_, *scope,
+      params.server_context_.clusterManager(), params.server_context_.messageValidationVisitor());
+
+  // TODO(JimmyCYJ): Support SDS for HDS cluster.
+  Network::UpstreamTransportSocketFactoryPtr socket_factory = THROW_OR_RETURN_VALUE(
+      Upstream::createTransportSocketFactory(params.cluster_, factory_context),
+      Network::UpstreamTransportSocketFactoryPtr);
+  auto socket_matcher = THROW_OR_RETURN_VALUE(
+      TransportSocketMatcherImpl::create(params.cluster_.transport_socket_matches(),
+                                         factory_context, socket_factory, *scope),
+      std::unique_ptr<TransportSocketMatcherImpl>);
+
+  return THROW_OR_RETURN_VALUE(
+      ClusterInfoImpl::create(params.server_context_.initManager(), params.server_context_,
+                              params.cluster_, params.bind_config_,
+                              params.server_context_.runtime(), std::move(socket_matcher),
+                              std::move(scope), params.added_via_api_, factory_context),
+      std::unique_ptr<ClusterInfoImpl>);
+}
+
+} // namespace Upstream
+} // namespace Envoy
diff --git a/source/common/upstream/prod_cluster_info_factory.h b/source/common/upstream/prod_cluster_info_factory.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "envoy/api/api.h"
+#include "envoy/upstream/cluster_manager.h"
+#include "envoy/upstream/upstream.h"
+
+namespace Envoy {
+namespace Upstream {
+
+class ProdClusterInfoFactory : public ClusterInfoFactory, Logger::Loggable<Logger::Id::upstream> {
+public:
+  ClusterInfoConstSharedPtr createClusterInfo(const CreateClusterInfoParams& params) override;
+};
+
+} // namespace Upstream
+} // namespace Envoy
diff --git a/source/server/BUILD b/source/server/BUILD
@@ -461,7 +461,7 @@ envoy_cc_library(
         "//source/common/stats:thread_local_store_lib",
         "//source/common/tls:context_lib",
         "//source/common/upstream:cluster_manager_lib",
-        "//source/common/upstream:health_discovery_service_lib",
+        "//source/common/upstream:prod_cluster_info_factory_lib",
         "//source/common/version:version_lib",
         "//source/server/admin:admin_lib",
         "@com_google_absl//absl/container:node_hash_map",
@@ -479,6 +479,7 @@ envoy_cc_library(
         ":guarddog_lib",
         ":server_base_lib",
         "//source/common/memory:heap_shrinker_lib",
+        "//source/common/upstream:health_discovery_service_lib",
         "//source/server:null_overload_manager_lib",
         "//source/server:overload_manager_lib",
     ],

diff --git a/source/server/instance_impl.cc b/source/server/instance_impl.cc
@@ -1,5 +1,6 @@
 #include "source/server/instance_impl.h"
 
+#include "source/common/upstream/health_discovery_service.h"
 #include "source/server/guarddog_impl.h"
 #include "source/server/null_overload_manager.h"
 #include "source/server/overload_manager_impl.h"
@@ -26,5 +27,13 @@ std::unique_ptr<Server::GuardDog> InstanceImpl::maybeCreateGuardDog(absl::string
                                                 config().mainThreadWatchdogConfig(), api(), name);
 }
 
+std::unique_ptr<HdsDelegateApi> InstanceImpl::maybeCreateHdsDelegate(
+    Configuration::ServerFactoryContext& server_context, Stats::Scope& scope,
+    Grpc::RawAsyncClientPtr&& async_client, Envoy::Stats::Store& stats,
+    Ssl::ContextManager& ssl_context_manager, Upstream::ClusterInfoFactory& info_factory) {
+  return std::make_unique<Upstream::HdsDelegate>(server_context, scope, std::move(async_client),
+                                                 stats, ssl_context_manager, info_factory);
+}
+
 } // namespace Server
 } // namespace Envoy
diff --git a/source/server/instance_impl.h b/source/server/instance_impl.h
@@ -16,6 +16,11 @@ class InstanceImpl : public InstanceBase {
   absl::StatusOr<std::unique_ptr<OverloadManager>> createOverloadManager() override;
   std::unique_ptr<OverloadManager> createNullOverloadManager() override;
   std::unique_ptr<Server::GuardDog> maybeCreateGuardDog(absl::string_view name) override;
+  std::unique_ptr<HdsDelegateApi>
+  maybeCreateHdsDelegate(Configuration::ServerFactoryContext& server_context, Stats::Scope& scope,
+                         Grpc::RawAsyncClientPtr&& async_client, Envoy::Stats::Store& stats,
+                         Ssl::ContextManager& ssl_context_manager,
+                         Upstream::ClusterInfoFactory& info_factory) override;
 
 private:
   std::unique_ptr<Memory::HeapShrinker> heap_shrinker_;

diff --git a/source/server/server.cc b/source/server/server.cc
@@ -837,16 +837,17 @@ void InstanceBase::onRuntimeReady() {
       auto factory_or_error = Config::Utility::factoryForGrpcApiConfigSource(
           *async_client_manager_, hds_config, *stats_store_.rootScope(), false, 0);
       THROW_IF_NOT_OK_REF(factory_or_error.status());
-      hds_delegate_ = std::make_unique<Upstream::HdsDelegate>(
-          serverFactoryContext(), *stats_store_.rootScope(),
-          factory_or_error.value()->createUncachedRawAsyncClient(), stats_store_,
-          *ssl_context_manager_, info_factory_);
+      hds_delegate_ =
+          maybeCreateHdsDelegate(serverFactoryContext(), *stats_store_.rootScope(),
+                                 factory_or_error.value()->createUncachedRawAsyncClient(),
+                                 stats_store_, *ssl_context_manager_, info_factory_);
     }
     END_TRY
-    CATCH(const EnvoyException& e, {
-      ENVOY_LOG(warn, "Skipping initialization of HDS cluster: {}", e.what());
+    CATCH(const EnvoyException& e,
+          { ENVOY_LOG(warn, "Skipping initialization of HDS cluster: {}", e.what()); });
+    if (!hds_delegate_) {
       shutdown();
-    });
+    }
   }
 
   // TODO (nezdolik): Fully deprecate this runtime key in the next release.

diff --git a/source/server/server.h b/source/server/server.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 
+#include "envoy/common/regex.h"
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/event/timer.h"
 #include "envoy/server/bootstrap_extension_config.h"
@@ -39,7 +40,7 @@
 #include "source/common/runtime/runtime_impl.h"
 #include "source/common/secret/secret_manager_impl.h"
 #include "source/common/singleton/manager_impl.h"
-#include "source/common/upstream/health_discovery_service.h"
+#include "source/common/upstream/prod_cluster_info_factory.h"
 
 #ifdef ENVOY_ADMIN_FUNCTIONALITY
 #include "source/server/admin/admin.h"
@@ -259,6 +260,11 @@ class InstanceBase : Logger::Loggable<Logger::Id::main>,
   virtual absl::StatusOr<std::unique_ptr<OverloadManager>> createOverloadManager() PURE;
   virtual std::unique_ptr<OverloadManager> createNullOverloadManager() PURE;
   virtual std::unique_ptr<Server::GuardDog> maybeCreateGuardDog(absl::string_view name) PURE;
+  virtual std::unique_ptr<HdsDelegateApi>
+  maybeCreateHdsDelegate(Configuration::ServerFactoryContext& server_context, Stats::Scope& scope,
+                         Grpc::RawAsyncClientPtr&& async_client, Envoy::Stats::Store& stats,
+                         Ssl::ContextManager& ssl_context_manager,
+                         Upstream::ClusterInfoFactory& info_factory) PURE;
 
   void run() override;
 
@@ -412,7 +418,7 @@ class InstanceBase : Logger::Loggable<Logger::Id::main>,
   Grpc::AsyncClientManagerPtr async_client_manager_;
   Config::XdsManagerPtr xds_manager_;
   Upstream::ProdClusterInfoFactory info_factory_;
-  Upstream::HdsDelegatePtr hds_delegate_;
+  std::unique_ptr<HdsDelegateApi> hds_delegate_;
   std::unique_ptr<OverloadManager> overload_manager_;
   std::unique_ptr<OverloadManager> null_overload_manager_;
   std::vector<BootstrapExtensionPtr> bootstrap_extensions_;

diff --git a/test/common/router/config_impl_integration_test.cc b/test/common/router/config_impl_integration_test.cc
@@ -6,6 +6,7 @@
 #include "source/common/common/base64.h"
 #include "source/common/http/utility.h"
 #include "source/common/protobuf/protobuf.h"
+#include "source/common/router/config_impl.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/registry.h"

diff --git a/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc b/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc
@@ -1,4 +1,5 @@
 #include "source/common/common/fmt.h"
+#include "source/common/http/message_impl.h"
 #include "source/extensions/common/aws/utility.h"
 
 #include "test/integration/integration.h"

diff --git a/test/extensions/retry/host/previous_hosts/BUILD b/test/extensions/retry/host/previous_hosts/BUILD
@@ -33,5 +33,6 @@ envoy_extension_cc_test(
         "//source/extensions/retry/host/previous_hosts:config",
         "//test/integration:http_integration_lib",
         "//test/integration:integration_lib",
+        "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
 )
diff --git a/test/extensions/retry/host/previous_hosts/integration_test.cc b/test/extensions/retry/host/previous_hosts/integration_test.cc
@@ -1,3 +1,6 @@
+#include "envoy/config/route/v3/route_components.pb.h"
+#include "envoy/config/route/v3/route_components.pb.validate.h"
+
 #include "source/common/protobuf/message_validator_impl.h"
 #include "source/common/protobuf/utility.h"
 

diff --git a/test/integration/BUILD b/test/integration/BUILD
@@ -259,6 +259,7 @@ envoy_cc_test(
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
     ],
 )
 
@@ -995,6 +996,10 @@ envoy_cc_test_library(
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/early_data/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/early_data/v3:pkg_cc_proto_descriptor",
+        "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/http/upstream_codec/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto",
     ],

diff --git a/test/integration/admin_html/test_server.cc b/test/integration/admin_html/test_server.cc
@@ -1,4 +1,5 @@
 #include "source/common/filesystem/filesystem_impl.h"
+#include "source/common/http/headers.h"
 #include "source/exe/main_common.h"
 #include "source/server/admin/admin_html_util.h"
 

diff --git a/test/integration/health_check_integration_test.cc b/test/integration/health_check_integration_test.cc
@@ -3,6 +3,8 @@
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/type/v3/range.pb.h"
 
+#include "source/common/upstream/health_discovery_service.h"
+
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/common/http/http2/http2_frame.h"
 #include "test/common/upstream/utility.h"

diff --git a/test/integration/http_integration.h b/test/integration/http_integration.h
@@ -4,8 +4,13 @@
 #include <memory>
 #include <string>
 
+#include "envoy/extensions/early_data/v3/default_early_data_policy_descriptor.pb.h"
+#include "envoy/extensions/filters/http/router/v3/router.pb.h"
+#include "envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.h"
+
 #include "source/common/http/codec_client.h"
 #include "source/common/network/filter_impl.h"
+#include "source/extensions/early_data/default_early_data_policy.h"
 
 #include "test/common/http/http2/http2_frame.h"
 #include "test/integration/integration.h"

diff --git a/test/integration/server.h b/test/integration/server.h
@@ -17,6 +17,9 @@
 #include "source/common/common/logger.h"
 #include "source/common/common/thread.h"
 #include "source/common/stats/allocator_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/null_counter.h"
+#include "source/common/stats/null_gauge.h"
 #include "source/server/drain_manager_impl.h"
 #include "source/server/listener_hooks.h"
 #include "source/server/options_impl_base.h"

diff --git a/test/integration/typed_metadata_integration_test.cc b/test/integration/typed_metadata_integration_test.cc
@@ -1,3 +1,5 @@
+#include "envoy/access_log/access_log_config.h"
+
 #include "source/common/protobuf/protobuf.h"
 
 #include "test/integration/http_protocol_integration.h"