grpc 1.71.0 → 1.72.0

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

@@ -161,16 +161,16 @@ class GrpcXdsClient::MetricsReporter final : public XdsMetricsReporter {
                              absl::string_view resource_type,
                              uint64_t num_valid_resources,
                              uint64_t num_invalid_resources) override {
-    xds_client_.stats_plugin_group_.AddCounter(
+    xds_client_.stats_plugin_group_->AddCounter(
         kMetricResourceUpdatesValid, num_valid_resources,
         {xds_client_.key_, xds_server, resource_type}, {});
-    xds_client_.stats_plugin_group_.AddCounter(
+    xds_client_.stats_plugin_group_->AddCounter(
         kMetricResourceUpdatesInvalid, num_invalid_resources,
         {xds_client_.key_, xds_server, resource_type}, {});
   }
 
   void ReportServerFailure(absl::string_view xds_server) override {
-    xds_client_.stats_plugin_group_.AddCounter(
+    xds_client_.stats_plugin_group_->AddCounter(
         kMetricServerFailure, 1, {xds_client_.key_, xds_server}, {});
   }
 
@@ -225,7 +225,7 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
       "not defined");
 }
 
-GlobalStatsPluginRegistry::StatsPluginGroup
+std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
 GetStatsPluginGroupForKeyAndChannelArgs(absl::string_view key,
                                         const ChannelArgs& channel_args) {
   if (key == GrpcXdsClient::kServerKey) {
@@ -309,7 +309,8 @@ GrpcXdsClient::GrpcXdsClient(
     absl::string_view key, std::shared_ptr<GrpcXdsBootstrap> bootstrap,
     const ChannelArgs& args,
     RefCountedPtr<XdsTransportFactory> transport_factory,
-    GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group)
+    std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+        stats_plugin_group)
     : XdsClient(
           bootstrap, transport_factory,
           grpc_event_engine::experimental::GetDefaultEventEngine(),
@@ -324,7 +325,7 @@ GrpcXdsClient::GrpcXdsClient(
           DownCast<const GrpcXdsBootstrap&>(this->bootstrap())
               .certificate_providers())),
       stats_plugin_group_(std::move(stats_plugin_group)),
-      registered_metric_callback_(stats_plugin_group_.RegisterCallback(
+      registered_metric_callback_(stats_plugin_group_->RegisterCallback(
           [this](CallbackMetricReporter& reporter) {
             ReportCallbackMetrics(reporter);
           },

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

@@ -64,7 +64,8 @@ class GrpcXdsClient final : public XdsClient {
                 std::shared_ptr<GrpcXdsBootstrap> bootstrap,
                 const ChannelArgs& args,
                 RefCountedPtr<XdsTransportFactory> transport_factory,
-                GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group);
+                std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+                    stats_plugin_group);
 
   // Helpers for encoding the XdsClient object in channel args.
   static absl::string_view ChannelArgName() {
@@ -97,7 +98,8 @@ class GrpcXdsClient final : public XdsClient {
 
   std::string key_;
   OrphanablePtr<CertificateProviderStore> certificate_provider_store_;
-  GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group_;
+  std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+      stats_plugin_group_;
   std::unique_ptr<RegisteredMetricCallback> registered_metric_callback_;
   RefCountedPtr<LrsClient> lrs_client_;
 };

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

@@ -36,8 +36,8 @@
 namespace grpc_core {
 
 inline bool LrsServersEqual(
-    const std::shared_ptr<const GrpcXdsServer>& lrs_server1,
-    const std::shared_ptr<const GrpcXdsServer>& lrs_server2) {
+    const std::shared_ptr<const GrpcXdsServerTarget>& lrs_server1,
+    const std::shared_ptr<const GrpcXdsServerTarget>& lrs_server2) {
   if (lrs_server1 == nullptr) return lrs_server2 == nullptr;
   if (lrs_server2 == nullptr) return false;
   // Neither one is null, so compare them.
@@ -90,7 +90,7 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
 
   // The LRS server to use for load reporting.
   // If null, load reporting will be disabled.
-  std::shared_ptr<const GrpcXdsServer> lrs_load_reporting_server;
+  std::shared_ptr<const GrpcXdsServerTarget> lrs_load_reporting_server;
   // The set of metrics to propagate from ORCA to LRS.
   RefCountedPtr<const BackendMetricPropagation> lrs_backend_metric_propagation;
 

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

@@ -509,8 +509,9 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
       ValidationErrors::ScopedField field(&errors, ".lrs_server");
       errors.AddError("ConfigSource is not self");
     }
-    cds_update->lrs_load_reporting_server = std::make_shared<GrpcXdsServer>(
-        DownCast<const GrpcXdsServer&>(context.server));
+    cds_update->lrs_load_reporting_server =
+        std::static_pointer_cast<const GrpcXdsServerTarget>(
+            context.server.target());
   }
   // Record LRS metric propagation.
   auto propagation = MakeRefCounted<BackendMetricPropagation>();

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

@@ -33,10 +33,10 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
 #include "envoy/type/v3/percent.upb.h"
 #include "google/protobuf/wrappers.upb.h"
+#include "src/core/call/status_util.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"

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

@@ -23,9 +23,9 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/interception_chain.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/transport/interception_chain.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/validation_errors.h"

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

@@ -26,9 +26,9 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/interception_chain.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/transport/interception_chain.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"

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

@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "re2/re2.h"
-#include "src/core/lib/channel/status_util.h"
+#include "src/core/call/status_util.h"
 #include "src/core/util/matchers.h"
 #include "src/core/util/time.h"
 #include "src/core/xds/grpc/xds_http_filter.h"

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

@@ -52,8 +52,8 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/wrappers.upb.h"
 #include "re2/re2.h"
+#include "src/core/call/status_util.h"
 #include "src/core/config/core_configuration.h"
-#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/util/down_cast.h"

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

@@ -31,7 +31,7 @@
 #include "envoy/config/route/v3/route.upb.h"
 #include "envoy/config/route/v3/route.upbdefs.h"
 #include "re2/re2.h"
-#include "src/core/lib/channel/status_util.h"
+#include "src/core/call/status_util.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"

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

@@ -29,8 +29,8 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_listener.h"
 #include "src/core/xds/grpc/xds_route_config.h"

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

@@ -71,19 +71,12 @@ bool GrpcXdsServer::TrustedXdsServer() const {
 
 bool GrpcXdsServer::Equals(const XdsServer& other) const {
   const auto& o = DownCast<const GrpcXdsServer&>(other);
-  return (server_uri_ == o.server_uri_ &&
-          channel_creds_config_->type() == o.channel_creds_config_->type() &&
-          channel_creds_config_->Equals(*o.channel_creds_config_) &&
+  return (server_target_->Equals(*o.server_target_) &&
           server_features_ == o.server_features_);
 }
 
-std::string GrpcXdsServer::Key() const { return JsonDump(ToJson()); }
-
 const JsonLoaderInterface* GrpcXdsServer::JsonLoader(const JsonArgs&) {
-  static const auto* loader =
-      JsonObjectLoader<GrpcXdsServer>()
-          .Field("server_uri", &GrpcXdsServer::server_uri_)
-          .Finish();
+  static const auto* loader = JsonObjectLoader<GrpcXdsServer>().Finish();
   return loader;
 }
 
@@ -107,29 +100,32 @@ struct ChannelCreds {
 
 void GrpcXdsServer::JsonPostLoad(const Json& json, const JsonArgs& args,
                                  ValidationErrors* errors) {
-  // Parse "channel_creds".
-  auto channel_creds_list = LoadJsonObjectField<std::vector<ChannelCreds>>(
-      json.object(), args, "channel_creds", errors);
-  if (channel_creds_list.has_value()) {
-    ValidationErrors::ScopedField field(errors, ".channel_creds");
-    for (size_t i = 0; i < channel_creds_list->size(); ++i) {
-      ValidationErrors::ScopedField field(errors, absl::StrCat("[", i, "]"));
-      auto& creds = (*channel_creds_list)[i];
-      // Select the first channel creds type that we support, but
-      // validate all entries.
-      if (CoreConfiguration::Get().channel_creds_registry().IsSupported(
-              creds.type)) {
-        ValidationErrors::ScopedField field(errors, ".config");
-        auto config =
-            CoreConfiguration::Get().channel_creds_registry().ParseConfig(
-                creds.type, Json::FromObject(creds.config), args, errors);
-        if (channel_creds_config_ == nullptr) {
-          channel_creds_config_ = std::move(config);
+  RefCountedPtr<ChannelCredsConfig> channel_creds_config;
+  {
+    // Parse "channel_creds".
+    auto channel_creds_list = LoadJsonObjectField<std::vector<ChannelCreds>>(
+        json.object(), args, "channel_creds", errors);
+    if (channel_creds_list.has_value()) {
+      ValidationErrors::ScopedField field(errors, ".channel_creds");
+      for (size_t i = 0; i < channel_creds_list->size(); ++i) {
+        ValidationErrors::ScopedField field(errors, absl::StrCat("[", i, "]"));
+        auto& creds = (*channel_creds_list)[i];
+        // Select the first channel creds type that we support, but
+        // validate all entries.
+        if (CoreConfiguration::Get().channel_creds_registry().IsSupported(
+                creds.type)) {
+          ValidationErrors::ScopedField field(errors, ".config");
+          auto config =
+              CoreConfiguration::Get().channel_creds_registry().ParseConfig(
+                  creds.type, Json::FromObject(creds.config), args, errors);
+          if (channel_creds_config == nullptr) {
+            channel_creds_config = std::move(config);
+          }
         }
       }
-    }
-    if (channel_creds_config_ == nullptr) {
-      errors->AddError("no known creds type found");
+      if (channel_creds_config == nullptr) {
+        errors->AddError("no known creds type found");
+      }
     }
   }
   // Parse "server_features".
@@ -154,28 +150,44 @@ void GrpcXdsServer::JsonPostLoad(const Json& json, const JsonArgs& args,
       }
     }
   }
+  // Parse "server_uri".
+  std::string server_uri_target = LoadJsonObjectField<std::string>(
+                                      json.object(), args, "server_uri", errors)
+                                      .value_or("");
+  server_target_ = std::make_shared<GrpcXdsServerTarget>(
+      std::move(server_uri_target), std::move(channel_creds_config));
 }
 
-Json GrpcXdsServer::ToJson() const {
-  Json::Object channel_creds_json{
-      {"type", Json::FromString(std::string(channel_creds_config_->type()))},
-  };
-  if (channel_creds_config_ != nullptr) {
-    channel_creds_json["config"] = channel_creds_config_->ToJson();
-  }
-  Json::Object json{
-      {"server_uri", Json::FromString(server_uri_)},
-      {"channel_creds",
-       Json::FromArray({Json::FromObject(std::move(channel_creds_json))})},
-  };
+std::string GrpcXdsServer::Key() const {
+  std::vector<std::string> parts;
+  parts.push_back("{");
+  parts.push_back(absl::StrCat("target=", server_target_->Key()));
   if (!server_features_.empty()) {
-    Json::Array server_features_json;
-    for (auto& feature : server_features_) {
-      server_features_json.emplace_back(Json::FromString(feature));
-    }
-    json["server_features"] = Json::FromArray(std::move(server_features_json));
+    parts.push_back(absl::StrCat("server_features=[",
+                                 absl::StrJoin(server_features_, ","), "]"));
+  }
+  parts.push_back("}");
+  return absl::StrJoin(parts, ",");
+}
+
+std::string GrpcXdsServerTarget::Key() const {
+  std::vector<std::string> parts;
+  parts.push_back("{");
+  parts.push_back(absl::StrCat("server_uri=", server_uri_));
+  if (channel_creds_config_ != nullptr) {
+    parts.push_back(absl::StrCat("creds_type=", channel_creds_config_->type()));
+    parts.push_back(
+        absl::StrCat("creds_config=", channel_creds_config_->ToString()));
   }
-  return Json::FromObject(std::move(json));
+  parts.push_back("}");
+  return absl::StrJoin(parts, ",");
+}
+
+bool GrpcXdsServerTarget::Equals(const XdsServerTarget& other) const {
+  const auto& o = DownCast<const GrpcXdsServerTarget&>(other);
+  return (server_uri_ == o.server_uri_ &&
+          channel_creds_config_->type() == o.channel_creds_config_->type() &&
+          channel_creds_config_->Equals(*o.channel_creds_config_));
 }
 
 }  // namespace grpc_core

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

@@ -20,7 +20,7 @@
 #include <set>
 #include <string>
 
-#include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/credentials/transport/channel_creds_registry.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
@@ -31,33 +31,43 @@
 
 namespace grpc_core {
 
-class GrpcXdsServer final : public GrpcXdsServerInterface {
+class GrpcXdsServerTarget final : public GrpcXdsServerInterface {
  public:
+  explicit GrpcXdsServerTarget(
+      std::string server_uri,
+      RefCountedPtr<ChannelCredsConfig> channel_creds_config)
+      : server_uri_(std::move(server_uri)),
+        channel_creds_config_(std::move(channel_creds_config)) {}
+
+  bool Equals(const XdsServerTarget& other) const override;
+  std::string Key() const override;
   const std::string& server_uri() const override { return server_uri_; }
+  RefCountedPtr<ChannelCredsConfig> channel_creds_config() const override {
+    return channel_creds_config_;
+  }
 
+ private:
+  std::string server_uri_;
+  RefCountedPtr<ChannelCredsConfig> channel_creds_config_;
+};
+
+class GrpcXdsServer final : public XdsBootstrap::XdsServer {
+ public:
   bool IgnoreResourceDeletion() const override;
   bool FailOnDataErrors() const override;
   bool ResourceTimerIsTransientFailure() const override;
-
   bool TrustedXdsServer() const;
-
   bool Equals(const XdsServer& other) const override;
-
   std::string Key() const override;
-
-  RefCountedPtr<ChannelCredsConfig> channel_creds_config() const override {
-    return channel_creds_config_;
+  std::shared_ptr<const XdsBootstrap::XdsServerTarget> target() const override {
+    return server_target_;
   }
-
   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::shared_ptr<GrpcXdsServerTarget> server_target_;
   std::set<std::string> server_features_;
 };
 

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

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_SERVER_GRPC_INTERFACE_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_SERVER_GRPC_INTERFACE_H
 
-#include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/credentials/transport/channel_creds_registry.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
 
-class GrpcXdsServerInterface : public XdsBootstrap::XdsServer {
+class GrpcXdsServerInterface : public XdsBootstrap::XdsServerTarget {
  public:
   virtual RefCountedPtr<ChannelCredsConfig> channel_creds_config() const = 0;
 };

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

@@ -35,6 +35,8 @@
 #include "absl/strings/str_cat.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/config/core_configuration.h"
+#include "src/core/credentials/transport/channel_creds_registry.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -43,8 +45,6 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/security/credentials/channel_creds_registry.h"
-#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/call.h"
@@ -263,7 +263,7 @@ RefCountedPtr<Channel> CreateXdsChannel(const ChannelArgs& args,
 
 GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
     WeakRefCountedPtr<GrpcXdsTransportFactory> factory,
-    const XdsBootstrap::XdsServer& server, absl::Status* status)
+    const XdsBootstrap::XdsServerTarget& server, absl::Status* status)
     : XdsTransport(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount)
                        ? "GrpcXdsTransport"
                        : nullptr),
@@ -372,8 +372,8 @@ GrpcXdsTransportFactory::~GrpcXdsTransportFactory() {
 }
 
 RefCountedPtr<XdsTransportFactory::XdsTransport>
-GrpcXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server,
-                                      absl::Status* status) {
+GrpcXdsTransportFactory::GetTransport(
+    const XdsBootstrap::XdsServerTarget& server, absl::Status* status) {
   std::string key = server.Key();
   RefCountedPtr<GrpcXdsTransport> transport;
   MutexLock lock(&mu_);

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

@@ -51,7 +51,8 @@ class GrpcXdsTransportFactory final : public XdsTransportFactory {
   void Orphaned() override {}
 
   RefCountedPtr<XdsTransport> GetTransport(
-      const XdsBootstrap::XdsServer& server, absl::Status* status) override;
+      const XdsBootstrap::XdsServerTarget& server,
+      absl::Status* status) override;
 
   grpc_pollset_set* interested_parties() const { return interested_parties_; }
 
@@ -60,7 +61,7 @@ class GrpcXdsTransportFactory final : public XdsTransportFactory {
   grpc_pollset_set* interested_parties_;
 
   Mutex mu_;
-  absl::flat_hash_map<std::string /*XdsServer key*/, GrpcXdsTransport*>
+  absl::flat_hash_map<std::string /*XdsServerTarget key*/, GrpcXdsTransport*>
       transports_ ABSL_GUARDED_BY(&mu_);
 };
 
@@ -70,7 +71,8 @@ class GrpcXdsTransportFactory::GrpcXdsTransport final
   class GrpcStreamingCall;
 
   GrpcXdsTransport(WeakRefCountedPtr<GrpcXdsTransportFactory> factory,
-                   const XdsBootstrap::XdsServer& server, absl::Status* status);
+                   const XdsBootstrap::XdsServerTarget& server,
+                   absl::Status* status);
   ~GrpcXdsTransport() override;
 
   void Orphaned() override;

data/src/core/xds/xds_client/lrs_client.cc

@@ -389,7 +389,7 @@ class LrsClient::LrsChannel::LrsCall final
 
 LrsClient::LrsChannel::LrsChannel(
     WeakRefCountedPtr<LrsClient> lrs_client,
-    std::shared_ptr<const XdsBootstrap::XdsServer> server)
+    std::shared_ptr<const XdsBootstrap::XdsServerTarget> server)
     : DualRefCounted<LrsChannel>(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount)
                                      ? "LrsChannel"
                                      : nullptr),
@@ -791,7 +791,8 @@ void LrsClient::Orphaned() {
 }
 
 RefCountedPtr<LrsClient::LrsChannel> LrsClient::GetOrCreateLrsChannelLocked(
-    std::shared_ptr<const XdsBootstrap::XdsServer> server, const char* reason) {
+    std::shared_ptr<const XdsBootstrap::XdsServerTarget> server,
+    const char* reason) {
   std::string key = server->Key();
   auto it = lrs_channel_map_.find(key);
   if (it != lrs_channel_map_.end()) {
@@ -805,7 +806,7 @@ RefCountedPtr<LrsClient::LrsChannel> LrsClient::GetOrCreateLrsChannelLocked(
 }
 
 RefCountedPtr<LrsClient::ClusterDropStats> LrsClient::AddClusterDropStats(
-    std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
+    std::shared_ptr<const XdsBootstrap::XdsServerTarget> lrs_server,
     absl::string_view cluster_name, absl::string_view eds_service_name) {
   auto key =
       std::pair(std::string(cluster_name), std::string(eds_service_name));
@@ -868,7 +869,7 @@ void LrsClient::RemoveClusterDropStats(
 
 RefCountedPtr<LrsClient::ClusterLocalityStats>
 LrsClient::AddClusterLocalityStats(
-    std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
+    std::shared_ptr<const XdsBootstrap::XdsServerTarget> lrs_server,
     absl::string_view cluster_name, absl::string_view eds_service_name,
     RefCountedPtr<XdsLocalityName> locality,
     RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation) {
@@ -954,7 +955,7 @@ void LrsClient::ResetBackoff() {
 }
 
 LrsClient::ClusterLoadReportMap LrsClient::BuildLoadReportSnapshotLocked(
-    const XdsBootstrap::XdsServer& lrs_server, bool send_all_clusters,
+    const XdsBootstrap::XdsServerTarget& lrs_server, bool send_all_clusters,
     const std::set<std::string>& clusters) {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[lrs_client " << this << "] start building load report";

data/src/core/xds/xds_client/lrs_client.h

@@ -237,13 +237,13 @@ class LrsClient : public DualRefCounted<LrsClient> {
 
   // Adds drop stats for cluster_name and eds_service_name.
   RefCountedPtr<ClusterDropStats> AddClusterDropStats(
-      std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
+      std::shared_ptr<const XdsBootstrap::XdsServerTarget> lrs_server,
       absl::string_view cluster_name, absl::string_view eds_service_name);
 
   // Adds locality stats for cluster_name and eds_service_name for the
   // specified locality with the specified backend metric propagation.
   RefCountedPtr<ClusterLocalityStats> AddClusterLocalityStats(
-      std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
+      std::shared_ptr<const XdsBootstrap::XdsServerTarget> lrs_server,
       absl::string_view cluster_name, absl::string_view eds_service_name,
       RefCountedPtr<XdsLocalityName> locality,
       RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation);
@@ -270,7 +270,7 @@ class LrsClient : public DualRefCounted<LrsClient> {
     class LrsCall;
 
     LrsChannel(WeakRefCountedPtr<LrsClient> lrs_client,
-               std::shared_ptr<const XdsBootstrap::XdsServer> server);
+               std::shared_ptr<const XdsBootstrap::XdsServerTarget> server);
     ~LrsChannel() override;
 
     LrsClient* lrs_client() const { return lrs_client_.get(); }
@@ -289,7 +289,7 @@ class LrsClient : public DualRefCounted<LrsClient> {
     // The owning LrsClient.
     WeakRefCountedPtr<LrsClient> lrs_client_;
 
-    std::shared_ptr<const XdsBootstrap::XdsServer> server_;
+    std::shared_ptr<const XdsBootstrap::XdsServerTarget> server_;
 
     RefCountedPtr<XdsTransportFactory::XdsTransport> transport_;
 
@@ -337,12 +337,12 @@ class LrsClient : public DualRefCounted<LrsClient> {
   void Orphaned() override;
 
   ClusterLoadReportMap BuildLoadReportSnapshotLocked(
-      const XdsBootstrap::XdsServer& lrs_server, bool send_all_clusters,
+      const XdsBootstrap::XdsServerTarget& lrs_server, bool send_all_clusters,
       const std::set<std::string>& clusters) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
 
   RefCountedPtr<LrsChannel> GetOrCreateLrsChannelLocked(
-      std::shared_ptr<const XdsBootstrap::XdsServer> server, const char* reason)
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
+      std::shared_ptr<const XdsBootstrap::XdsServerTarget> server,
+      const char* reason) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
 
   static bool LoadReportCountersAreZero(const ClusterLoadReportMap& snapshot);
 

data/src/core/xds/xds_client/xds_bootstrap.h

@@ -42,11 +42,26 @@ class XdsBootstrap {
     virtual const Json::Object& metadata() const = 0;
   };
 
+  class XdsServerTarget {
+   public:
+    virtual ~XdsServerTarget() = default;
+    virtual const std::string& server_uri() const = 0;
+    // Returns a key to be used for uniquely identifying this XdsServerTarget.
+    virtual std::string Key() const = 0;
+    virtual bool Equals(const XdsServerTarget& other) const = 0;
+    friend bool operator==(const XdsServerTarget& a, const XdsServerTarget& b) {
+      return a.Equals(b);
+    }
+    friend bool operator!=(const XdsServerTarget& a, const XdsServerTarget& b) {
+      return !a.Equals(b);
+    }
+  };
+
   class XdsServer {
    public:
     virtual ~XdsServer() = default;
 
-    virtual const std::string& server_uri() const = 0;
+    virtual std::shared_ptr<const XdsServerTarget> target() const = 0;
 
     // TODO(roth): Remove this method once the data error handling
     // feature passes interop tests.