grpc 1.62.3 → 1.63.0

data/src/core/load_balancing/grpclb/grpclb.cc

@@ -140,8 +140,8 @@
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/resolver/fake/fake_resolver.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
 #include "src/core/resolver/resolver.h"
 
 #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1
@@ -165,7 +165,7 @@ using ::grpc_event_engine::experimental::EventEngine;
 
 constexpr absl::string_view kGrpclb = "grpclb";
 
-class GrpcLbConfig : public LoadBalancingPolicy::Config {
+class GrpcLbConfig final : public LoadBalancingPolicy::Config {
  public:
   GrpcLbConfig() = default;
 
@@ -222,7 +222,7 @@ class GrpcLbConfig : public LoadBalancingPolicy::Config {
   std::string service_name_;
 };
 
-class GrpcLb : public LoadBalancingPolicy {
+class GrpcLb final : public LoadBalancingPolicy {
  public:
   explicit GrpcLb(Args args);
 
@@ -233,7 +233,8 @@ class GrpcLb : public LoadBalancingPolicy {
 
  private:
   /// Contains a call to the LB server and all the data related to the call.
-  class BalancerCallState : public InternallyRefCounted<BalancerCallState> {
+  class BalancerCallState final
+      : public InternallyRefCounted<BalancerCallState> {
    public:
     explicit BalancerCallState(
         RefCountedPtr<LoadBalancingPolicy> parent_grpclb_policy);
@@ -307,7 +308,7 @@ class GrpcLb : public LoadBalancingPolicy {
     grpc_closure client_load_report_done_closure_;
   };
 
-  class SubchannelWrapper : public DelegatingSubchannel {
+  class SubchannelWrapper final : public DelegatingSubchannel {
    public:
     SubchannelWrapper(RefCountedPtr<SubchannelInterface> subchannel,
                       RefCountedPtr<GrpcLb> lb_policy, std::string lb_token,
@@ -317,7 +318,11 @@ class GrpcLb : public LoadBalancingPolicy {
           lb_token_(std::move(lb_token)),
           client_stats_(std::move(client_stats)) {}
 
-    void Orphan() override {
+    const std::string& lb_token() const { return lb_token_; }
+    GrpcLbClientStats* client_stats() const { return client_stats_.get(); }
+
+   private:
+    void Orphaned() override {
       if (!IsWorkSerializerDispatchEnabled()) {
         if (!lb_policy_->shutting_down_) {
           lb_policy_->CacheDeletedSubchannelLocked(wrapped_subchannel());
@@ -334,16 +339,13 @@ class GrpcLb : public LoadBalancingPolicy {
           DEBUG_LOCATION);
     }
 
-    const std::string& lb_token() const { return lb_token_; }
-    GrpcLbClientStats* client_stats() const { return client_stats_.get(); }
-
-   private:
     RefCountedPtr<GrpcLb> lb_policy_;
     std::string lb_token_;
     RefCountedPtr<GrpcLbClientStats> client_stats_;
   };
 
-  class TokenAndClientStatsArg : public RefCounted<TokenAndClientStatsArg> {
+  class TokenAndClientStatsArg final
+      : public RefCounted<TokenAndClientStatsArg> {
    public:
     TokenAndClientStatsArg(std::string lb_token,
                            RefCountedPtr<GrpcLbClientStats> client_stats)
@@ -371,7 +373,7 @@ class GrpcLb : public LoadBalancingPolicy {
     RefCountedPtr<GrpcLbClientStats> client_stats_;
   };
 
-  class Serverlist : public RefCounted<Serverlist> {
+  class Serverlist final : public RefCounted<Serverlist> {
    public:
     // Takes ownership of serverlist.
     explicit Serverlist(std::vector<GrpcLbServer> serverlist)
@@ -408,7 +410,7 @@ class GrpcLb : public LoadBalancingPolicy {
     std::atomic<size_t> drop_index_{0};
   };
 
-  class Picker : public SubchannelPicker {
+  class Picker final : public SubchannelPicker {
    public:
     Picker(RefCountedPtr<Serverlist> serverlist,
            RefCountedPtr<SubchannelPicker> child_picker,
@@ -424,7 +426,7 @@ class GrpcLb : public LoadBalancingPolicy {
     // in the case where the subchannel call is never actually started,
     // since the client load reporting filter will not be able to do it
     // in that case.
-    class SubchannelCallTracker : public SubchannelCallTrackerInterface {
+    class SubchannelCallTracker final : public SubchannelCallTrackerInterface {
      public:
       SubchannelCallTracker(
           RefCountedPtr<GrpcLbClientStats> client_stats,
@@ -460,7 +462,8 @@ class GrpcLb : public LoadBalancingPolicy {
     RefCountedPtr<GrpcLbClientStats> client_stats_;
   };
 
-  class Helper : public ParentOwningDelegatingChannelControlHelper<GrpcLb> {
+  class Helper final
+      : public ParentOwningDelegatingChannelControlHelper<GrpcLb> {
    public:
     explicit Helper(RefCountedPtr<GrpcLb> parent)
         : ParentOwningDelegatingChannelControlHelper(std::move(parent)) {}
@@ -473,7 +476,7 @@ class GrpcLb : public LoadBalancingPolicy {
     void RequestReresolution() override;
   };
 
-  class StateWatcher : public AsyncConnectivityStateWatcherInterface {
+  class StateWatcher final : public AsyncConnectivityStateWatcherInterface {
    public:
     explicit StateWatcher(RefCountedPtr<GrpcLb> parent)
         : AsyncConnectivityStateWatcherInterface(parent->work_serializer()),
@@ -547,7 +550,7 @@ class GrpcLb : public LoadBalancingPolicy {
   bool shutting_down_ = false;
 
   // The channel for communicating with the LB server.
-  grpc_channel* lb_channel_ = nullptr;
+  OrphanablePtr<Channel> lb_channel_;
   StateWatcher* watcher_ = nullptr;
   // Response generator to inject address updates into lb_channel_.
   RefCountedPtr<FakeResolverResponseGenerator> response_generator_;
@@ -647,7 +650,8 @@ void ParseServer(const GrpcLbServer& server, grpc_resolved_address* addr) {
   }
 }
 
-class GrpcLb::Serverlist::AddressIterator : public EndpointAddressesIterator {
+class GrpcLb::Serverlist::AddressIterator final
+    : public EndpointAddressesIterator {
  public:
   AddressIterator(RefCountedPtr<Serverlist> serverlist,
                   RefCountedPtr<GrpcLbClientStats> client_stats)
@@ -898,11 +902,11 @@ GrpcLb::BalancerCallState::BalancerCallState(
       grpclb_policy()->lb_call_timeout_ == Duration::Zero()
           ? Timestamp::InfFuture()
           : Timestamp::Now() + grpclb_policy()->lb_call_timeout_;
-  lb_call_ = grpc_channel_create_pollset_set_call(
-      grpclb_policy()->lb_channel_, nullptr, GRPC_PROPAGATE_DEFAULTS,
-      grpclb_policy_->interested_parties(),
-      Slice::FromStaticString("/grpc.lb.v1.LoadBalancer/BalanceLoad").c_slice(),
-      nullptr, deadline, nullptr);
+  lb_call_ = grpclb_policy()->lb_channel_->CreateCall(
+      /*parent_call=*/nullptr, GRPC_PROPAGATE_DEFAULTS,
+      /*cq=*/nullptr, grpclb_policy_->interested_parties(),
+      Slice::FromStaticString("/grpc.lb.v1.LoadBalancer/BalanceLoad"),
+      /*authority=*/absl::nullopt, deadline, /*registered_method=*/true);
   // Init the LB call request payload.
   upb::Arena arena;
   grpc_slice request_payload_slice = GrpcLbRequestCreate(
@@ -1504,13 +1508,11 @@ void GrpcLb::ShutdownLocked() {
   // alive when that callback is invoked.
   if (lb_channel_ != nullptr) {
     if (parent_channelz_node_ != nullptr) {
-      channelz::ChannelNode* child_channelz_node =
-          grpc_channel_get_channelz_node(lb_channel_);
+      channelz::ChannelNode* child_channelz_node = lb_channel_->channelz_node();
       GPR_ASSERT(child_channelz_node != nullptr);
       parent_channelz_node_->RemoveChildChannel(child_channelz_node->uuid());
     }
-    grpc_channel_destroy_internal(lb_channel_);
-    lb_channel_ = nullptr;
+    lb_channel_.reset();
   }
 }
 
@@ -1520,7 +1522,7 @@ void GrpcLb::ShutdownLocked() {
 
 void GrpcLb::ResetBackoffLocked() {
   if (lb_channel_ != nullptr) {
-    grpc_channel_reset_connect_backoff(lb_channel_);
+    lb_channel_->ResetConnectionBackoff();
   }
   if (child_policy_ != nullptr) {
     child_policy_->ResetBackoffLocked();
@@ -1528,7 +1530,8 @@ void GrpcLb::ResetBackoffLocked() {
 }
 
 // Endpoint iterator wrapper to add null LB token attribute.
-class GrpcLb::NullLbTokenEndpointIterator : public EndpointAddressesIterator {
+class GrpcLb::NullLbTokenEndpointIterator final
+    : public EndpointAddressesIterator {
  public:
   explicit NullLbTokenEndpointIterator(
       std::shared_ptr<EndpointAddressesIterator> parent_it)
@@ -1592,13 +1595,9 @@ absl::Status GrpcLb::UpdateLocked(UpdateArgs args) {
     // Start watching the channel's connectivity state.  If the channel
     // goes into state TRANSIENT_FAILURE before the timer fires, we go into
     // fallback mode even if the fallback timeout has not elapsed.
-    ClientChannelFilter* client_channel =
-        ClientChannelFilter::GetFromChannel(Channel::FromC(lb_channel_));
-    GPR_ASSERT(client_channel != nullptr);
-    // Ref held by callback.
     watcher_ =
         new StateWatcher(RefAsSubclass<GrpcLb>(DEBUG_LOCATION, "StateWatcher"));
-    client_channel->AddConnectivityWatcher(
+    lb_channel_->AddConnectivityWatcher(
         GRPC_CHANNEL_IDLE,
         OrphanablePtr<AsyncConnectivityStateWatcherInterface>(watcher_));
     // Start balancer call.
@@ -1633,13 +1632,12 @@ absl::Status GrpcLb::UpdateBalancerChannelLocked() {
   if (lb_channel_ == nullptr) {
     std::string uri_str =
         absl::StrCat("fake:///", channel_control_helper()->GetAuthority());
-    lb_channel_ =
+    lb_channel_.reset(Channel::FromC(
         grpc_channel_create(uri_str.c_str(), channel_credentials.get(),
-                            lb_channel_args.ToC().get());
+                            lb_channel_args.ToC().get())));
     GPR_ASSERT(lb_channel_ != nullptr);
     // Set up channelz linkage.
-    channelz::ChannelNode* child_channelz_node =
-        grpc_channel_get_channelz_node(lb_channel_);
+    channelz::ChannelNode* child_channelz_node = lb_channel_->channelz_node();
     auto parent_channelz_node = args_.GetObjectRef<channelz::ChannelNode>();
     if (child_channelz_node != nullptr && parent_channelz_node != nullptr) {
       parent_channelz_node->AddChildChannel(child_channelz_node->uuid());
@@ -1659,10 +1657,7 @@ absl::Status GrpcLb::UpdateBalancerChannelLocked() {
 }
 
 void GrpcLb::CancelBalancerChannelConnectivityWatchLocked() {
-  ClientChannelFilter* client_channel =
-      ClientChannelFilter::GetFromChannel(Channel::FromC(lb_channel_));
-  GPR_ASSERT(client_channel != nullptr);
-  client_channel->RemoveConnectivityWatcher(watcher_);
+  lb_channel_->RemoveConnectivityWatcher(watcher_);
 }
 
 //
@@ -1678,7 +1673,7 @@ void GrpcLb::StartBalancerCallLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) {
     gpr_log(GPR_INFO,
             "[grpclb %p] Query for backends (lb_channel: %p, lb_calld: %p)",
-            this, lb_channel_, lb_calld_.get());
+            this, lb_channel_.get(), lb_calld_.get());
   }
   lb_calld_->StartQuery();
 }
@@ -1902,7 +1897,7 @@ void GrpcLb::OnSubchannelCacheTimerLocked() {
 // factory
 //
 
-class GrpcLbFactory : public LoadBalancingPolicyFactory {
+class GrpcLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {

data/src/core/load_balancing/grpclb/grpclb_client_stats.h

@@ -37,7 +37,7 @@
 
 namespace grpc_core {
 
-class GrpcLbClientStats : public RefCounted<GrpcLbClientStats> {
+class GrpcLbClientStats final : public RefCounted<GrpcLbClientStats> {
  public:
   struct DropTokenCount {
     UniquePtr<char> token;

data/src/core/load_balancing/health_check_client.cc

@@ -42,7 +42,6 @@
 
 #include "src/core/client_channel/client_channel_channelz.h"
 #include "src/core/client_channel/client_channel_internal.h"
-#include "src/core/load_balancing/health_check_client_internal.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
@@ -59,9 +58,10 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/load_balancing/health_check_client_internal.h"
+#include "src/core/load_balancing/subchannel_interface.h"
 #include "src/proto/grpc/health/v1/health.upb.h"
 
 namespace grpc_core {
@@ -71,7 +71,7 @@ TraceFlag grpc_health_check_client_trace(false, "health_check_client");
 namespace {
 
 // A fire-and-forget class to asynchronously drain a WorkSerializer queue.
-class AsyncWorkSerializerDrainer {
+class AsyncWorkSerializerDrainer final {
  public:
   explicit AsyncWorkSerializerDrainer(
       std::shared_ptr<WorkSerializer> work_serializer)
@@ -212,7 +212,7 @@ void HealthProducer::HealthChecker::OnHealthWatchStatusChange(
 // HealthProducer::HealthChecker::HealthStreamEventHandler
 //
 
-class HealthProducer::HealthChecker::HealthStreamEventHandler
+class HealthProducer::HealthChecker::HealthStreamEventHandler final
     : public SubchannelStreamClient::CallEventHandler {
  public:
   explicit HealthStreamEventHandler(RefCountedPtr<HealthChecker> health_checker)
@@ -321,7 +321,7 @@ class HealthProducer::HealthChecker::HealthStreamEventHandler
 // HealthProducer::ConnectivityWatcher
 //
 
-class HealthProducer::ConnectivityWatcher
+class HealthProducer::ConnectivityWatcher final
     : public Subchannel::ConnectivityStateWatcherInterface {
  public:
   explicit ConnectivityWatcher(WeakRefCountedPtr<HealthProducer> producer)
@@ -362,7 +362,7 @@ void HealthProducer::Start(RefCountedPtr<Subchannel> subchannel) {
   subchannel_->WatchConnectivityState(std::move(connectivity_watcher));
 }
 
-void HealthProducer::Orphan() {
+void HealthProducer::Orphaned() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
     gpr_log(GPR_INFO, "HealthProducer %p: shutting down", this);
   }

data/src/core/load_balancing/health_check_client_internal.h

@@ -52,15 +52,13 @@ class HealthWatcher;
 // health watch call for each health check service name that is being
 // watched and reports the resulting connectivity state to all
 // registered watchers.
-class HealthProducer : public Subchannel::DataProducerInterface {
+class HealthProducer final : public Subchannel::DataProducerInterface {
  public:
   HealthProducer() : interested_parties_(grpc_pollset_set_create()) {}
   ~HealthProducer() override { grpc_pollset_set_destroy(interested_parties_); }
 
   void Start(RefCountedPtr<Subchannel> subchannel);
 
-  void Orphan() override;
-
   static UniqueTypeName Type() {
     static UniqueTypeName::Factory kFactory("health_check");
     return kFactory.Create();
@@ -79,7 +77,7 @@ class HealthProducer : public Subchannel::DataProducerInterface {
 
   // Health checker for a given health check service name.  Contains the
   // health check client and the list of watchers.
-  class HealthChecker : public InternallyRefCounted<HealthChecker> {
+  class HealthChecker final : public InternallyRefCounted<HealthChecker> {
    public:
     HealthChecker(WeakRefCountedPtr<HealthProducer> producer,
                   absl::string_view health_check_service_name);
@@ -139,6 +137,7 @@ class HealthProducer : public Subchannel::DataProducerInterface {
   // Handles a connectivity state change on the subchannel.
   void OnConnectivityStateChange(grpc_connectivity_state state,
                                  const absl::Status& status);
+  void Orphaned() override;
 
   RefCountedPtr<Subchannel> subchannel_;
   ConnectivityWatcher* connectivity_watcher_;
@@ -156,7 +155,7 @@ class HealthProducer : public Subchannel::DataProducerInterface {
 };
 
 // A data watcher that handles health checking.
-class HealthWatcher : public InternalSubchannelDataWatcherInterface {
+class HealthWatcher final : public InternalSubchannelDataWatcherInterface {
  public:
   HealthWatcher(
       std::shared_ptr<WorkSerializer> work_serializer,

data/src/core/load_balancing/lb_policy.h

@@ -38,8 +38,8 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 
-#include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/metrics.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
@@ -50,6 +50,7 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
 
@@ -274,7 +275,8 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
 
     virtual PickResult Pick(PickArgs args) = 0;
 
-    void Orphan() override {}
+   protected:
+    void Orphaned() override {}
   };
 
   /// A proxy object implemented by the client channel and used by the
@@ -299,6 +301,9 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
     /// Requests that the resolver re-resolve.
     virtual void RequestReresolution() = 0;
 
+    /// Returns the channel target.
+    virtual absl::string_view GetTarget() = 0;
+
     /// Returns the channel authority.
     virtual absl::string_view GetAuthority() = 0;
 
@@ -319,6 +324,10 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
     /// Returns the EventEngine to use for timers and async work.
     virtual grpc_event_engine::experimental::EventEngine* GetEventEngine() = 0;
 
+    /// Returns the stats plugin group for reporting metrics.
+    virtual GlobalStatsPluginRegistry::StatsPluginGroup&
+    GetStatsPluginGroup() = 0;
+
     /// Adds a trace message associated with the channel.
     enum TraceSeverity { TRACE_INFO, TRACE_WARNING, TRACE_ERROR };
     virtual void AddTraceEvent(TraceSeverity severity,
@@ -421,7 +430,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
   // A picker that returns PickResult::Queue for all picks.
   // Also calls the parent LB policy's ExitIdleLocked() method when the
   // first pick is seen.
-  class QueuePicker : public SubchannelPicker {
+  class QueuePicker final : public SubchannelPicker {
    public:
     explicit QueuePicker(RefCountedPtr<LoadBalancingPolicy> parent)
         : parent_(std::move(parent)) {}
@@ -436,7 +445,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
   };
 
   // A picker that returns PickResult::Fail for all picks.
-  class TransientFailurePicker : public SubchannelPicker {
+  class TransientFailurePicker final : public SubchannelPicker {
    public:
     explicit TransientFailurePicker(absl::Status status) : status_(status) {}
 

data/src/core/load_balancing/lb_policy_registry.h

@@ -33,12 +33,12 @@
 
 namespace grpc_core {
 
-class LoadBalancingPolicyRegistry {
+class LoadBalancingPolicyRegistry final {
  public:
   /// Methods used to create and populate the LoadBalancingPolicyRegistry.
   /// NOT THREAD SAFE -- to be used only during global gRPC
   /// initialization and shutdown.
-  class Builder {
+  class Builder final {
    public:
     /// Registers an LB policy factory.  The factory will be used to create an
     /// LB policy whose name matches that of the factory.

data/src/core/load_balancing/oob_backend_metric.cc

@@ -38,9 +38,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/client_channel/backend_metric.h"
 #include "src/core/client_channel/client_channel_channelz.h"
-#include "src/core/load_balancing/oob_backend_metric_internal.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
 #include "src/core/lib/channel/channel_trace.h"
@@ -57,6 +55,8 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/slice/slice.h"
+#include "src/core/load_balancing/backend_metric_parser.h"
+#include "src/core/load_balancing/oob_backend_metric_internal.h"
 
 namespace grpc_core {
 
@@ -66,7 +66,7 @@ TraceFlag grpc_orca_client_trace(false, "orca_client");
 // OrcaProducer::ConnectivityWatcher
 //
 
-class OrcaProducer::ConnectivityWatcher
+class OrcaProducer::ConnectivityWatcher final
     : public Subchannel::ConnectivityStateWatcherInterface {
  public:
   explicit ConnectivityWatcher(WeakRefCountedPtr<OrcaProducer> producer)
@@ -97,7 +97,7 @@ class OrcaProducer::ConnectivityWatcher
 // OrcaProducer::OrcaStreamEventHandler
 //
 
-class OrcaProducer::OrcaStreamEventHandler
+class OrcaProducer::OrcaStreamEventHandler final
     : public SubchannelStreamClient::CallEventHandler {
  public:
   OrcaStreamEventHandler(WeakRefCountedPtr<OrcaProducer> producer,
@@ -168,7 +168,7 @@ class OrcaProducer::OrcaStreamEventHandler
   // notifications, which avoids lock inversion problems due to
   // acquiring producer_->mu_ while holding the lock from inside of
   // SubchannelStreamClient.
-  class BackendMetricAllocator : public BackendMetricAllocatorInterface {
+  class BackendMetricAllocator final : public BackendMetricAllocatorInterface {
    public:
     explicit BackendMetricAllocator(WeakRefCountedPtr<OrcaProducer> producer)
         : producer_(std::move(producer)) {}
@@ -221,7 +221,7 @@ void OrcaProducer::Start(RefCountedPtr<Subchannel> subchannel) {
   subchannel_->WatchConnectivityState(std::move(connectivity_watcher));
 }
 
-void OrcaProducer::Orphan() {
+void OrcaProducer::Orphaned() {
   {
     MutexLock lock(&mu_);
     stream_client_.reset();

data/src/core/load_balancing/oob_backend_metric.h

@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 
 namespace grpc_core {

data/src/core/load_balancing/oob_backend_metric_internal.h

@@ -28,8 +28,6 @@
 
 #include <grpc/impl/connectivity_state.h>
 
-#include "src/core/load_balancing/backend_metric_data.h"
-#include "src/core/load_balancing/oob_backend_metric.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
@@ -38,6 +36,8 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
+#include "src/core/load_balancing/backend_metric_data.h"
+#include "src/core/load_balancing/oob_backend_metric.h"
 
 namespace grpc_core {
 
@@ -46,12 +46,10 @@ class OrcaWatcher;
 // This producer is registered with a subchannel.  It creates a
 // streaming ORCA call and reports the resulting backend metrics to all
 // registered watchers.
-class OrcaProducer : public Subchannel::DataProducerInterface {
+class OrcaProducer final : public Subchannel::DataProducerInterface {
  public:
   void Start(RefCountedPtr<Subchannel> subchannel);
 
-  void Orphan() override;
-
   static UniqueTypeName Type() {
     static UniqueTypeName::Factory kFactory("orca");
     return kFactory.Create();
@@ -67,6 +65,8 @@ class OrcaProducer : public Subchannel::DataProducerInterface {
   class ConnectivityWatcher;
   class OrcaStreamEventHandler;
 
+  void Orphaned() override;
+
   // Returns the minimum requested reporting interval across all watchers.
   Duration GetMinIntervalLocked() const ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_);
 
@@ -92,7 +92,7 @@ class OrcaProducer : public Subchannel::DataProducerInterface {
 
 // This watcher is returned to the LB policy and added to the
 // client channel SubchannelWrapper.
-class OrcaWatcher : public InternalSubchannelDataWatcherInterface {
+class OrcaWatcher final : public InternalSubchannelDataWatcherInterface {
  public:
   OrcaWatcher(Duration report_interval,
               std::unique_ptr<OobBackendMetricWatcher> watcher)