grpc 1.64.0.pre1 → 1.65.0.pre1

data/src/core/load_balancing/lb_policy.cc

@@ -27,18 +27,15 @@
 
 namespace grpc_core {
 
-DebugOnlyTraceFlag grpc_trace_lb_policy_refcount(false, "lb_policy_refcount");
-
 //
 // LoadBalancingPolicy
 //
 
 LoadBalancingPolicy::LoadBalancingPolicy(Args args, intptr_t initial_refcount)
-    : InternallyRefCounted(
-          GRPC_TRACE_FLAG_ENABLED(grpc_trace_lb_policy_refcount)
-              ? "LoadBalancingPolicy"
-              : nullptr,
-          initial_refcount),
+    : InternallyRefCounted(GRPC_TRACE_FLAG_ENABLED(lb_policy_refcount)
+                               ? "LoadBalancingPolicy"
+                               : nullptr,
+                           initial_refcount),
       work_serializer_(std::move(args.work_serializer)),
       interested_parties_(grpc_pollset_set_create()),
       channel_control_helper_(std::move(args.channel_control_helper)),
@@ -58,7 +55,7 @@ void LoadBalancingPolicy::Orphan() {
 //
 
 LoadBalancingPolicy::SubchannelPicker::SubchannelPicker()
-    : DualRefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_trace_lb_policy_refcount)
+    : DualRefCounted(GRPC_TRACE_FLAG_ENABLED(lb_policy_refcount)
                          ? "SubchannelPicker"
                          : nullptr) {}
 

data/src/core/load_balancing/lb_policy.h

@@ -38,7 +38,6 @@
 #include <grpc/support/port_platform.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"
@@ -52,11 +51,10 @@
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/telemetry/metrics.h"
 
 namespace grpc_core {
 
-extern DebugOnlyTraceFlag grpc_trace_lb_policy_refcount;
-
 /// Interface for load balancing policies.
 ///
 /// The following concepts are used here:
@@ -456,6 +454,19 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
     absl::Status status_;
   };
 
+  // A picker that returns PickResult::Drop for all picks.
+  class DropPicker final : public SubchannelPicker {
+   public:
+    explicit DropPicker(absl::Status status) : status_(status) {}
+
+    PickResult Pick(PickArgs /*args*/) override {
+      return PickResult::Drop(status_);
+    }
+
+   private:
+    absl::Status status_;
+  };
+
  protected:
   std::shared_ptr<WorkSerializer> work_serializer() const {
     return work_serializer_;
@@ -484,6 +495,11 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
   ChannelArgs channel_args_;
 };
 
+template <>
+struct ArenaContextType<LoadBalancingPolicy::SubchannelCallTrackerInterface> {
+  static void Destroy(LoadBalancingPolicy::SubchannelCallTrackerInterface*) {}
+};
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H

data/src/core/load_balancing/lb_policy_factory.h

@@ -24,8 +24,8 @@
 
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/lb_policy.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

data/src/core/load_balancing/lb_policy_registry.cc

@@ -23,6 +23,7 @@
 #include <vector>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
@@ -30,7 +31,6 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/load_balancing/lb_policy.h"
@@ -43,8 +43,7 @@ namespace grpc_core {
 
 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());
+  VLOG(2) << "registering LB policy factory for \"" << factory->name() << "\"";
   CHECK(factories_.find(factory->name()) == factories_.end());
   factories_.emplace(factory->name(), std::move(factory));
 }

data/src/core/load_balancing/lb_policy_registry.h

@@ -27,9 +27,9 @@
 
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

data/src/core/load_balancing/oob_backend_metric.cc

@@ -59,8 +59,6 @@
 
 namespace grpc_core {
 
-TraceFlag grpc_orca_client_trace(false, "orca_client");
-
 //
 // OrcaProducer::ConnectivityWatcher
 //
@@ -271,12 +269,12 @@ void OrcaProducer::MaybeStartStreamLocked() {
       connected_subchannel_, subchannel_->pollset_set(),
       std::make_unique<OrcaStreamEventHandler>(
           WeakRefAsSubclass<OrcaProducer>(), report_interval_),
-      GRPC_TRACE_FLAG_ENABLED(grpc_orca_client_trace) ? "OrcaClient" : nullptr);
+      GRPC_TRACE_FLAG_ENABLED(orca_client) ? "OrcaClient" : nullptr);
 }
 
 void OrcaProducer::NotifyWatchers(
     const BackendMetricData& backend_metric_data) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_orca_client_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(orca_client)) {
     gpr_log(GPR_INFO, "OrcaProducer %p: reporting backend metrics to watchers",
             this);
   }

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

@@ -62,7 +62,6 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #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"
@@ -72,11 +71,10 @@
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
-TraceFlag grpc_outlier_detection_lb_trace(false, "outlier_detection_lb");
-
 namespace {
 
 using ::grpc_event_engine::experimental::EventEngine;
@@ -534,7 +532,7 @@ OutlierDetectionLb::Picker::Picker(OutlierDetectionLb* outlier_detection_lb,
                                    RefCountedPtr<SubchannelPicker> picker,
                                    bool counting_enabled)
     : picker_(std::move(picker)), counting_enabled_(counting_enabled) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] constructed new picker %p and counting "
             "is %s",
