grpc 1.62.0 → 1.63.0

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

@@ -49,7 +49,7 @@ class XdsClusterSpecifierPluginImpl {
       ValidationErrors* errors) const = 0;
 };
 
-class XdsRouteLookupClusterSpecifierPlugin
+class XdsRouteLookupClusterSpecifierPlugin final
     : public XdsClusterSpecifierPluginImpl {
   absl::string_view ConfigProtoName() const override;
 
@@ -60,7 +60,7 @@ class XdsRouteLookupClusterSpecifierPlugin
       ValidationErrors* errors) const override;
 };
 
-class XdsClusterSpecifierPluginRegistry {
+class XdsClusterSpecifierPluginRegistry final {
  public:
   XdsClusterSpecifierPluginRegistry();
 

data/src/core/ext/xds/xds_endpoint.cc

@@ -81,7 +81,7 @@ std::string XdsEndpointResource::Priority::Locality::ToString() const {
   for (const EndpointAddresses& endpoint : endpoints) {
     endpoint_strings.emplace_back(endpoint.ToString());
   }
-  return absl::StrCat("{name=", name->AsHumanReadableString(),
+  return absl::StrCat("{name=", name->human_readable_string().as_string_view(),
                       ", lb_weight=", lb_weight, ", endpoints=[",
                       absl::StrJoin(endpoint_strings, ", "), "]}");
 }
@@ -420,7 +420,8 @@ absl::StatusOr<std::shared_ptr<const XdsEndpointResource>> EdsResourceParse(
         if (it != locality_map.end()) {
           errors.AddError(absl::StrCat(
               "duplicate locality ",
-              parsed_locality->locality.name->AsHumanReadableString(),
+              parsed_locality->locality.name->human_readable_string()
+                  .as_string_view(),
               " found in priority ", parsed_locality->priority));
         } else {
           locality_map.emplace(parsed_locality->locality.name.get(),

data/src/core/ext/xds/xds_endpoint.h

@@ -71,7 +71,7 @@ struct XdsEndpointResource : public XdsResourceType::ResourceData {
   // 1. to initialize in the control plane combiner;
   // 2. to use in the data plane combiner.
   // So no additional synchronization is needed.
-  class DropConfig : public RefCounted<DropConfig> {
+  class DropConfig final : public RefCounted<DropConfig> {
    public:
     struct DropCategory {
       bool operator==(const DropCategory& other) const {
@@ -130,7 +130,7 @@ struct XdsEndpointResource : public XdsResourceType::ResourceData {
   std::string ToString() const;
 };
 
-class XdsEndpointResourceType
+class XdsEndpointResourceType final
     : public XdsResourceTypeImpl<XdsEndpointResourceType, XdsEndpointResource> {
  public:
   absl::string_view type_url() const override {

data/src/core/ext/xds/xds_health_status.h

@@ -34,7 +34,7 @@
 
 namespace grpc_core {
 
-class XdsHealthStatus {
+class XdsHealthStatus final {
  public:
   enum HealthStatus { kUnknown, kHealthy, kDraining };
 
@@ -56,7 +56,7 @@ class XdsHealthStatus {
   HealthStatus status_;
 };
 
-class XdsHealthStatusSet {
+class XdsHealthStatusSet final {
  public:
   XdsHealthStatusSet() = default;
 

data/src/core/ext/xds/xds_http_fault_filter.h

@@ -33,7 +33,7 @@
 
 namespace grpc_core {
 
-class XdsHttpFaultFilter : public XdsHttpFilterImpl {
+class XdsHttpFaultFilter final : public XdsHttpFilterImpl {
  public:
   absl::string_view ConfigProtoName() const override;
   absl::string_view OverrideConfigProtoName() const override;

data/src/core/ext/xds/xds_http_filters.h

@@ -124,7 +124,7 @@ class XdsHttpFilterImpl {
   virtual bool IsTerminalFilter() const { return false; }
 };
 
-class XdsHttpRouterFilter : public XdsHttpFilterImpl {
+class XdsHttpRouterFilter final : public XdsHttpFilterImpl {
  public:
   absl::string_view ConfigProtoName() const override;
   absl::string_view OverrideConfigProtoName() const override;
@@ -147,7 +147,7 @@ class XdsHttpRouterFilter : public XdsHttpFilterImpl {
   bool IsTerminalFilter() const override { return true; }
 };
 
-class XdsHttpFilterRegistry {
+class XdsHttpFilterRegistry final {
  public:
   explicit XdsHttpFilterRegistry(bool register_builtins = true);
 

data/src/core/ext/xds/xds_http_rbac_filter.h

@@ -33,7 +33,7 @@
 
 namespace grpc_core {
 
-class XdsHttpRbacFilter : public XdsHttpFilterImpl {
+class XdsHttpRbacFilter final : public XdsHttpFilterImpl {
  public:
   absl::string_view ConfigProtoName() const override;
   absl::string_view OverrideConfigProtoName() const override;

data/src/core/ext/xds/xds_http_stateful_session_filter.h

@@ -33,7 +33,7 @@
 
 namespace grpc_core {
 
-class XdsHttpStatefulSessionFilter : public XdsHttpFilterImpl {
+class XdsHttpStatefulSessionFilter final : public XdsHttpFilterImpl {
  public:
   absl::string_view ConfigProtoName() const override;
   absl::string_view OverrideConfigProtoName() const override;

data/src/core/ext/xds/xds_lb_policy_registry.cc

@@ -46,7 +46,7 @@ namespace grpc_core {
 
 namespace {
 
-class RoundRobinLbPolicyConfigFactory
+class RoundRobinLbPolicyConfigFactory final
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
   Json::Object ConvertXdsLbPolicyConfig(
@@ -64,7 +64,7 @@ class RoundRobinLbPolicyConfigFactory
   }
 };
 
-class ClientSideWeightedRoundRobinLbPolicyConfigFactory
+class ClientSideWeightedRoundRobinLbPolicyConfigFactory final
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
   Json::Object ConvertXdsLbPolicyConfig(
@@ -151,7 +151,7 @@ class ClientSideWeightedRoundRobinLbPolicyConfigFactory
   }
 };
 
-class RingHashLbPolicyConfigFactory
+class RingHashLbPolicyConfigFactory final
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
   Json::Object ConvertXdsLbPolicyConfig(
@@ -216,7 +216,7 @@ class RingHashLbPolicyConfigFactory
   }
 };
 
-class WrrLocalityLbPolicyConfigFactory
+class WrrLocalityLbPolicyConfigFactory final
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
   Json::Object ConvertXdsLbPolicyConfig(
@@ -255,7 +255,7 @@ class WrrLocalityLbPolicyConfigFactory
   }
 };
 
-class PickFirstLbPolicyConfigFactory
+class PickFirstLbPolicyConfigFactory final
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
   Json::Object ConvertXdsLbPolicyConfig(

data/src/core/ext/xds/xds_lb_policy_registry.h

@@ -33,7 +33,7 @@ namespace grpc_core {
 
 // A registry that maintans a set of converters that are able to map xDS
 // loadbalancing policy configurations to gRPC's JSON format.
-class XdsLbPolicyRegistry {
+class XdsLbPolicyRegistry final {
  public:
   class ConfigFactory {
    public:

data/src/core/ext/xds/xds_listener.h

@@ -207,7 +207,7 @@ struct XdsListenerResource : public XdsResourceType::ResourceData {
   std::string ToString() const;
 };
 
-class XdsListenerResourceType
+class XdsListenerResourceType final
     : public XdsResourceTypeImpl<XdsListenerResourceType, XdsListenerResource> {
  public:
   absl::string_view type_url() const override {

data/src/core/ext/xds/xds_metrics.h

@@ -0,0 +1,39 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+namespace grpc_core {
+
+// An interface for XdsClient to report metrics.
+class XdsMetricsReporter {
+ public:
+  virtual ~XdsMetricsReporter() = default;
+
+  virtual void ReportResourceUpdates(absl::string_view xds_server,
+                                     absl::string_view resource_type,
+                                     uint64_t num_valid,
+                                     uint64_t num_invalid) = 0;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H

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

@@ -227,7 +227,7 @@ struct XdsRouteConfigResource : public XdsResourceType::ResourceData {
       ValidationErrors* errors);
 };
 
-class XdsRouteConfigResourceType
+class XdsRouteConfigResourceType final
     : public XdsResourceTypeImpl<XdsRouteConfigResourceType,
                                  XdsRouteConfigResource> {
  public:

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

@@ -39,7 +39,7 @@
 
 namespace grpc_core {
 
-class XdsRouting {
+class XdsRouting final {
  public:
   class VirtualHostListIterator {
    public:

data/src/core/ext/xds/xds_server_config_fetcher.cc

@@ -99,7 +99,7 @@ TraceFlag grpc_xds_server_config_fetcher_trace(false,
 
 // A server config fetcher that fetches the information for configuring server
 // listeners from the xDS control plane.
-class XdsServerConfigFetcher : public grpc_server_config_fetcher {
+class XdsServerConfigFetcher final : public grpc_server_config_fetcher {
  public:
   XdsServerConfigFetcher(RefCountedPtr<GrpcXdsClient> xds_client,
                          grpc_server_xds_status_notifier notifier);
@@ -140,7 +140,7 @@ class XdsServerConfigFetcher : public grpc_server_config_fetcher {
 // continues to be used. If there isn't any previous good update or if the
 // update received was a fatal error (resource does not exist), the server
 // listener is made to stop listening.
-class XdsServerConfigFetcher::ListenerWatcher
+class XdsServerConfigFetcher::ListenerWatcher final
     : public XdsListenerResourceType::WatcherInterface {
  public:
   ListenerWatcher(RefCountedPtr<GrpcXdsClient> xds_client,
@@ -200,7 +200,7 @@ class XdsServerConfigFetcher::ListenerWatcher
 // appropriate filter chain from the xDS Listener resource and injects channel
 // args that configure the right mTLS certs and cause the right set of HTTP
 // filters to be injected.
-class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager
+class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager final
     : public grpc_server_config_fetcher::ConnectionManager {
  public:
   FilterChainMatchManager(RefCountedPtr<GrpcXdsClient> xds_client,
@@ -215,8 +215,6 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager
   absl::StatusOr<ChannelArgs> UpdateChannelArgsForConnection(
       const ChannelArgs& args, grpc_endpoint* tcp) override;
 
-  void Orphan() override;
-
   // Invoked by ListenerWatcher to start fetching referenced RDS resources.
   void StartRdsWatch(RefCountedPtr<ListenerWatcher> listener_watcher)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ListenerWatcher::mu_);
@@ -246,6 +244,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager
   absl::StatusOr<RefCountedPtr<XdsCertificateProvider>>
   CreateOrGetXdsCertificateProviderFromFilterChainData(
       const XdsListenerResource::FilterChainData* filter_chain);
+  void Orphaned() override;
 
   // Helper functions invoked by RouteConfigWatcher when there are updates to
   // RDS resources.
@@ -281,7 +280,8 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager
 // with the latest updates and new connections do not need to wait for the RDS
 // resources to be fetched.
 class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    RouteConfigWatcher : public XdsRouteConfigResourceType::WatcherInterface {
+    RouteConfigWatcher final
+    : public XdsRouteConfigResourceType::WatcherInterface {
  public:
   RouteConfigWatcher(
       std::string resource_name,
@@ -317,7 +317,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 // DynamicXdsServerConfigSelectorProvider to parse the RDS update and get
 // per-call configuration based on incoming metadata.
 class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    XdsServerConfigSelector : public ServerConfigSelector {
+    XdsServerConfigSelector final : public ServerConfigSelector {
  public:
   static absl::StatusOr<RefCountedPtr<XdsServerConfigSelector>> Create(
       const XdsHttpFilterRegistry& http_filter_registry,
@@ -341,7 +341,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
       RefCountedPtr<ServiceConfig> method_config;
     };
 
-    class RouteListIterator : public XdsRouting::RouteListIterator {
+    class RouteListIterator final : public XdsRouting::RouteListIterator {
      public:
       explicit RouteListIterator(const std::vector<Route>* routes)
           : routes_(routes) {}
@@ -361,7 +361,8 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
     std::vector<Route> routes;
   };
 
-  class VirtualHostListIterator : public XdsRouting::VirtualHostListIterator {
+  class VirtualHostListIterator final
+      : public XdsRouting::VirtualHostListIterator {
    public:
     explicit VirtualHostListIterator(
         const std::vector<VirtualHost>* virtual_hosts)
@@ -384,7 +385,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 // An XdsServerConfigSelectorProvider implementation for when the
 // RouteConfiguration is available inline.
 class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    StaticXdsServerConfigSelectorProvider
+    StaticXdsServerConfigSelectorProvider final
     : public ServerConfigSelectorProvider {
  public:
   StaticXdsServerConfigSelectorProvider(
@@ -415,11 +416,11 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
         static_resource_.value(), http_filters_);
   }
 
-  void Orphan() override {}
-
   void CancelWatch() override { watcher_.reset(); }
 
  private:
+  void Orphaned() override {}
+
   RefCountedPtr<GrpcXdsClient> xds_client_;
   absl::StatusOr<std::shared_ptr<const XdsRouteConfigResource>>
       static_resource_;
@@ -435,7 +436,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 // An XdsServerConfigSelectorProvider implementation for when the
 // RouteConfiguration is to be fetched separately via RDS.
 class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    DynamicXdsServerConfigSelectorProvider
+    DynamicXdsServerConfigSelectorProvider final
     : public ServerConfigSelectorProvider {
  public:
   DynamicXdsServerConfigSelectorProvider(
@@ -449,8 +450,6 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
     xds_client_.reset(DEBUG_LOCATION, "DynamicXdsServerConfigSelectorProvider");
   }
 
-  void Orphan() override;
-
   absl::StatusOr<RefCountedPtr<ServerConfigSelector>> Watch(
       std::unique_ptr<ServerConfigSelectorProvider::ServerConfigSelectorWatcher>
           watcher) override;
@@ -459,6 +458,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
  private:
   class RouteConfigWatcher;
 
+  void Orphaned() override;
   void OnRouteConfigChanged(
       std::shared_ptr<const XdsRouteConfigResource> rds_update);
   void OnError(absl::Status status);
@@ -482,7 +482,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 // A watcher implementation for updating the RDS resource used by
 // DynamicXdsServerConfigSelectorProvider
 class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    DynamicXdsServerConfigSelectorProvider::RouteConfigWatcher
+    DynamicXdsServerConfigSelectorProvider::RouteConfigWatcher final
     : public XdsRouteConfigResourceType::WatcherInterface {
  public:
   explicit RouteConfigWatcher(
@@ -783,7 +783,7 @@ void XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 }
 
 void XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    Orphan() {
+    Orphaned() {
   MutexLock lock(&mu_);
   // Cancel the RDS watches to clear up the weak refs
   for (const auto& entry : rds_map_) {
@@ -1281,7 +1281,7 @@ XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
 }
 
 void XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
-    DynamicXdsServerConfigSelectorProvider::Orphan() {
+    DynamicXdsServerConfigSelectorProvider::Orphaned() {
   XdsRouteConfigResourceType::CancelWatch(xds_client_.get(), resource_name_,
                                           route_config_watcher_,
                                           false /* delay_unsubscription */);
@@ -1372,7 +1372,8 @@ grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create(
       "update=%p, user_data=%p}, args=%p)",
       3, (notifier.on_serving_status_update, notifier.user_data, args));
   auto xds_client = grpc_core::GrpcXdsClient::GetOrCreate(
-      channel_args, "XdsServerConfigFetcher");
+      grpc_core::GrpcXdsClient::kServerKey, channel_args,
+      "XdsServerConfigFetcher");
   if (!xds_client.ok()) {
     gpr_log(GPR_ERROR, "Failed to create xds client: %s",
             xds_client.status().ToString().c_str());

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

@@ -69,15 +69,16 @@ namespace grpc_core {
 //
 
 GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
-    RefCountedPtr<GrpcXdsTransportFactory> factory, grpc_channel* channel,
+    RefCountedPtr<GrpcXdsTransportFactory> factory, Channel* channel,
     const char* method,
     std::unique_ptr<StreamingCall::EventHandler> event_handler)
     : factory_(std::move(factory)), event_handler_(std::move(event_handler)) {
   // Create call.
-  call_ = grpc_channel_create_pollset_set_call(
-      channel, nullptr, GRPC_PROPAGATE_DEFAULTS, factory_->interested_parties(),
-      StaticSlice::FromStaticString(method).c_slice(), nullptr,
-      Timestamp::InfFuture(), nullptr);
+  call_ = channel->CreateCall(
+      /*parent_call=*/nullptr, GRPC_PROPAGATE_DEFAULTS, /*cq=*/nullptr,
+      factory_->interested_parties(), Slice::FromStaticString(method),
+      /*authority=*/absl::nullopt, Timestamp::InfFuture(),
+      /*registered_method=*/true);
   GPR_ASSERT(call_ != nullptr);
   // Init data associated with the call.
   grpc_metadata_array_init(&initial_metadata_recv_);
@@ -226,7 +227,7 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
 // GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher
 //
 
-class GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher
+class GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher final
     : public AsyncConnectivityStateWatcherInterface {
  public:
   explicit StateWatcher(
@@ -252,19 +253,13 @@ class GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher
 
 namespace {
 
-grpc_channel* CreateXdsChannel(const ChannelArgs& args,
-                               const GrpcXdsBootstrap::GrpcXdsServer& server) {
+OrphanablePtr<Channel> CreateXdsChannel(
+    const ChannelArgs& args, const GrpcXdsBootstrap::GrpcXdsServer& server) {
   RefCountedPtr<grpc_channel_credentials> channel_creds =
       CoreConfiguration::Get().channel_creds_registry().CreateChannelCreds(
           server.channel_creds_config());
-  return grpc_channel_create(server.server_uri().c_str(), channel_creds.get(),
-                             args.ToC().get());
-}
-
-bool IsLameChannel(grpc_channel* channel) {
-  grpc_channel_element* elem =
-      grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
-  return elem->filter == &LameClientFilter::kFilter;
+  return OrphanablePtr<Channel>(Channel::FromC(grpc_channel_create(
+      server.server_uri().c_str(), channel_creds.get(), args.ToC().get())));
 }
 
 }  // namespace
@@ -278,29 +273,19 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
       factory->args_,
       static_cast<const GrpcXdsBootstrap::GrpcXdsServer&>(server));
   GPR_ASSERT(channel_ != nullptr);
-  if (IsLameChannel(channel_)) {
+  if (channel_->IsLame()) {
     *status = absl::UnavailableError("xds client has a lame channel");
   } else {
-    ClientChannelFilter* client_channel =
-        ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
-    GPR_ASSERT(client_channel != nullptr);
     watcher_ = new StateWatcher(std::move(on_connectivity_failure));
-    client_channel->AddConnectivityWatcher(
+    channel_->AddConnectivityWatcher(
         GRPC_CHANNEL_IDLE,
         OrphanablePtr<AsyncConnectivityStateWatcherInterface>(watcher_));
   }
 }
 
-GrpcXdsTransportFactory::GrpcXdsTransport::~GrpcXdsTransport() {
-  grpc_channel_destroy_internal(channel_);
-}
-
 void GrpcXdsTransportFactory::GrpcXdsTransport::Orphan() {
-  if (!IsLameChannel(channel_)) {
-    ClientChannelFilter* client_channel =
-        ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
-    GPR_ASSERT(client_channel != nullptr);
-    client_channel->RemoveConnectivityWatcher(watcher_);
+  if (!channel_->IsLame()) {
+    channel_->RemoveConnectivityWatcher(watcher_);
   }
   // Do an async hop before unreffing.  This avoids a deadlock upon
   // shutdown in the case where the xDS channel is itself an xDS channel
@@ -319,11 +304,11 @@ GrpcXdsTransportFactory::GrpcXdsTransport::CreateStreamingCall(
   return MakeOrphanable<GrpcStreamingCall>(
       factory_->RefAsSubclass<GrpcXdsTransportFactory>(DEBUG_LOCATION,
                                                        "StreamingCall"),
-      channel_, method, std::move(event_handler));
+      channel_.get(), method, std::move(event_handler));
 }
 
 void GrpcXdsTransportFactory::GrpcXdsTransport::ResetBackoff() {
-  grpc_channel_reset_connect_backoff(channel_);
+  channel_->ResetConnectionBackoff();
 }
 
 //

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

@@ -37,10 +37,11 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/surface/channel.h"
 
 namespace grpc_core {
 
-class GrpcXdsTransportFactory : public XdsTransportFactory {
+class GrpcXdsTransportFactory final : public XdsTransportFactory {
  public:
   class GrpcXdsTransport;
 
@@ -61,7 +62,7 @@ class GrpcXdsTransportFactory : public XdsTransportFactory {
   grpc_pollset_set* interested_parties_;
 };
 
-class GrpcXdsTransportFactory::GrpcXdsTransport
+class GrpcXdsTransportFactory::GrpcXdsTransport final
     : public XdsTransportFactory::XdsTransport {
  public:
   class GrpcStreamingCall;
@@ -70,7 +71,6 @@ class GrpcXdsTransportFactory::GrpcXdsTransport
                    const XdsBootstrap::XdsServer& server,
                    std::function<void(absl::Status)> on_connectivity_failure,
                    absl::Status* status);
-  ~GrpcXdsTransport() override;
 
   void Orphan() override;
 
@@ -84,15 +84,15 @@ class GrpcXdsTransportFactory::GrpcXdsTransport
   class StateWatcher;
 
   GrpcXdsTransportFactory* factory_;  // Not owned.
-  grpc_channel* channel_;
+  OrphanablePtr<Channel> channel_;
   StateWatcher* watcher_;
 };
 
-class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall
+class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall final
     : public XdsTransportFactory::XdsTransport::StreamingCall {
  public:
   GrpcStreamingCall(RefCountedPtr<GrpcXdsTransportFactory> factory,
-                    grpc_channel* channel, const char* method,
+                    Channel* channel, const char* method,
                     std::unique_ptr<StreamingCall::EventHandler> event_handler);
   ~GrpcStreamingCall() override;
 

data/src/core/lib/address_utils/parse_address.cc

@@ -30,8 +30,15 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
+#ifdef GPR_WINDOWS
+// clang-format off
+#include <ws2def.h>
+#include <afunix.h>
+// clang-format on
+#else
 #include <sys/un.h>
-#endif
+#endif  // GPR_WINDOWS
+#endif  // GRPC_HAVE_UNIX_SOCKET
 #include <string>
 
 #include "absl/status/status.h"

data/src/core/lib/address_utils/sockaddr_utils.cc

@@ -44,8 +44,15 @@
 #include "src/core/lib/uri/uri_parser.h"
 
 #ifdef GRPC_HAVE_UNIX_SOCKET
+#ifdef GPR_WINDOWS
+// clang-format off
+#include <ws2def.h>
+#include <afunix.h>
+// clang-format on
+#else
 #include <sys/un.h>
-#endif
+#endif  // GPR_WINDOWS
+#endif  // GRPC_HAVE_UNIX_SOCKET
 
 #ifdef GRPC_HAVE_UNIX_SOCKET
 static absl::StatusOr<std::string> grpc_sockaddr_to_uri_unix_if_possible(

data/src/core/lib/channel/call_finalization.h

@@ -19,9 +19,9 @@
 
 #include <utility>
 
-#include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/transport/call_final_info.h"
 
 namespace grpc_core {
 

data/src/core/lib/channel/call_tracer.cc

@@ -151,11 +151,10 @@ class DelegatingClientCallTracer : public ClientCallTracer {
     std::shared_ptr<TcpTracerInterface> StartNewTcpTrace() override {
       return nullptr;
     }
-    void AddOptionalLabels(
-        OptionalLabelComponent component,
-        std::shared_ptr<std::map<std::string, std::string>> labels) override {
+    void SetOptionalLabel(OptionalLabelKey key,
+                          RefCountedStringValue value) override {
       for (auto* tracer : tracers_) {
-        tracer->AddOptionalLabels(component, labels);
+        tracer->SetOptionalLabel(key, value);
       }
     }
     std::string TraceId() override { return tracers_[0]->TraceId(); }