grpc 1.65.1 → 1.66.0.pre3

data/src/core/xds/grpc/xds_bootstrap_grpc.h

@@ -38,8 +38,9 @@
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
-#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
+#include "src/core/xds/grpc/xds_server_grpc.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
@@ -76,32 +77,6 @@ class GrpcXdsBootstrap final : public XdsBootstrap {
     Json::Object metadata_;
   };
 
-  class GrpcXdsServer final : public XdsServer {
-   public:
-    const std::string& server_uri() const override { return server_uri_; }
-
-    bool IgnoreResourceDeletion() const override;
-
-    bool Equals(const XdsServer& other) const override;
-
-    std::string Key() const override;
-
-    RefCountedPtr<ChannelCredsConfig> channel_creds_config() const {
-      return channel_creds_config_;
-    }
-
-    static const JsonLoaderInterface* JsonLoader(const JsonArgs&);
-    void JsonPostLoad(const Json& json, const JsonArgs& args,
-                      ValidationErrors* errors);
-
-    Json ToJson() const;
-
-   private:
-    std::string server_uri_;
-    RefCountedPtr<ChannelCredsConfig> channel_creds_config_;
-    std::set<std::string> server_features_;
-  };
-
   class GrpcAuthority final : public Authority {
    public:
     std::vector<const XdsServer*> servers() const override {

data/src/core/xds/grpc/xds_certificate_provider.cc

@@ -108,13 +108,14 @@ class IdentityCertificatesWatcher final
 
 XdsCertificateProvider::XdsCertificateProvider(
     RefCountedPtr<grpc_tls_certificate_provider> root_cert_provider,
-    absl::string_view root_cert_name,
+    absl::string_view root_cert_name, bool use_system_root_certs,
     RefCountedPtr<grpc_tls_certificate_provider> identity_cert_provider,
     absl::string_view identity_cert_name,
     std::vector<StringMatcher> san_matchers)
     : distributor_(MakeRefCounted<grpc_tls_certificate_distributor>()),
       root_cert_provider_(std::move(root_cert_provider)),
       root_cert_name_(root_cert_name),
+      use_system_root_certs_(use_system_root_certs),
       identity_cert_provider_(std::move(identity_cert_provider)),
       identity_cert_name_(identity_cert_name),
       san_matchers_(std::move(san_matchers)),

data/src/core/xds/grpc/xds_certificate_provider.h

@@ -46,7 +46,7 @@ class XdsCertificateProvider final : public grpc_tls_certificate_provider {
   // ctor for client side
   XdsCertificateProvider(
       RefCountedPtr<grpc_tls_certificate_provider> root_cert_provider,
-      absl::string_view root_cert_name,
+      absl::string_view root_cert_name, bool use_system_root_certs,
       RefCountedPtr<grpc_tls_certificate_provider> identity_cert_provider,
       absl::string_view identity_cert_name,
       std::vector<StringMatcher> san_matchers);
@@ -67,6 +67,7 @@ class XdsCertificateProvider final : public grpc_tls_certificate_provider {
   UniqueTypeName type() const override;
 
   bool ProvidesRootCerts() const { return root_cert_provider_ != nullptr; }
+  bool UseSystemRootCerts() const { return use_system_root_certs_; }
   bool ProvidesIdentityCerts() const {
     return identity_cert_provider_ != nullptr;
   }
@@ -99,6 +100,7 @@ class XdsCertificateProvider final : public grpc_tls_certificate_provider {
   RefCountedPtr<grpc_tls_certificate_distributor> distributor_;
   RefCountedPtr<grpc_tls_certificate_provider> root_cert_provider_;
   std::string root_cert_name_;
+  bool use_system_root_certs_ = false;
   RefCountedPtr<grpc_tls_certificate_provider> identity_cert_provider_;
   std::string identity_cert_name_;
   std::vector<StringMatcher> san_matchers_;

data/src/core/xds/grpc/xds_client_grpc.cc

@@ -36,12 +36,12 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
+#include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/env.h"
@@ -56,7 +56,7 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/telemetry/metrics.h"
-#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/util/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_transport_grpc.h"
 #include "src/core/xds/xds_client/xds_api.h"
@@ -199,10 +199,9 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
   auto path = GetEnv("GRPC_XDS_BOOTSTRAP");
   if (path.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
-      gpr_log(GPR_INFO,
-              "Got bootstrap file location from GRPC_XDS_BOOTSTRAP "
-              "environment variable: %s",
-              path->c_str());
+      LOG(INFO) << "Got bootstrap file location from GRPC_XDS_BOOTSTRAP "
+                   "environment variable: "
+                << *path;
     }
     auto contents = LoadFile(*path, /*add_null_terminator=*/true);
     if (!contents.ok()) return contents.status();
@@ -212,9 +211,8 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
   auto env_config = GetEnv("GRPC_XDS_BOOTSTRAP_CONFIG");
   if (env_config.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
-      gpr_log(GPR_INFO,
-              "Got bootstrap contents from GRPC_XDS_BOOTSTRAP_CONFIG "
-              "environment variable");
+      LOG(INFO) << "Got bootstrap contents from GRPC_XDS_BOOTSTRAP_CONFIG "
+                   "environment variable";
     }
     return std::move(*env_config);
   }
@@ -261,8 +259,7 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
   auto bootstrap_contents = GetBootstrapContents(g_fallback_bootstrap_config);
   if (!bootstrap_contents.ok()) return bootstrap_contents.status();
   if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
-    gpr_log(GPR_INFO, "xDS bootstrap contents: %s",
-            bootstrap_contents->c_str());
+    LOG(INFO) << "xDS bootstrap contents: " << *bootstrap_contents;
   }
   // Parse bootstrap.
   auto bootstrap = GrpcXdsBootstrap::Create(*bootstrap_contents);
@@ -274,8 +271,8 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
       MakeOrphanable<GrpcXdsTransportFactory>(channel_args));
   g_xds_client_map->emplace(xds_client->key(), xds_client.get());
   if (GRPC_TRACE_FLAG_ENABLED(xds_client)) {
-    gpr_log(GPR_INFO, "[xds_client %p] Created xDS client for key %s",
-            xds_client.get(), std::string(key).c_str());
+    LOG(INFO) << "[xds_client " << xds_client.get()
+              << "] Created xDS client for key " << key;
   }
   return xds_client;
 }
@@ -287,8 +284,10 @@ GlobalStatsPluginRegistry::StatsPluginGroup GetStatsPluginGroupForKey(
   if (key == GrpcXdsClient::kServerKey) {
     return GlobalStatsPluginRegistry::GetStatsPluginsForServer(ChannelArgs{});
   }
+  grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config(
+      ChannelArgs{});
   // TODO(roth): How do we set the authority here?
-  experimental::StatsPluginChannelScope scope(key, "");
+  experimental::StatsPluginChannelScope scope(key, "", endpoint_config);
   return GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
 }