@@ -578,13 +576,13 @@ LoadBalancingPolicy::PickResult OutlierDetectionLb::Picker::Pick(
 
 OutlierDetectionLb::OutlierDetectionLb(Args args)
     : LoadBalancingPolicy(std::move(args)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO, "[outlier_detection_lb %p] created", this);
   }
 }
 
 OutlierDetectionLb::~OutlierDetectionLb() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] destroying outlier_detection LB policy",
             this);
@@ -592,7 +590,7 @@ OutlierDetectionLb::~OutlierDetectionLb() {
 }
 
 void OutlierDetectionLb::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO, "[outlier_detection_lb %p] shutting down", this);
   }
   ejection_timer_.reset();
@@ -618,7 +616,7 @@ void OutlierDetectionLb::ResetBackoffLocked() {
 }
 
 absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO, "[outlier_detection_lb %p] Received update", this);
   }
   auto old_config = std::move(config_);
@@ -627,7 +625,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
   // Update outlier detection timer.
   if (!config_->CountingEnabled()) {
     // No need for timer.  Cancel the current timer, if any.
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] counting disabled, cancelling timer",
               this);
@@ -635,7 +633,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
     ejection_timer_.reset();
   } else if (ejection_timer_ == nullptr) {
     // No timer running.  Start it now.
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO, "[outlier_detection_lb %p] starting timer", this);
     }
     ejection_timer_ = MakeOrphanable<EjectionTimer>(
@@ -649,7 +647,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
     // with the same start time.
     // Note that if the new deadline is in the past, the timer will fire
     // immediately.
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] interval changed, replacing timer",
               this);
@@ -670,7 +668,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
       // Find the entry in the endpoint map.
       auto it = endpoint_state_map_.find(key);
       if (it == endpoint_state_map_.end()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           gpr_log(GPR_INFO,
                   "[outlier_detection_lb %p] adding endpoint entry for %s",
                   this, key.ToString().c_str());
@@ -682,7 +680,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
         for (const grpc_resolved_address& address : endpoint.addresses()) {
           auto it2 = subchannel_state_map_.find(address);
           if (it2 == subchannel_state_map_.end()) {
-            if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+            if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
               std::string address_str = grpc_sockaddr_to_string(&address, false)
                                             .value_or("<unknown>");
               gpr_log(GPR_INFO,
@@ -700,7 +698,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
             key, MakeRefCounted<EndpointState>(std::move(subchannels)));
       } else if (!config_->CountingEnabled()) {
         // If counting is not enabled, reset state.
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           gpr_log(GPR_INFO,
                   "[outlier_detection_lb %p] counting disabled; disabling "
                   "ejection for %s",
@@ -713,7 +711,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
     for (auto it = subchannel_state_map_.begin();
          it != subchannel_state_map_.end();) {
       if (current_addresses.find(it->first) == current_addresses.end()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           std::string address_str =
               grpc_sockaddr_to_string(&it->first, false).value_or("<unknown>");
           gpr_log(GPR_INFO,
@@ -733,7 +731,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
     for (auto it = endpoint_state_map_.begin();
          it != endpoint_state_map_.end();) {
       if (current_endpoints.find(it->first) == current_endpoints.end()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           gpr_log(GPR_INFO,
                   "[outlier_detection_lb %p] removing endpoint map entry %s",
                   this, it->first.ToString().c_str());
@@ -754,7 +752,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
   update_args.resolution_note = std::move(args.resolution_note);
   update_args.config = config_->child_policy();
   update_args.args = std::move(args.args);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] Updating child policy handler %p", this,
             child_policy_.get());
@@ -766,7 +764,7 @@ void OutlierDetectionLb::MaybeUpdatePickerLocked() {
   if (picker_ != nullptr) {
     auto outlier_detection_picker =
         MakeRefCounted<Picker>(this, picker_, config_->CountingEnabled());
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] updating connectivity: state=%s "
               "status=(%s) picker=%p",
@@ -787,8 +785,8 @@ OrphanablePtr<LoadBalancingPolicy> OutlierDetectionLb::CreateChildPolicyLocked(
       RefAsSubclass<OutlierDetectionLb>(DEBUG_LOCATION, "Helper"));
   OrphanablePtr<LoadBalancingPolicy> lb_policy =
       MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args),
-                                         &grpc_outlier_detection_lb_trace);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+                                         &outlier_detection_lb_trace);
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] Created new child policy handler %p",
             this, lb_policy.get());
@@ -814,7 +812,7 @@ RefCountedPtr<SubchannelInterface> OutlierDetectionLb::Helper::CreateSubchannel(
   if (it != parent()->subchannel_state_map_.end()) {
     subchannel_state = it->second->Ref();
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     std::string address_str =
         grpc_sockaddr_to_string(&address, false).value_or("<unknown>");
     gpr_log(GPR_INFO,
@@ -836,7 +834,7 @@ void OutlierDetectionLb::Helper::UpdateState(
     grpc_connectivity_state state, const absl::Status& status,
     RefCountedPtr<SubchannelPicker> picker) {
   if (parent()->shutting_down_) return;
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] child connectivity state update: "
             "state=%s (%s) picker=%p",
@@ -859,7 +857,7 @@ OutlierDetectionLb::EjectionTimer::EjectionTimer(
     RefCountedPtr<OutlierDetectionLb> parent, Timestamp start_time)
     : parent_(std::move(parent)), start_time_(start_time) {
   auto interval = parent_->config_->outlier_detection_config().interval;
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO, "[outlier_detection_lb %p] ejection timer will run in %s",
             parent_.get(), interval.ToString().c_str());
   }
@@ -885,7 +883,7 @@ void OutlierDetectionLb::EjectionTimer::Orphan() {
 void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
   if (!timer_handle_.has_value()) return;
   timer_handle_.reset();
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO, "[outlier_detection_lb %p] ejection timer running",
             parent_.get());
   }
@@ -925,7 +923,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
       }
     }
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
     gpr_log(GPR_INFO,
             "[outlier_detection_lb %p] found %" PRIuPTR
             " success rate candidates and %" PRIuPTR
@@ -939,7 +937,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
   if (!success_rate_ejection_candidates.empty() &&
       success_rate_ejection_candidates.size() >=
           config.success_rate_ejection->minimum_hosts) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] running success rate algorithm: "
               "stdev_factor=%d, enforcement_percentage=%d",
@@ -958,13 +956,13 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
     const double success_rate_stdev_factor =
         static_cast<double>(config.success_rate_ejection->stdev_factor) / 1000;
     double ejection_threshold = mean - stdev * success_rate_stdev_factor;
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] stdev=%.3f, ejection_threshold=%.3f",
               parent_.get(), stdev, ejection_threshold);
     }
     for (auto& candidate : success_rate_ejection_candidates) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
         gpr_log(GPR_INFO,
                 "[outlier_detection_lb %p] checking candidate %p: "
                 "success_rate=%.3f",
@@ -974,7 +972,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
         uint32_t random_key = absl::Uniform(bit_gen_, 1, 100);
         double current_percent =
             100.0 * ejected_host_count / parent_->endpoint_state_map_.size();
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           gpr_log(GPR_INFO,
                   "[outlier_detection_lb %p] random_key=%d "
                   "ejected_host_count=%" PRIuPTR " current_percent=%.3f",
@@ -986,7 +984,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
              (current_percent < config.max_ejection_percent))) {
           // Eject and record the timestamp for use when ejecting addresses in
           // this iteration.
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+          if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
             gpr_log(GPR_INFO, "[outlier_detection_lb %p] ejecting candidate",
                     parent_.get());
           }
