grpc 1.62.0 → 1.64.0.pre1

data/src/core/load_balancing/health_check_client_internal.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <set>
@@ -31,6 +29,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
@@ -52,15 +51,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 +76,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 +136,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 +154,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.cc

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"

data/src/core/load_balancing/lb_policy.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,9 +35,10 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.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 +49,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 +274,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 +300,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 +323,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 +429,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 +444,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_factory.h

@@ -17,11 +17,11 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.h"

data/src/core/load_balancing/lb_policy_registry.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy_registry.h"
 
 #include <algorithm>
@@ -24,6 +22,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
@@ -32,6 +31,7 @@
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/load_balancing/lb_policy.h"
 
@@ -45,7 +45,7 @@ void LoadBalancingPolicyRegistry::Builder::RegisterLoadBalancingPolicyFactory(
     std::unique_ptr<LoadBalancingPolicyFactory> factory) {
   gpr_log(GPR_DEBUG, "registering LB policy factory for \"%s\"",
           std::string(factory->name()).c_str());
-  GPR_ASSERT(factories_.find(factory->name()) == factories_.end());
+  CHECK(factories_.find(factory->name()) == factories_.end());
   factories_.emplace(factory->name(), std::move(factory));
 }
 

data/src/core/load_balancing/lb_policy_registry.h

@@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.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

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/oob_backend_metric.h"
 
 #include <string.h>
@@ -25,6 +23,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/duration.upb.h"
@@ -36,14 +35,12 @@
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.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/channelz/channel_trace.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"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/memory.h"
@@ -57,6 +54,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 +65,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 +96,7 @@ class OrcaProducer::ConnectivityWatcher
 // OrcaProducer::OrcaStreamEventHandler
 //
 
