grpc 1.67.0.pre1 → 1.68.1

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

@@ -16,6 +16,13 @@
 
 #include "src/core/xds/grpc/xds_client_grpc.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <memory>
@@ -30,32 +37,23 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "envoy/service/status/v3/csds.upb.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.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"
-#include "src/core/lib/gprpp/load_file.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
 #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/util/debug_location.h"
+#include "src/core/util/env.h"
+#include "src/core/util/load_file.h"
+#include "src/core/util/orphanable.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
+#include "src/core/util/time.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"
@@ -64,6 +62,7 @@
 #include "src/core/xds/xds_client/xds_channel_args.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/base/string_view.h"
 
 // If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string
 // will be appended to the user agent name reported to the xDS server.
@@ -226,6 +225,23 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
       "not defined");
 }
 
+GlobalStatsPluginRegistry::StatsPluginGroup
+GetStatsPluginGroupForKeyAndChannelArgs(absl::string_view key,
+                                        const ChannelArgs& channel_args) {
+  if (key == GrpcXdsClient::kServerKey) {
+    return GlobalStatsPluginRegistry::GetStatsPluginsForServer(channel_args);
+  }
+  grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config(
+      channel_args);
+  std::string authority =
+      channel_args.GetOwnedString(GRPC_ARG_DEFAULT_AUTHORITY)
+          .value_or(
+              CoreConfiguration::Get().resolver_registry().GetDefaultAuthority(
+                  key));
+  experimental::StatsPluginChannelScope scope(key, authority, endpoint_config);
+  return GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
+}
+
 }  // namespace
 
 absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
@@ -242,7 +258,8 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
     auto channel_args = ChannelArgs::FromC(xds_channel_args);
     return MakeRefCounted<GrpcXdsClient>(
         key, std::move(*bootstrap), channel_args,
-        MakeOrphanable<GrpcXdsTransportFactory>(channel_args));
+        MakeRefCounted<GrpcXdsTransportFactory>(channel_args),
+        GetStatsPluginGroupForKeyAndChannelArgs(key, args));
   }
   // Otherwise, use the global instance.
   MutexLock lock(g_mu);
@@ -265,7 +282,8 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
   auto channel_args = ChannelArgs::FromC(g_channel_args);
   auto xds_client = MakeRefCounted<GrpcXdsClient>(
       key, std::move(*bootstrap), channel_args,
-      MakeOrphanable<GrpcXdsTransportFactory>(channel_args));
+      MakeRefCounted<GrpcXdsTransportFactory>(channel_args),
+      GetStatsPluginGroupForKeyAndChannelArgs(key, args));
   g_xds_client_map->emplace(xds_client->key(), xds_client.get());
   GRPC_TRACE_LOG(xds_client, INFO) << "[xds_client " << xds_client.get()
                                    << "] Created xDS client for key " << key;
@@ -274,33 +292,29 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
 
 namespace {
 
-GlobalStatsPluginRegistry::StatsPluginGroup GetStatsPluginGroupForKey(
-    absl::string_view key) {
-  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, "", endpoint_config);
-  return GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
+std::string UserAgentName() {
+  return absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING,
+                      GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING);
+}
+
+std::string UserAgentVersion() {
+  return absl::StrCat("C-core ", grpc_version_string(),
+                      GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING,
+                      GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING);
 }
 
 }  // namespace
 
 GrpcXdsClient::GrpcXdsClient(
-    absl::string_view key, std::unique_ptr<GrpcXdsBootstrap> bootstrap,
+    absl::string_view key, std::shared_ptr<GrpcXdsBootstrap> bootstrap,
     const ChannelArgs& args,
-    OrphanablePtr<XdsTransportFactory> transport_factory)
+    RefCountedPtr<XdsTransportFactory> transport_factory,
+    GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group)
     : XdsClient(
-          std::move(bootstrap), std::move(transport_factory),
+          bootstrap, transport_factory,
           grpc_event_engine::experimental::GetDefaultEventEngine(),
-          std::make_unique<MetricsReporter>(*this),
-          absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING,
-                       GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING),
-          absl::StrCat("C-core ", grpc_version_string(),
-                       GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING,
-                       GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING),
+          std::make_unique<MetricsReporter>(*this), UserAgentName(),
+          UserAgentVersion(),
           std::max(Duration::Zero(),
                    args.GetDurationFromIntMillis(
                            GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS)
@@ -309,16 +323,21 @@ GrpcXdsClient::GrpcXdsClient(
       certificate_provider_store_(MakeOrphanable<CertificateProviderStore>(
           static_cast<const GrpcXdsBootstrap&>(this->bootstrap())
               .certificate_providers())),
-      stats_plugin_group_(GetStatsPluginGroupForKey(key_)),
+      stats_plugin_group_(std::move(stats_plugin_group)),
       registered_metric_callback_(stats_plugin_group_.RegisterCallback(
           [this](CallbackMetricReporter& reporter) {
             ReportCallbackMetrics(reporter);
           },
-          Duration::Seconds(5), kMetricConnected, kMetricResources)) {}
+          Duration::Seconds(5), kMetricConnected, kMetricResources)),
+      lrs_client_(MakeRefCounted<LrsClient>(
+          std::move(bootstrap), UserAgentName(), UserAgentVersion(),
+          std::move(transport_factory),
+          grpc_event_engine::experimental::GetDefaultEventEngine())) {}
 
 void GrpcXdsClient::Orphaned() {
   registered_metric_callback_.reset();
   XdsClient::Orphaned();
+  lrs_client_.reset();
   MutexLock lock(g_mu);
   auto it = g_xds_client_map->find(key_);
   if (it != g_xds_client_map->end() && it->second == this) {
@@ -326,6 +345,11 @@ void GrpcXdsClient::Orphaned() {
   }
 }
 
+void GrpcXdsClient::ResetBackoff() {
+  XdsClient::ResetBackoff();
+  lrs_client_->ResetBackoff();
+}
+
 grpc_pollset_set* GrpcXdsClient::interested_parties() const {
   return reinterpret_cast<GrpcXdsTransportFactory*>(transport_factory())
       ->interested_parties();

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

@@ -17,23 +17,23 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/telemetry/metrics.h"
+#include "src/core/util/orphanable.h"
+#include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/useful.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/xds_client/lrs_client.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_transport.h"
 
@@ -61,9 +61,10 @@ class GrpcXdsClient final : public XdsClient {
   // that also use certificate_provider_store(), but we should consider
   // alternatives for that case as well.
   GrpcXdsClient(absl::string_view key,
-                std::unique_ptr<GrpcXdsBootstrap> bootstrap,
+                std::shared_ptr<GrpcXdsBootstrap> bootstrap,
                 const ChannelArgs& args,
-                OrphanablePtr<XdsTransportFactory> transport_factory);
+                RefCountedPtr<XdsTransportFactory> transport_factory,
+                GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group);
 
   // Helpers for encoding the XdsClient object in channel args.
   static absl::string_view ChannelArgName() {
@@ -73,6 +74,8 @@ class GrpcXdsClient final : public XdsClient {
     return QsortCompare(a, b);
   }
 
+  void ResetBackoff() override;
+
   grpc_pollset_set* interested_parties() const;
 
   CertificateProviderStore& certificate_provider_store() const {
@@ -81,6 +84,8 @@ class GrpcXdsClient final : public XdsClient {
 
   absl::string_view key() const { return key_; }
 
+  LrsClient& lrs_client() { return *lrs_client_; }
+
   // Builds ClientStatusResponse containing all resources from all XdsClients
   static grpc_slice DumpAllClientConfigs();
 
@@ -94,6 +99,7 @@ class GrpcXdsClient final : public XdsClient {
   OrphanablePtr<CertificateProviderStore> certificate_provider_store_;
   GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group_;
   std::unique_ptr<RegisteredMetricCallback> registered_metric_callback_;
+  RefCountedPtr<LrsClient> lrs_client_;
 };
 
 namespace internal {

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

@@ -18,10 +18,9 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include "src/core/lib/gprpp/match.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/util/json/json_writer.h"
+#include "src/core/util/match.h"
+#include "src/core/util/time.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 
 namespace grpc_core {
@@ -49,10 +48,16 @@ std::string XdsClusterResource::ToString() const {
       });
   contents.push_back(absl::StrCat("lb_policy_config=",
                                   JsonDump(Json::FromArray(lb_policy_config))));
-  if (lrs_load_reporting_server.has_value()) {
+  if (lrs_load_reporting_server != nullptr) {
     contents.push_back(absl::StrCat("lrs_load_reporting_server_name=",
                                     lrs_load_reporting_server->server_uri()));
   }
+  if (lrs_backend_metric_propagation != nullptr) {
+    contents.push_back(
+        absl::StrCat("lrs_backend_metric_propagation=",
+                     lrs_backend_metric_propagation->AsString()));
+  }
+  if (use_http_connect) contents.push_back("use_http_connect=true");
   if (!common_tls_context.Empty()) {
     contents.push_back(
         absl::StrCat("common_tls_context=", common_tls_context.ToString()));

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

@@ -23,18 +23,36 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 #include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/grpc/xds_metadata.h"
 #include "src/core/xds/grpc/xds_server_grpc.h"
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
 namespace grpc_core {
 
+inline bool LrsServersEqual(
+    const std::shared_ptr<const GrpcXdsServer>& lrs_server1,
+    const std::shared_ptr<const GrpcXdsServer>& lrs_server2) {
+  if (lrs_server1 == nullptr) return lrs_server2 == nullptr;
+  if (lrs_server2 == nullptr) return false;
+  // Neither one is null, so compare them.
+  return *lrs_server1 == *lrs_server2;
+}
+
+inline bool LrsBackendMetricPropagationEqual(
+    const RefCountedPtr<const BackendMetricPropagation>& p1,
+    const RefCountedPtr<const BackendMetricPropagation>& p2) {
+  if (p1 == nullptr) return p2 == nullptr;
+  if (p2 == nullptr) return false;
+  // Neither one is null, so compare them.
+  return *p1 == *p2;
+}
+
 struct XdsClusterResource : public XdsResourceType::ResourceData {
   struct Eds {
     // If empty, defaults to the cluster name.
@@ -71,8 +89,12 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
   // Note: Remaining fields are not used for aggregate clusters.
 
   // The LRS server to use for load reporting.
-  // If not set, load reporting will be disabled.
-  absl::optional<GrpcXdsServer> lrs_load_reporting_server;
+  // If null, load reporting will be disabled.
+  std::shared_ptr<const GrpcXdsServer> lrs_load_reporting_server;
+  // The set of metrics to propagate from ORCA to LRS.
+  RefCountedPtr<const BackendMetricPropagation> lrs_backend_metric_propagation;
+
+  bool use_http_connect = false;
 
   // Tls Context used by clients
   CommonTlsContext common_tls_context;
@@ -92,7 +114,11 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
 
   bool operator==(const XdsClusterResource& other) const {
     return type == other.type && lb_policy_config == other.lb_policy_config &&
-           lrs_load_reporting_server == other.lrs_load_reporting_server &&
+           LrsServersEqual(lrs_load_reporting_server,
+                           other.lrs_load_reporting_server) &&
+           LrsBackendMetricPropagationEqual(
+               lrs_backend_metric_propagation,
+               other.lrs_backend_metric_propagation) &&
            common_tls_context == other.common_tls_context &&
            connection_idle_timeout == other.connection_idle_timeout &&
            max_concurrent_requests == other.max_concurrent_requests &&

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

@@ -38,49 +38,56 @@
 #include "envoy/config/endpoint/v3/endpoint.upb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.upb.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/text/encode.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/util/env.h"
+#include "src/core/util/host_port.h"
+#include "src/core/util/time.h"
 #include "src/core/util/upb_utils.h"
+#include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 #include "src/core/xds/grpc/xds_metadata_parser.h"
+#include "src/core/xds/xds_client/lrs_client.h"
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
+#include "upb/base/string_view.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
+// TODO(roth): Remove this once the feature passes interop tests.
+bool XdsHttpConnectEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  if (!value.has_value()) return false;
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
+  return parse_succeeded && parsed_value;
+}
+
 namespace {
 
+constexpr absl::string_view kUpstreamTlsContextType =
+    "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext";
+
+constexpr absl::string_view kHttp11ProxyType =
+    "envoy.extensions.transport_sockets.http_11_proxy.v3"
+    ".Http11ProxyUpstreamTransport";
+
 CommonTlsContext UpstreamTlsContextParse(
     const XdsResourceType::DecodeContext& context,
-    const envoy_config_core_v3_TransportSocket* transport_socket,
-    ValidationErrors* errors) {
-  ValidationErrors::ScopedField field(errors, ".typed_config");
-  const auto* typed_config =
-      envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
-  auto extension = ExtractXdsExtension(context, typed_config, errors);
-  if (!extension.has_value()) return {};
-  if (extension->type !=
-      "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext") {
-    ValidationErrors::ScopedField field(errors, ".type_url");
-    errors->AddError("unsupported transport socket type");
-    return {};
-  }
-  absl::string_view* serialized_upstream_tls_context =
-      absl::get_if<absl::string_view>(&extension->value);
+    const XdsExtension& extension, ValidationErrors* errors) {
+  const absl::string_view* serialized_upstream_tls_context =
+      absl::get_if<absl::string_view>(&extension.value);
   if (serialized_upstream_tls_context == nullptr) {
     errors->AddError("can't decode UpstreamTlsContext");
     return {};
@@ -109,6 +116,39 @@ CommonTlsContext UpstreamTlsContextParse(
   return common_tls_context;
 }
 
+CommonTlsContext Http11ProxyUpstreamTransportParse(
+    const XdsResourceType::DecodeContext& context,
+    const XdsExtension& extension, ValidationErrors* errors) {
+  const absl::string_view* serialized =
+      absl::get_if<absl::string_view>(&extension.value);
+  if (serialized == nullptr) {
+    errors->AddError("can't decode Http11ProxyUpstreamTransport");
+    return {};
+  }
+  const auto* http_11_proxy =
+      envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse(
+          serialized->data(), serialized->size(), context.arena);
+  if (http_11_proxy == nullptr) {
+    errors->AddError("can't decode Http11ProxyUpstreamTransport");
+    return {};
+  }
+  const auto* transport_socket =
+      envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(
+          http_11_proxy);
+  if (transport_socket == nullptr) return {};
+  ValidationErrors::ScopedField field(errors, ".transport_socket.typed_config");
+  const auto* typed_config =
+      envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
+  auto wrapped_extension = ExtractXdsExtension(context, typed_config, errors);
+  if (!wrapped_extension.has_value()) return {};
+  if (wrapped_extension->type != kUpstreamTlsContextType) {
+    ValidationErrors::ScopedField field(errors, ".type_url");
+    errors->AddError("unsupported transport socket type");
+    return {};
+  }
+  return UpstreamTlsContextParse(context, *wrapped_extension, errors);
+}
+
 XdsClusterResource::Eds EdsConfigParse(
     const envoy_config_cluster_v3_Cluster* cluster, ValidationErrors* errors) {
   XdsClusterResource::Eds eds;
@@ -442,9 +482,24 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
   auto* transport_socket =
       envoy_config_cluster_v3_Cluster_transport_socket(cluster);
   if (transport_socket != nullptr) {
-    ValidationErrors::ScopedField field(&errors, ".transport_socket");
-    cds_update->common_tls_context =
-        UpstreamTlsContextParse(context, transport_socket, &errors);
+    ValidationErrors::ScopedField field(&errors,
+                                        ".transport_socket.typed_config");
+    const auto* typed_config =
+        envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
+    auto extension = ExtractXdsExtension(context, typed_config, &errors);
+    if (extension.has_value()) {
+      if (XdsHttpConnectEnabled() && extension->type == kHttp11ProxyType) {
+        cds_update->use_http_connect = true;
+        cds_update->common_tls_context =
+            Http11ProxyUpstreamTransportParse(context, *extension, &errors);
+      } else if (extension->type == kUpstreamTlsContextType) {
+        cds_update->common_tls_context =
+            UpstreamTlsContextParse(context, *extension, &errors);
+      } else {
+        ValidationErrors::ScopedField field(&errors, ".type_url");
+        errors.AddError("unsupported transport socket type");
+      }
+    }
   }
   // Record LRS server name (if any).
   const envoy_config_core_v3_ConfigSource* lrs_server =
@@ -454,9 +509,34 @@ 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.emplace(
+    cds_update->lrs_load_reporting_server = std::make_shared<GrpcXdsServer>(
         static_cast<const GrpcXdsServer&>(context.server));
   }
+  // Record LRS metric propagation.
+  auto propagation = MakeRefCounted<BackendMetricPropagation>();
+  if (XdsOrcaLrsPropagationChangesEnabled()) {
+    size_t size;
+    upb_StringView const* metrics =
+        envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics(cluster,
+                                                                    &size);
+    for (size_t i = 0; i < size; ++i) {
+      absl::string_view metric_name = UpbStringToAbsl(metrics[i]);
+      if (metric_name == "cpu_utilization") {
+        propagation->propagation_bits |= propagation->kCpuUtilization;
+      } else if (metric_name == "mem_utilization") {
+        propagation->propagation_bits |= propagation->kMemUtilization;
+      } else if (metric_name == "application_utilization") {
+        propagation->propagation_bits |= propagation->kApplicationUtilization;
+      } else if (absl::ConsumePrefix(&metric_name, "named_metrics.")) {
+        if (metric_name == "*") {
+          propagation->propagation_bits |= propagation->kNamedMetricsAll;
+        } else {
+          propagation->named_metric_keys.emplace(metric_name);
+        }
+      }
+    }
+  }
+  cds_update->lrs_backend_metric_propagation = std::move(propagation);
   // Protocol options.
   auto* upstream_config =
       envoy_config_cluster_v3_Cluster_upstream_config(cluster);

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

@@ -20,17 +20,19 @@
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upbdefs.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
+bool XdsHttpConnectEnabled();
+
 class XdsClusterResourceType
     : public XdsResourceTypeImpl<XdsClusterResourceType, XdsClusterResource> {
  public:
@@ -46,6 +48,8 @@ class XdsClusterResourceType
   void InitUpbSymtab(XdsClient*, upb_DefPool* symtab) const override {
     envoy_config_cluster_v3_Cluster_getmsgdef(symtab);
     envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(symtab);
+    envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_getmsgdef(
+        symtab);
     envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_getmsgdef(
         symtab);
     envoy_extensions_upstreams_http_v3_HttpProtocolOptions_getmsgdef(symtab);

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

@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -25,17 +27,13 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
-#include "upb/base/status.hpp"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
+#include "upb/base/status.hpp"
+#include "upb/json/encode.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 

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

@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/util/json/json.h"
+#include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 

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

@@ -19,8 +19,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include "src/core/lib/gprpp/match.h"
+#include "src/core/util/match.h"
 
 namespace grpc_core {
 

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

@@ -22,10 +22,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/matchers/matchers.h"
 #include "src/core/util/json/json.h"
+#include "src/core/util/matchers.h"
+#include "src/core/util/validation_errors.h"
 
 namespace grpc_core {