@@ -1000,7 +998,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
   if (!failure_percentage_ejection_candidates.empty() &&
       failure_percentage_ejection_candidates.size() >=
           config.failure_percentage_ejection->minimum_hosts) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO,
               "[outlier_detection_lb %p] running failure percentage algorithm: "
               "threshold=%d, enforcement_percentage=%d",
@@ -1008,7 +1006,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
               config.failure_percentage_ejection->enforcement_percentage);
     }
     for (auto& candidate : failure_percentage_ejection_candidates) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
         gpr_log(GPR_INFO,
                 "[outlier_detection_lb %p] checking candidate %p: "
                 "success_rate=%.3f",
@@ -1022,7 +1020,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
         uint32_t random_key = absl::Uniform(bit_gen_, 1, 100);
         double current_percent =
             100.0 * ejected_host_count / parent_->endpoint_state_map_.size();
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
           gpr_log(GPR_INFO,
                   "[outlier_detection_lb %p] random_key=%d "
                   "ejected_host_count=%" PRIuPTR " current_percent=%.3f",
@@ -1035,7 +1033,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
              (current_percent < config.max_ejection_percent))) {
           // Eject and record the timestamp for use when ejecting addresses in
           // this iteration.
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+          if (GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
             gpr_log(GPR_INFO, "[outlier_detection_lb %p] ejecting candidate",
                     parent_.get());
           }
@@ -1055,7 +1053,7 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() {
     auto* endpoint_state = state.second.get();
     const bool unejected = endpoint_state->MaybeUneject(
         config.base_ejection_time.millis(), config.max_ejection_time.millis());
-    if (unejected && GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
+    if (unejected && GRPC_TRACE_FLAG_ENABLED(outlier_detection_lb)) {
       gpr_log(GPR_INFO, "[outlier_detection_lb %p] unejected endpoint %s (%p)",
               parent_.get(), state.first.ToString().c_str(), endpoint_state);
     }

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

@@ -25,9 +25,9 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {