grpc 1.71.0 → 1.73.0

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.

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

@@ -238,7 +238,7 @@ class XdsClient::XdsChannel::AdsCall final
         if (!state.HasResource()) {
           GRPC_TRACE_LOG(xds_client, INFO)
               << "[xds_client " << ads_call_->xds_client() << "] xds server "
-              << ads_call_->xds_channel()->server_.server_uri()
+              << ads_call_->xds_channel()->server_uri()
               << ": timeout obtaining resource {type=" << type_->type_url()
               << " name="
               << XdsClient::ConstructFullXdsResourceName(
@@ -405,9 +405,10 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
       server_(server) {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client_.get() << "] creating channel " << this
-      << " for server " << server.server_uri();
+      << " for server " << server_uri();
   absl::Status status;
-  transport_ = xds_client_->transport_factory_->GetTransport(server, &status);
+  transport_ =
+      xds_client_->transport_factory_->GetTransport(*server.target(), &status);
   CHECK(transport_ != nullptr);
   if (!status.ok()) {
     SetChannelStatusLocked(std::move(status));
@@ -421,7 +422,7 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
 XdsClient::XdsChannel::~XdsChannel() {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] destroying xds channel " << this
-      << " for server " << server_.server_uri();
+      << " for server " << server_uri();
   xds_client_.reset(DEBUG_LOCATION, "XdsChannel");
 }
 
@@ -432,7 +433,7 @@ XdsClient::XdsChannel::~XdsChannel() {
 void XdsClient::XdsChannel::Orphaned() ABSL_NO_THREAD_SAFETY_ANALYSIS {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] orphaning xds channel " << this
-      << " for server " << server_.server_uri();
+      << " for server " << server_uri();
   shutting_down_ = true;
   if (failure_watcher_ != nullptr) {
     transport_->StopConnectivityFailureWatch(failure_watcher_);
@@ -511,8 +512,9 @@ bool XdsClient::XdsChannel::MaybeFallbackLocked(
     }
     GRPC_TRACE_LOG(xds_client, INFO)
         << "[xds_client " << xds_client_.get() << "] authority " << authority
-        << ": added fallback server " << xds_servers[i]->server_uri() << " ("
-        << authority_state.xds_channels.back()->status().ToString() << ")";
+        << ": added fallback server " << xds_servers[i]->target()->server_uri()
+        << " (" << authority_state.xds_channels.back()->status().ToString()
+        << ")";
     if (authority_state.xds_channels.back()->status().ok()) return true;
   }
   GRPC_TRACE_LOG(xds_client, INFO)
@@ -536,7 +538,7 @@ void XdsClient::XdsChannel::SetHealthyLocked() {
     if (channel_it != channels.end()) {
       GRPC_TRACE_LOG(xds_client, INFO)
           << "[xds_client " << xds_client_.get() << "] authority " << authority
-          << ": Falling forward to " << server_.server_uri();
+          << ": Falling forward to " << server_uri();
       // Lower priority channels are no longer needed, connection is back!
       // Note that we move the lower priority channels out of the vector
       // before we unref them, or else
@@ -557,13 +559,13 @@ void XdsClient::XdsChannel::OnConnectivityFailure(absl::Status status) {
 
 void XdsClient::XdsChannel::SetChannelStatusLocked(absl::Status status) {
   if (shutting_down_) return;
-  status = absl::Status(status.code(), absl::StrCat("xDS channel for server ",
-                                                    server_.server_uri(), ": ",
-                                                    status.message()));
+  status = absl::Status(
+      status.code(), absl::StrCat("xDS channel for server ", server_uri(), ": ",
+                                  status.message()));
   LOG(INFO) << "[xds_client " << xds_client() << "] " << status;
   // If status was previously OK, report that the channel has gone unhealthy.
   if (status_.ok() && xds_client_->metrics_reporter_ != nullptr) {
-    xds_client_->metrics_reporter_->ReportServerFailure(server_.server_uri());
+    xds_client_->metrics_reporter_->ReportServerFailure(server_uri());
   }
   // Save status in channel, so that we can immediately generate an
   // error for any new watchers that may be started.
@@ -643,8 +645,8 @@ void XdsClient::XdsChannel::RetryableCall<T>::StartNewCallLocked() {
   CHECK(call_ == nullptr);
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
-      << ": start new call from retryable call " << this;
+      << xds_channel()->server_uri() << ": start new call from retryable call "
+      << this;
   call_ = MakeOrphanable<T>(
       this->Ref(DEBUG_LOCATION, "RetryableCall+start_new_call"));
 }
@@ -655,7 +657,7 @@ void XdsClient::XdsChannel::RetryableCall<T>::StartRetryTimerLocked() {
   const Duration delay = backoff_.NextAttemptDelay();
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": call attempt failed; retry timer will fire in " << delay.millis()
       << "ms.";
   timer_handle_ = xds_channel()->xds_client()->engine()->RunAfter(
@@ -674,7 +676,7 @@ void XdsClient::XdsChannel::RetryableCall<T>::OnRetryTimer() {
     if (shutting_down_) return;
     GRPC_TRACE_LOG(xds_client, INFO)
         << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-        << xds_channel()->server_.server_uri()
+        << xds_channel()->server_uri()
         << ": retry timer fired (retryable call: " << this << ")";
     StartNewCallLocked();
   }
@@ -723,7 +725,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
   // Start the call.
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": starting ADS call (ads_call: " << this
       << ", streaming_call: " << streaming_call_.get() << ")";
   // If this is a reconnect, add any necessary subscriptions from what's
@@ -906,7 +908,7 @@ void XdsClient::XdsChannel::AdsCall::SendMessageLocked(
   sent_initial_message_ = true;
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": sending ADS request: type=" << type->type_url()
       << " version=" << xds_channel()->resource_type_version_map_[type]
       << " nonce=" << state.nonce << " error=" << state.status;
@@ -1221,7 +1223,7 @@ absl::Status XdsClient::XdsChannel::AdsCall::DecodeAdsResponse(
   }
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": received ADS response: type_url=" << context->type_url
       << ", version=" << context->version << ", nonce=" << context->nonce
       << ", num_resources=" << num_resources << ", num_errors=" << num_errors;
@@ -1306,7 +1308,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
   if (!status.ok()) {
     // Ignore unparsable response.
     LOG(ERROR) << "[xds_client " << xds_client() << "] xds server "
-               << xds_channel()->server_.server_uri()
+               << xds_channel()->server_uri()
                << ": error parsing ADS response (" << status << ") -- ignoring";
   } else {
     seen_response_ = true;
@@ -1320,7 +1322,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
           absl::StrCat("xDS response validation errors: [",
                        absl::StrJoin(context.errors, "; "), "]"));
       LOG(ERROR) << "[xds_client " << xds_client() << "] xds server "
-                 << xds_channel()->server_.server_uri()
+                 << xds_channel()->server_uri()
                  << ": ADS response invalid for resource type "
                  << context.type_url << " version " << context.version
                  << ", will NACK: nonce=" << state.nonce
@@ -1374,7 +1376,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
   // Update metrics.
   if (xds_client()->metrics_reporter_ != nullptr) {
     xds_client()->metrics_reporter_->ReportResourceUpdates(
-        xds_channel()->server_.server_uri(), context.type_url,
+        xds_channel()->server_uri(), context.type_url,
         context.num_valid_resources, context.num_invalid_resources);
   }
 }
@@ -1383,7 +1385,7 @@ void XdsClient::XdsChannel::AdsCall::OnStatusReceived(absl::Status status) {
   MutexLock lock(&xds_client()->mu_);
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": ADS call status received (xds_channel=" << xds_channel()
       << ", ads_call=" << this << ", streaming_call=" << streaming_call_.get()
       << "): " << status;
@@ -1877,7 +1879,7 @@ std::string XdsClient::ConstructFullXdsResourceName(
     absl::string_view authority, absl::string_view resource_type,
     const XdsResourceKey& key) {
   if (authority != kOldStyleAuthority) {
-    auto uri = URI::Create("xdstp", std::string(authority),
+    auto uri = URI::Create("xdstp", /*user_info=*/"", std::string(authority),
                            absl::StrCat("/", resource_type, "/", key.id),
                            key.query_params, /*fragment=*/"");
     CHECK(uri.ok());

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

@@ -213,7 +213,9 @@ class XdsClient : public DualRefCounted<XdsClient> {
                            bool delay_unsubscription)
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_);
 
-    absl::string_view server_uri() const { return server_.server_uri(); }
+    absl::string_view server_uri() const {
+      return server_.target()->server_uri();
+    }
 
    private:
     class ConnectivityFailureWatcher;

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

@@ -87,8 +87,7 @@ class XdsResourceType {
   // properly in logs.
   // Note: This won't actually work properly until upb adds support for
   // Any fields in textproto printing (internal b/178821188).
-  virtual void InitUpbSymtab(XdsClient* xds_client,
-                             upb_DefPool* symtab) const = 0;
+  virtual void InitUpbSymtab(XdsClient*, upb_DefPool*) const {}
 };
 
 }  // namespace grpc_core

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

@@ -96,7 +96,7 @@ class XdsTransportFactory : public DualRefCounted<XdsTransportFactory> {
   // *status will be set if there is an error creating the channel,
   // although the returned channel must still accept calls (which may fail).
   virtual RefCountedPtr<XdsTransport> GetTransport(
-      const XdsBootstrap::XdsServer& server, absl::Status* status) = 0;
+      const XdsBootstrap::XdsServerTarget& server, absl::Status* status) = 0;
 };
 
 }  // namespace grpc_core

data/src/ruby/ext/grpc/extconf.rb

@@ -29,7 +29,7 @@ grpc_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
 
 grpc_config = ENV['GRPC_CONFIG'] || 'opt'
 
-ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
+ENV['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
 
 def debug_symbols_output_dir
   d = ENV['GRPC_RUBY_DEBUG_SYMBOLS_OUTPUT_DIR']
@@ -231,7 +231,7 @@ File.rename('Makefile.new', 'Makefile')
 
 if grpc_config == 'opt'
   File.open('Makefile.new', 'w') do |o|
-    o.puts 'hijack: all strip'
+    o.puts 'hijack: all strip remove_unused_artifacts'
     o.puts
     o.write(File.read('Makefile'))
     o.puts

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.71.0'
+  VERSION = '1.73.0'
 end