-class OrcaProducer::OrcaStreamEventHandler
+class OrcaProducer::OrcaStreamEventHandler final
     : public SubchannelStreamClient::CallEventHandler {
  public:
   OrcaStreamEventHandler(WeakRefCountedPtr<OrcaProducer> producer,
@@ -168,7 +167,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,12 +220,12 @@ void OrcaProducer::Start(RefCountedPtr<Subchannel> subchannel) {
   subchannel_->WatchConnectivityState(std::move(connectivity_watcher));
 }
 
-void OrcaProducer::Orphan() {
+void OrcaProducer::Orphaned() {
   {
     MutexLock lock(&mu_);
     stream_client_.reset();
   }
-  GPR_ASSERT(subchannel_ != nullptr);  // Should not be called before Start().
+  CHECK(subchannel_ != nullptr);  // Should not be called before Start().
   subchannel_->CancelConnectivityStateWatch(connectivity_watcher_);
   subchannel_->RemoveDataProducer(this);
 }

data/src/core/load_balancing/oob_backend_metric.h

@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 
-#include "src/core/load_balancing/backend_metric_data.h"
+#include <grpc/support/port_platform.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

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <set>
 #include <utility>
@@ -27,9 +25,8 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.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 +35,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 +45,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 +64,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 +91,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)

data/src/core/load_balancing/outlier_detection/outlier_detection.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 
 #include <inttypes.h>
@@ -33,6 +31,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
 #include "absl/random/random.h"
 #include "absl/status/status.h"
@@ -43,9 +42,8 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/load_balancing/child_policy_handler.h"
-#include "src/core/load_balancing/health_check_client_internal.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -66,7 +64,9 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/json/json.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/health_check_client_internal.h"
 #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"
@@ -85,7 +85,7 @@ constexpr absl::string_view kOutlierDetection =
     "outlier_detection_experimental";
 
 // Config for xDS Cluster Impl LB policy.
-class OutlierDetectionLbConfig : public LoadBalancingPolicy::Config {
+class OutlierDetectionLbConfig final : public LoadBalancingPolicy::Config {
  public:
   OutlierDetectionLbConfig(
       OutlierDetectionConfig outlier_detection_config,
@@ -114,7 +114,7 @@ class OutlierDetectionLbConfig : public LoadBalancingPolicy::Config {
 };
 
 // xDS Cluster Impl LB policy.
-class OutlierDetectionLb : public LoadBalancingPolicy {
+class OutlierDetectionLb final : public LoadBalancingPolicy {
  public:
   explicit OutlierDetectionLb(Args args);
 
@@ -128,7 +128,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
   class SubchannelState;
   class EndpointState;
 
-  class SubchannelWrapper : public DelegatingSubchannel {
+  class SubchannelWrapper final : public DelegatingSubchannel {
    public:
     SubchannelWrapper(std::shared_ptr<WorkSerializer> work_serializer,
                       RefCountedPtr<SubchannelState> subchannel_state,
@@ -144,22 +144,6 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
       }
     }
 
-    void Orphan() override {
-      if (!IsWorkSerializerDispatchEnabled()) {
-        if (subchannel_state_ != nullptr) {
-          subchannel_state_->RemoveSubchannel(this);
-        }
-        return;
-      }
-      work_serializer_->Run(
-          [self = WeakRefAsSubclass<SubchannelWrapper>()]() {
-            if (self->subchannel_state_ != nullptr) {
-              self->subchannel_state_->RemoveSubchannel(self.get());
-            }
-          },
-          DEBUG_LOCATION);
-    }
-
     void Eject();
 
     void Uneject();
@@ -174,7 +158,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
     }
 
    private:
-    class WatcherWrapper
+    class WatcherWrapper final
         : public SubchannelInterface::ConnectivityStateWatcherInterface {
      public:
       WatcherWrapper(std::shared_ptr<
@@ -228,13 +212,29 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
       bool ejected_;
     };
 
+    void Orphaned() override {
+      if (!IsWorkSerializerDispatchEnabled()) {
+        if (subchannel_state_ != nullptr) {
+          subchannel_state_->RemoveSubchannel(this);
+        }
+        return;
+      }
+      work_serializer_->Run(
+          [self = WeakRefAsSubclass<SubchannelWrapper>()]() {
+            if (self->subchannel_state_ != nullptr) {
+              self->subchannel_state_->RemoveSubchannel(self.get());
+            }
+          },
+          DEBUG_LOCATION);
+    }
+
     std::shared_ptr<WorkSerializer> work_serializer_;
     RefCountedPtr<SubchannelState> subchannel_state_;
     bool ejected_ = false;
     WatcherWrapper* watcher_wrapper_ = nullptr;
   };
 
-  class SubchannelState : public RefCounted<SubchannelState> {
+  class SubchannelState final : public RefCounted<SubchannelState> {
    public:
     void AddSubchannel(SubchannelWrapper* wrapper) {
       subchannels_.insert(wrapper);
@@ -277,7 +277,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
     RefCountedPtr<EndpointState> endpoint_state_ ABSL_GUARDED_BY(mu_);
   };
 
-  class EndpointState : public RefCounted<EndpointState> {
+  class EndpointState final : public RefCounted<EndpointState> {
    public:
     explicit EndpointState(std::set<SubchannelState*> subchannels)
         : subchannels_(std::move(subchannels)) {
@@ -334,7 +334,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
           --multiplier_;
         }
       } else {
-        GPR_ASSERT(ejection_time_.has_value());
+        CHECK(ejection_time_.has_value());
         auto change_time = ejection_time_.value() +
                            Duration::Milliseconds(std::min(
                                base_ejection_time_in_millis * multiplier_,
@@ -371,7 +371,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
   };
 
   // A picker that wraps the picker from the child to perform outlier detection.
-  class Picker : public SubchannelPicker {
+  class Picker final : public SubchannelPicker {
    public:
     Picker(OutlierDetectionLb* outlier_detection_lb,
            RefCountedPtr<SubchannelPicker> picker, bool counting_enabled);
@@ -384,7 +384,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
     bool counting_enabled_;
   };
 
-  class Helper
+  class Helper final
       : public ParentOwningDelegatingChannelControlHelper<OutlierDetectionLb> {
    public:
     explicit Helper(RefCountedPtr<OutlierDetectionLb> outlier_detection_policy)
@@ -398,7 +398,7 @@ class OutlierDetectionLb : public LoadBalancingPolicy {
                      RefCountedPtr<SubchannelPicker> picker) override;
   };
 
-  class EjectionTimer : public InternallyRefCounted<EjectionTimer> {
+  class EjectionTimer final : public InternallyRefCounted<EjectionTimer> {
    public:
     EjectionTimer(RefCountedPtr<OutlierDetectionLb> parent,
                   Timestamp start_time);
@@ -483,7 +483,7 @@ void OutlierDetectionLb::SubchannelWrapper::CancelDataWatcher(
 // OutlierDetectionLb::Picker::SubchannelCallTracker
 //
 
-class OutlierDetectionLb::Picker::SubchannelCallTracker
+class OutlierDetectionLb::Picker::SubchannelCallTracker final
     : public LoadBalancingPolicy::SubchannelCallTrackerInterface {
  public:
   SubchannelCallTracker(
@@ -1068,7 +1068,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
 // factory
 //
 
-class OutlierDetectionLbFactory : public LoadBalancingPolicyFactory {
+class OutlierDetectionLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {

data/src/core/load_balancing/outlier_detection/outlier_detection.h

@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>  // for uint32_t
 
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"