grpc 1.62.3 → 1.63.0

data/src/core/load_balancing/xds/xds_override_host.cc

@@ -48,7 +48,6 @@
 #include <grpc/support/log.h>
 
 #include "src/core/client_channel/client_channel_internal.h"
-#include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/ext/xds/xds_health_status.h"
 #include "src/core/lib/address_utils/parse_address.h"
@@ -75,6 +74,7 @@
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
@@ -111,7 +111,7 @@ struct PtrLessThan {
 // xds_override_host LB policy
 //
 
-class XdsOverrideHostLb : public LoadBalancingPolicy {
+class XdsOverrideHostLb final : public LoadBalancingPolicy {
  public:
   explicit XdsOverrideHostLb(Args args);
 
@@ -126,7 +126,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
  private:
   class SubchannelEntry;
 
-  class SubchannelWrapper : public DelegatingSubchannel {
+  class SubchannelWrapper final : public DelegatingSubchannel {
    public:
     SubchannelWrapper(RefCountedPtr<SubchannelInterface> subchannel,
                       RefCountedPtr<XdsOverrideHostLb> policy);
@@ -163,7 +163,8 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
     }
 
    private:
-    class ConnectivityStateWatcher : public ConnectivityStateWatcherInterface {
+    class ConnectivityStateWatcher final
+        : public ConnectivityStateWatcherInterface {
      public:
       explicit ConnectivityStateWatcher(
           WeakRefCountedPtr<SubchannelWrapper> subchannel)
@@ -182,8 +183,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
       WeakRefCountedPtr<SubchannelWrapper> subchannel_;
     };
 
-    void Orphan() override;
-
+    void Orphaned() override;
     void UpdateConnectivityState(grpc_connectivity_state state,
                                  absl::Status status);
 
@@ -211,7 +211,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
   // avoid that, any method that may result in releasing a ref to the
   // SubchannelWrapper will instead return that ref to the caller, who is
   // responsible for releasing the ref after releasing the lock.
-  class SubchannelEntry : public RefCounted<SubchannelEntry> {
+  class SubchannelEntry final : public RefCounted<SubchannelEntry> {
    public:
     bool HasOwnedSubchannel() const
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsOverrideHostLb::mu_) {
@@ -314,7 +314,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
 
   // A picker that wraps the picker from the child for cases when cookie is
   // present.
-  class Picker : public SubchannelPicker {
+  class Picker final : public SubchannelPicker {
    public:
     Picker(RefCountedPtr<XdsOverrideHostLb> xds_override_host_lb,
            RefCountedPtr<SubchannelPicker> picker,
@@ -323,7 +323,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
     PickResult Pick(PickArgs args) override;
 
    private:
-    class SubchannelConnectionRequester {
+    class SubchannelConnectionRequester final {
      public:
       explicit SubchannelConnectionRequester(
           RefCountedPtr<SubchannelWrapper> subchannel)
@@ -349,7 +349,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
       grpc_closure closure_;
     };
 
-    class SubchannelCreationRequester {
+    class SubchannelCreationRequester final {
      public:
       SubchannelCreationRequester(RefCountedPtr<XdsOverrideHostLb> policy,
                                   absl::string_view address)
@@ -384,7 +384,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
     XdsHealthStatusSet override_host_health_status_set_;
   };
 
-  class Helper
+  class Helper final
       : public ParentOwningDelegatingChannelControlHelper<XdsOverrideHostLb> {
    public:
     explicit Helper(RefCountedPtr<XdsOverrideHostLb> xds_override_host_policy)
@@ -398,7 +398,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
                      RefCountedPtr<SubchannelPicker> picker) override;
   };
 
-  class IdleTimer : public InternallyRefCounted<IdleTimer> {
+  class IdleTimer final : public InternallyRefCounted<IdleTimer> {
    public:
     IdleTimer(RefCountedPtr<XdsOverrideHostLb> policy, Duration duration);
 
@@ -730,7 +730,7 @@ XdsHealthStatus GetEndpointHealthStatus(const EndpointAddresses& endpoint) {
 }
 
 // Wraps the endpoint iterator and filters out endpoints in state DRAINING.
-class ChildEndpointIterator : public EndpointAddressesIterator {
+class ChildEndpointIterator final : public EndpointAddressesIterator {
  public:
   explicit ChildEndpointIterator(
       std::shared_ptr<EndpointAddressesIterator> parent_it)
@@ -1112,7 +1112,7 @@ void XdsOverrideHostLb::SubchannelWrapper::CancelConnectivityStateWatch(
   }
 }
 
-void XdsOverrideHostLb::SubchannelWrapper::Orphan() {
+void XdsOverrideHostLb::SubchannelWrapper::Orphaned() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] subchannel wrapper %p orphaned",
@@ -1252,7 +1252,7 @@ void XdsOverrideHostLb::SubchannelEntry::OnSubchannelWrapperOrphan(
 // factory
 //
 
-class XdsOverrideHostLbFactory : public LoadBalancingPolicyFactory {
+class XdsOverrideHostLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {

data/src/core/load_balancing/xds/xds_override_host.h

@@ -31,7 +31,7 @@
 namespace grpc_core {
 
 // Config for stateful session LB policy.
-class XdsOverrideHostLbConfig : public LoadBalancingPolicy::Config {
+class XdsOverrideHostLbConfig final : public LoadBalancingPolicy::Config {
  public:
   XdsOverrideHostLbConfig() = default;
 

data/src/core/load_balancing/xds/xds_wrr_locality.cc

@@ -32,7 +32,6 @@
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
 
-#include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
@@ -40,6 +39,7 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/ref_counted_string.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/json/json.h"
@@ -50,6 +50,7 @@
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/endpoint_addresses.h"
 
 namespace grpc_core {
@@ -61,7 +62,7 @@ namespace {
 constexpr absl::string_view kXdsWrrLocality = "xds_wrr_locality_experimental";
 
 // Config for xds_wrr_locality LB policy.
-class XdsWrrLocalityLbConfig : public LoadBalancingPolicy::Config {
+class XdsWrrLocalityLbConfig final : public LoadBalancingPolicy::Config {
  public:
   XdsWrrLocalityLbConfig() = default;
 
@@ -106,7 +107,7 @@ class XdsWrrLocalityLbConfig : public LoadBalancingPolicy::Config {
 };
 
 // xds_wrr_locality LB policy.
-class XdsWrrLocalityLb : public LoadBalancingPolicy {
+class XdsWrrLocalityLb final : public LoadBalancingPolicy {
  public:
   explicit XdsWrrLocalityLb(Args args);
 
@@ -167,7 +168,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
   }
   auto config = args.config.TakeAsSubclass<XdsWrrLocalityLbConfig>();
   // Scan the addresses to find the weight for each locality.
-  std::map<std::string, uint32_t> locality_weights;
+  std::map<RefCountedStringValue, uint32_t> locality_weights;
   if (args.addresses.ok()) {
     (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
       auto* locality_name = endpoint.args().GetObject<XdsLocalityName>();
@@ -175,7 +176,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
           endpoint.args().GetInt(GRPC_ARG_XDS_LOCALITY_WEIGHT).value_or(0);
       if (locality_name != nullptr && weight > 0) {
         auto p = locality_weights.emplace(
-            locality_name->AsHumanReadableString(), weight);
+            locality_name->human_readable_string(), weight);
         if (!p.second && p.first->second != weight) {
           gpr_log(GPR_ERROR,
                   "INTERNAL ERROR: xds_wrr_locality found different weights "
@@ -188,10 +189,10 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
   // Construct the config for the weighted_target policy.
   Json::Object weighted_targets;
   for (const auto& p : locality_weights) {
-    const std::string& locality_name = p.first;
+    absl::string_view locality_name = p.first.as_string_view();
     uint32_t weight = p.second;
     // Add weighted target entry.
-    weighted_targets[locality_name] = Json::FromObject({
+    weighted_targets[std::string(locality_name)] = Json::FromObject({
         {"weight", Json::FromNumber(weight)},
         {"childPolicy", config->child_config()},
     });
@@ -273,7 +274,7 @@ OrphanablePtr<LoadBalancingPolicy> XdsWrrLocalityLb::CreateChildPolicyLocked(
 // factory
 //
 
-class XdsWrrLocalityLbFactory : public LoadBalancingPolicyFactory {
+class XdsWrrLocalityLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -20,8 +20,12 @@
 
 #include <grpc/grpc.h>
 
+#include "src/core/lib/channel/server_call_tracer_filter.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/builtins.h"
+#include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/surface/lame_client.h"
+#include "src/core/lib/surface/server.h"
+#include "src/core/lib/transport/endpoint_info_handshaker.h"
 #include "src/core/lib/transport/http_connect_handshaker.h"
 #include "src/core/lib/transport/tcp_connect_handshaker.h"
 
@@ -39,7 +43,6 @@ extern void BuildClientChannelConfiguration(
 extern void SecurityRegisterHandshakerFactories(
     CoreConfiguration::Builder* builder);
 extern void RegisterClientAuthorityFilter(CoreConfiguration::Builder* builder);
-extern void RegisterChannelIdleFilters(CoreConfiguration::Builder* builder);
 extern void RegisterLegacyChannelIdleFilters(
     CoreConfiguration::Builder* builder);
 extern void RegisterDeadlineFilter(CoreConfiguration::Builder* builder);
@@ -73,12 +76,27 @@ extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
 #endif
 
+namespace {
+
+void RegisterBuiltins(CoreConfiguration::Builder* builder) {
+  RegisterServerCallTracerFilter(builder);
+  builder->channel_init()
+      ->RegisterFilter<LameClientFilter>(GRPC_CLIENT_LAME_CHANNEL)
+      .Terminal();
+  builder->channel_init()
+      ->RegisterFilter(GRPC_SERVER_CHANNEL, &Server::kServerTopFilter)
+      .BeforeAll();
+}
+
+}  // namespace
+
 void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   grpc_event_engine::experimental::RegisterEventEngineChannelArgPreconditioning(
       builder);
   // The order of the handshaker registration is crucial here.
   // We want TCP connect handshaker to be registered last so that it is added
   // to the start of the handshaker list.
+  RegisterEndpointInfoHandshaker(builder);
   RegisterHttpConnectHandshaker(builder);
   RegisterTCPConnectHandshaker(builder);
   RegisterPriorityLbPolicy(builder);
@@ -90,7 +108,6 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   BuildClientChannelConfiguration(builder);
   SecurityRegisterHandshakerFactories(builder);
   RegisterClientAuthorityFilter(builder);
-  RegisterChannelIdleFilters(builder);
   RegisterLegacyChannelIdleFilters(builder);
   RegisterConnectedChannel(builder);
   RegisterGrpcLbPolicy(builder);

data/src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -19,7 +19,6 @@
 #include <grpc/grpc.h>
 
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/builtins.h"
 
 namespace grpc_core {
 #ifndef GRPC_NO_XDS

data/src/core/resolver/binder/binder_resolver.cc

@@ -24,8 +24,15 @@
 #ifdef GRPC_HAVE_UNIX_SOCKET
 
 #include <string.h>
+#ifdef GPR_WINDOWS
+// clang-format off
+#include <ws2def.h>
+#include <afunix.h>
+// clang-format on
+#else
 #include <sys/socket.h>
 #include <sys/un.h>
+#endif // GPR_WINDOWS
 
 #include <memory>
 #include <utility>
@@ -50,7 +57,7 @@
 namespace grpc_core {
 namespace {
 
-class BinderResolver : public Resolver {
+class BinderResolver final : public Resolver {
  public:
   BinderResolver(EndpointAddressesList addresses, ResolverArgs args)
       : result_handler_(std::move(args.result_handler)),
@@ -73,7 +80,7 @@ class BinderResolver : public Resolver {
   ChannelArgs channel_args_;
 };
 
-class BinderResolverFactory : public ResolverFactory {
+class BinderResolverFactory final : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "binder"; }
 

data/src/core/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -82,7 +82,7 @@ namespace grpc_core {
 
 namespace {
 
-class AresClientChannelDNSResolver : public PollingResolver {
+class AresClientChannelDNSResolver final : public PollingResolver {
  public:
   AresClientChannelDNSResolver(ResolverArgs args,
                                Duration min_time_between_resolutions);
@@ -90,7 +90,8 @@ class AresClientChannelDNSResolver : public PollingResolver {
   OrphanablePtr<Orphanable> StartRequest() override;
 
  private:
-  class AresRequestWrapper : public InternallyRefCounted<AresRequestWrapper> {
+  class AresRequestWrapper final
+      : public InternallyRefCounted<AresRequestWrapper> {
    public:
     explicit AresRequestWrapper(
         RefCountedPtr<AresClientChannelDNSResolver> resolver)
@@ -342,7 +343,7 @@ AresClientChannelDNSResolver::AresRequestWrapper::OnResolvedLocked(
 // Factory
 //
 
-class AresClientChannelDNSResolverFactory : public ResolverFactory {
+class AresClientChannelDNSResolverFactory final : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "dns"; }
 
@@ -365,7 +366,7 @@ class AresClientChannelDNSResolverFactory : public ResolverFactory {
   }
 };
 
-class AresDNSResolver : public DNSResolver {
+class AresDNSResolver final : public DNSResolver {
  public:
   // Abstract class that centralizes common request handling logic via the
   // template method pattern.
@@ -485,7 +486,7 @@ class AresDNSResolver : public DNSResolver {
     grpc_pollset_set* pollset_set_;
   };
 
-  class AresHostnameRequest : public AresRequest {
+  class AresHostnameRequest final : public AresRequest {
    public:
     AresHostnameRequest(
         absl::string_view name, absl::string_view default_port,
@@ -538,7 +539,7 @@ class AresDNSResolver : public DNSResolver {
     std::unique_ptr<EndpointAddressesList> addresses_;
   };
 
-  class AresSRVRequest : public AresRequest {
+  class AresSRVRequest final : public AresRequest {
    public:
     AresSRVRequest(
         absl::string_view name, absl::string_view name_server, Duration timeout,
@@ -586,7 +587,7 @@ class AresDNSResolver : public DNSResolver {
     std::unique_ptr<EndpointAddressesList> balancer_addresses_;
   };
 
-  class AresTXTRequest : public AresRequest {
+  class AresTXTRequest final : public AresRequest {
    public:
     AresTXTRequest(absl::string_view name, absl::string_view name_server,
                    Duration timeout, grpc_pollset_set* interested_parties,

data/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc

@@ -51,7 +51,7 @@
 
 namespace grpc_core {
 
-class GrpcPolledFdPosix : public GrpcPolledFd {
+class GrpcPolledFdPosix final : public GrpcPolledFd {
  public:
   GrpcPolledFdPosix(ares_socket_t as, grpc_pollset_set* driver_pollset_set)
       : name_(absl::StrCat("c-ares fd: ", static_cast<int>(as))), as_(as) {
@@ -105,7 +105,7 @@ class GrpcPolledFdPosix : public GrpcPolledFd {
   grpc_pollset_set* driver_pollset_set_ ABSL_GUARDED_BY(&grpc_ares_request::mu);
 };
 
-class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory {
+class GrpcPolledFdFactoryPosix final : public GrpcPolledFdFactory {
  public:
   ~GrpcPolledFdFactoryPosix() override {
     for (auto& fd : owned_fds_) {

data/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc

@@ -70,7 +70,7 @@ namespace {
 // c-ares should read, it must do so by calling SetWSAError() on the
 // WSAErrorContext instance passed to it. A WSAErrorContext must only be
 // instantiated at the top of the virtual socket function callstack.
-class WSAErrorContext {
+class WSAErrorContext final {
  public:
   explicit WSAErrorContext(){};
 
@@ -99,7 +99,7 @@ class WSAErrorContext {
 // from c-ares and are used with the grpc windows poller, and it, e.g.,
 // manufactures virtual socket error codes when it e.g. needs to tell the c-ares
 // library to wait for an async read.
-class GrpcPolledFdWindows : public GrpcPolledFd {
+class GrpcPolledFdWindows final : public GrpcPolledFd {
  public:
   enum WriteState {
     WRITE_IDLE,
@@ -694,7 +694,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
   absl::AnyInvocable<void()> on_shutdown_locked_;
 };
 
-class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory {
+class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
  public:
   explicit GrpcPolledFdFactoryWindows(Mutex* mu) : mu_(mu) {}
 

data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -166,7 +166,7 @@ static void grpc_ares_request_unref_locked(grpc_ares_request* r)
 // organize per-query and per-resolution information in such a way
 // that doesn't involve allocating a number of different data
 // structures.
-class GrpcAresQuery {
+class GrpcAresQuery final {
  public:
   explicit GrpcAresQuery(grpc_ares_request* r, const std::string& name)
       : r_(r), name_(name) {

data/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc

@@ -92,7 +92,7 @@ TraceFlag grpc_event_engine_client_channel_resolver_trace(
 // ----------------------------------------------------------------------------
 // EventEngineClientChannelDNSResolver
 // ----------------------------------------------------------------------------
-class EventEngineClientChannelDNSResolver : public PollingResolver {
+class EventEngineClientChannelDNSResolver final : public PollingResolver {
  public:
   EventEngineClientChannelDNSResolver(ResolverArgs args,
                                       Duration min_time_between_resolutions);
@@ -102,7 +102,7 @@ class EventEngineClientChannelDNSResolver : public PollingResolver {
   // ----------------------------------------------------------------------------
   // EventEngineDNSRequestWrapper declaration
   // ----------------------------------------------------------------------------
-  class EventEngineDNSRequestWrapper
+  class EventEngineDNSRequestWrapper final
       : public InternallyRefCounted<EventEngineDNSRequestWrapper> {
    public:
     EventEngineDNSRequestWrapper(

data/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h

@@ -23,7 +23,9 @@
 #include "src/core/lib/uri/uri_parser.h"
 
 namespace grpc_core {
-class EventEngineClientChannelDNSResolverFactory : public ResolverFactory {
+
+class EventEngineClientChannelDNSResolverFactory final
+    : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "dns"; }
   bool IsValidUri(const URI& uri) const override;

data/src/core/resolver/dns/native/dns_resolver.cc

@@ -59,7 +59,7 @@ namespace {
 
 TraceFlag grpc_trace_dns_resolver(false, "dns_resolver");
 
-class NativeClientChannelDNSResolver : public PollingResolver {
+class NativeClientChannelDNSResolver final : public PollingResolver {
  public:
   NativeClientChannelDNSResolver(ResolverArgs args,
                                  Duration min_time_between_resolutions);
@@ -71,7 +71,7 @@ class NativeClientChannelDNSResolver : public PollingResolver {
   // No-op request class, used so that the PollingResolver code knows
   // when there is a request in flight, even if the request is not
   // actually cancellable.
-  class Request : public Orphanable {
+  class Request final : public Orphanable {
    public:
     Request() = default;
 
@@ -145,7 +145,7 @@ void NativeClientChannelDNSResolver::OnResolved(
 // Factory
 //
 
-class NativeClientChannelDNSResolverFactory : public ResolverFactory {
+class NativeClientChannelDNSResolverFactory final : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "dns"; }
 

data/src/core/resolver/endpoint_addresses.h

@@ -45,7 +45,7 @@ namespace grpc_core {
 // A list of addresses for a given endpoint with an associated set of channel
 // args.  Any args present here will be merged into the channel args when a
 // subchannel is created for each address.
-class EndpointAddresses {
+class EndpointAddresses final {
  public:
   // For backward compatibility.
   // TODO(roth): Remove when callers have been updated.
@@ -102,7 +102,7 @@ struct ResolvedAddressLessThan {
                   const grpc_resolved_address& addr2) const;
 };
 
-class EndpointAddressSet {
+class EndpointAddressSet final {
  public:
   explicit EndpointAddressSet(
       const std::vector<grpc_resolved_address>& addresses)
@@ -128,7 +128,7 @@ class EndpointAddressesIterator {
 };
 
 // Iterator over a fixed list of endpoints.
-class EndpointAddressesListIterator : public EndpointAddressesIterator {
+class EndpointAddressesListIterator final : public EndpointAddressesIterator {
  public:
   explicit EndpointAddressesListIterator(EndpointAddressesList endpoints)
       : endpoints_(std::move(endpoints)) {}
@@ -145,7 +145,7 @@ class EndpointAddressesListIterator : public EndpointAddressesIterator {
 };
 
 // Iterator that returns only a single endpoint.
-class SingleEndpointIterator : public EndpointAddressesIterator {
+class SingleEndpointIterator final : public EndpointAddressesIterator {
  public:
   explicit SingleEndpointIterator(EndpointAddresses endpoint)
       : endpoint_(std::move(endpoint)) {}

data/src/core/resolver/fake/fake_resolver.cc

@@ -42,7 +42,7 @@ namespace grpc_core {
 
 // This cannot be in an anonymous namespace, because it is a friend of
 // FakeResolverResponseGenerator.
-class FakeResolver : public Resolver {
+class FakeResolver final : public Resolver {
  public:
   explicit FakeResolver(ResolverArgs args);
 
@@ -232,7 +232,7 @@ const grpc_arg_pointer_vtable
 
 namespace {
 
-class FakeResolverFactory : public ResolverFactory {
+class FakeResolverFactory final : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "fake"; }
 

data/src/core/resolver/fake/fake_resolver.h

@@ -49,7 +49,7 @@ class FakeResolver;
 // instead of RefCounted, but external refs are currently needed to
 // encode this in channel args.  Once channel_args are converted to C++,
 // see if we can find a way to fix this.
-class FakeResolverResponseGenerator
+class FakeResolverResponseGenerator final
     : public RefCounted<FakeResolverResponseGenerator> {
  public:
   static const grpc_arg_pointer_vtable kChannelArgPointerVtable;

data/src/core/resolver/google_c2p/google_c2p_resolver.cc

@@ -59,7 +59,7 @@ namespace {
 
 const char* kC2PAuthority = "traffic-director-c2p.xds.googleapis.com";
 
-class GoogleCloud2ProdResolver : public Resolver {
+class GoogleCloud2ProdResolver final : public Resolver {
  public:
   explicit GoogleCloud2ProdResolver(ResolverArgs args);
 
@@ -173,7 +173,11 @@ void GoogleCloud2ProdResolver::StartLocked() {
           absl::StatusOr<std::string> result) mutable {
         resolver->work_serializer_->Run(
             [resolver, result = std::move(result)]() {
-              resolver->IPv6QueryDone(result.ok());
+              // Check that the payload is non-empty in order to work around
+              // the fact that there are buggy implementations of metadata
+              // servers in the wild, which can in some cases return 200
+              // plus an empty result when they should have returned 404.
+              resolver->IPv6QueryDone(result.ok() && !result->empty());
             },
             DEBUG_LOCATION);
       },
@@ -272,7 +276,7 @@ void GoogleCloud2ProdResolver::StartXdsResolver() {
 // Factory
 //
 
-class GoogleCloud2ProdResolverFactory : public ResolverFactory {
+class GoogleCloud2ProdResolverFactory final : public ResolverFactory {
  public:
   absl::string_view scheme() const override { return "google-c2p"; }
 
@@ -292,7 +296,8 @@ class GoogleCloud2ProdResolverFactory : public ResolverFactory {
 
 // TODO(apolcyn): remove this class after user code has updated to the
 // stable "google-c2p" URI scheme.
-class ExperimentalGoogleCloud2ProdResolverFactory : public ResolverFactory {
+class ExperimentalGoogleCloud2ProdResolverFactory final
+    : public ResolverFactory {
  public:
   absl::string_view scheme() const override {
     return "google-c2p-experimental";

data/src/core/resolver/resolver_registry.h

@@ -35,7 +35,7 @@
 
 namespace grpc_core {
 
-class ResolverRegistry {
+class ResolverRegistry final {
  private:
   // Forward declaration needed to use this in Builder.
   struct State {
@@ -47,7 +47,7 @@ class ResolverRegistry {
   /// Methods used to create and populate the ResolverRegistry.
   /// NOT THREAD SAFE -- to be used only during global gRPC
   /// initialization and shutdown.
-  class Builder {
+  class Builder final {
    public:
     Builder();