grpc 1.64.0 → 1.65.2

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

@@ -32,6 +32,7 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/function_ref.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -69,9 +70,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/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"
@@ -81,14 +79,15 @@
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/xds/xds_dependency_manager.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"
 #include "src/core/xds/grpc/xds_health_status.h"
 
 namespace grpc_core {
 
 using ::grpc_event_engine::experimental::EventEngine;
 
-TraceFlag grpc_lb_xds_override_host_trace(false, "xds_override_host_lb");
-
 namespace {
 template <typename Value>
 struct PtrLessThan {
@@ -466,7 +465,7 @@ XdsOverrideHostLb::Picker::Picker(
     : policy_(std::move(xds_override_host_lb)),
       picker_(std::move(picker)),
       override_host_health_status_set_(override_host_health_status_set) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO, "[xds_override_host_lb %p] constructed new picker %p",
             policy_.get(), this);
   }
@@ -489,7 +488,7 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
       if (it == policy_->subchannel_map_.end()) continue;
       if (!override_host_health_status_set_.Contains(
               it->second->eds_health_status())) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO,
                   "Subchannel %s health status is not overridden (%s)",
                   std::string(address).c_str(),
@@ -499,7 +498,7 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
       }
       auto subchannel = it->second->GetSubchannelRef();
       if (subchannel == nullptr) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO, "No subchannel for %s",
                   std::string(address).c_str());
         }
@@ -512,7 +511,7 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
       if (connectivity_state == GRPC_CHANNEL_READY) {
         // Found a READY subchannel.  Pass back the actual address list
         // and return the subchannel.
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO, "Picker override found READY subchannel %s",
                   std::string(address).c_str());
         }
@@ -529,8 +528,8 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
   // No READY subchannel found.  If we found an IDLE subchannel, trigger
   // a connection attempt and queue the pick until that attempt completes.
   if (idle_subchannel != nullptr) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-      gpr_log(GPR_INFO, "Picker override found IDLE subchannel");
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
+      LOG(INFO) << "Picker override found IDLE subchannel";
     }
     // Deletes itself after the connection is requested.
     new SubchannelConnectionRequester(std::move(idle_subchannel));
@@ -539,8 +538,8 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
   // No READY or IDLE subchannels.  If we found a CONNECTING subchannel,
   // queue the pick and wait for the connection attempt to complete.
   if (found_connecting) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-      gpr_log(GPR_INFO, "Picker override found CONNECTING subchannel");
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
+      LOG(INFO) << "Picker override found CONNECTING subchannel";
     }
     return PickResult::Queue();
   }
@@ -548,8 +547,8 @@ XdsOverrideHostLb::Picker::PickOverridenHost(
   // entry that has no subchannel, then queue the pick and trigger
   // creation of a subchannel for that entry.
   if (!address_with_no_subchannel.empty()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-      gpr_log(GPR_INFO, "Picker override found entry with no subchannel");
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
+      LOG(INFO) << "Picker override found entry with no subchannel";
     }
     if (!IsWorkSerializerDispatchEnabled()) {
       new SubchannelCreationRequester(policy_, address_with_no_subchannel);
@@ -610,7 +609,7 @@ XdsOverrideHostLb::IdleTimer::IdleTimer(RefCountedPtr<XdsOverrideHostLb> policy,
   // Min time between timer runs is 5s so that we don't kill ourselves
   // with lock contention and CPU usage due to sweeps over the map.
   duration = std::max(duration, Duration::Seconds(5));
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] idle timer %p: subchannel cleanup "
             "pass will run in %s",
@@ -629,7 +628,7 @@ XdsOverrideHostLb::IdleTimer::IdleTimer(RefCountedPtr<XdsOverrideHostLb> policy,
 
 void XdsOverrideHostLb::IdleTimer::Orphan() {
   if (timer_handle_.has_value()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO, "[xds_override_host_lb %p] idle timer %p: cancelling",
               policy_.get(), this);
     }
@@ -642,7 +641,7 @@ void XdsOverrideHostLb::IdleTimer::Orphan() {
 void XdsOverrideHostLb::IdleTimer::OnTimerLocked() {
   if (timer_handle_.has_value()) {
     timer_handle_.reset();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO, "[xds_override_host_lb %p] idle timer %p: timer fired",
               policy_.get(), this);
     }
@@ -656,13 +655,13 @@ void XdsOverrideHostLb::IdleTimer::OnTimerLocked() {
 
 XdsOverrideHostLb::XdsOverrideHostLb(Args args)
     : LoadBalancingPolicy(std::move(args)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO, "[xds_override_host_lb %p] created", this);
   }
 }
 
 XdsOverrideHostLb::~XdsOverrideHostLb() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] destroying xds_override_host LB policy",
             this);
@@ -670,7 +669,7 @@ XdsOverrideHostLb::~XdsOverrideHostLb() {
 }
 
 void XdsOverrideHostLb::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO, "[xds_override_host_lb %p] shutting down", this);
   }
   shutting_down_ = true;
@@ -703,7 +702,7 @@ void XdsOverrideHostLb::ResetState() {
 }
 
 void XdsOverrideHostLb::ReportTransientFailure(absl::Status status) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] reporting TRANSIENT_FAILURE: %s", this,
             status.ToString().c_str());
@@ -741,7 +740,7 @@ class ChildEndpointIterator final : public EndpointAddressesIterator {
     parent_it_->ForEach([&](const EndpointAddresses& endpoint) {
       XdsHealthStatus status = GetEndpointHealthStatus(endpoint);
       if (status.status() != XdsHealthStatus::kDraining) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO,
                   "[xds_override_host_lb %p] endpoint %s: not draining, "
                   "passing to child",
@@ -757,7 +756,7 @@ class ChildEndpointIterator final : public EndpointAddressesIterator {
 };
 
 absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO, "[xds_override_host_lb %p] Received update", this);
   }
   // Grab new LB policy config.
@@ -787,7 +786,7 @@ absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
   args_ = std::move(args.args);
   override_host_status_set_ = it->second->cluster->override_host_statuses;
   connection_idle_timeout_ = it->second->cluster->connection_idle_timeout;
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] override host status set: %s "
             "connection idle timeout: %s",
@@ -800,7 +799,7 @@ absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
     args.addresses =
         std::make_shared<ChildEndpointIterator>(std::move(*args.addresses));
   } else {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO, "[xds_override_host_lb %p] address error: %s", this,
               args.addresses.status().ToString().c_str());
     }
@@ -815,7 +814,7 @@ absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
   update_args.resolution_note = std::move(args.resolution_note);
   update_args.config = new_config->child_config();
   update_args.args = args_;
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] Updating child policy handler %p", this,
             child_policy_.get());
@@ -827,7 +826,7 @@ void XdsOverrideHostLb::MaybeUpdatePickerLocked() {
   if (picker_ != nullptr) {
     auto xds_override_host_picker = MakeRefCounted<Picker>(
         RefAsSubclass<XdsOverrideHostLb>(), picker_, override_host_status_set_);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO,
               "[xds_override_host_lb %p] updating connectivity: state=%s "
               "status=(%s) picker=%p",
@@ -848,8 +847,8 @@ OrphanablePtr<LoadBalancingPolicy> XdsOverrideHostLb::CreateChildPolicyLocked(
       RefAsSubclass<XdsOverrideHostLb>(DEBUG_LOCATION, "Helper"));
   OrphanablePtr<LoadBalancingPolicy> lb_policy =
       MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args),
-                                         &grpc_lb_xds_override_host_trace);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+                                         &xds_override_host_lb_trace);
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] Created new child policy handler %p",
             this, lb_policy.get());
@@ -877,7 +876,7 @@ void XdsOverrideHostLb::UpdateAddressMap(
     // Skip draining hosts if not in the override status set.
     if (status.status() == XdsHealthStatus::kDraining &&
         !override_host_status_set_.Contains(status)) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
         gpr_log(GPR_INFO,
                 "[xds_override_host_lb %p] endpoint %s: draining but not in "
                 "override_host_status set -- ignoring",
@@ -890,7 +889,7 @@ void XdsOverrideHostLb::UpdateAddressMap(
     for (const auto& address : endpoint.addresses()) {
       auto key = grpc_sockaddr_to_string(&address, /*normalize=*/false);
       if (!key.ok()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO,
                   "[xds_override_host_lb %p] no key for endpoint address; "
                   "not adding to map",
@@ -922,7 +921,7 @@ void XdsOverrideHostLb::UpdateAddressMap(
     MutexLock lock(&mu_);
     for (auto it = subchannel_map_.begin(); it != subchannel_map_.end();) {
       if (addresses_for_map.find(it->first) == addresses_for_map.end()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO, "[xds_override_host_lb %p] removing map key %s",
                   this, it->first.c_str());
         }
@@ -937,14 +936,14 @@ void XdsOverrideHostLb::UpdateAddressMap(
       auto& address_info = p.second;
       auto it = subchannel_map_.find(address);
       if (it == subchannel_map_.end()) {
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
           gpr_log(GPR_INFO, "[xds_override_host_lb %p] adding map key %s", this,
                   address.c_str());
         }
         it = subchannel_map_.emplace(address, MakeRefCounted<SubchannelEntry>())
                  .first;
       }
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
         gpr_log(GPR_INFO,
                 "[xds_override_host_lb %p] map key %s: setting "
                 "eds_health_status=%s address_list=%s",
@@ -989,7 +988,7 @@ XdsOverrideHostLb::AdoptSubchannel(
 }
 
 void XdsOverrideHostLb::CreateSubchannelForAddress(absl::string_view address) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] creating owned subchannel for %s", this,
             std::string(address).c_str());
@@ -1033,7 +1032,7 @@ void XdsOverrideHostLb::CleanupSubchannels() {
       if (p.second->last_used_time() <= idle_threshold) {
         auto subchannel = p.second->TakeOwnedSubchannel();
         if (subchannel != nullptr) {
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+          if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
             gpr_log(GPR_INFO,
                     "[xds_override_host_lb %p] dropping subchannel for %s",
                     this, p.first.c_str());
@@ -1060,7 +1059,7 @@ void XdsOverrideHostLb::CleanupSubchannels() {
 RefCountedPtr<SubchannelInterface> XdsOverrideHostLb::Helper::CreateSubchannel(
     const grpc_resolved_address& address, const ChannelArgs& per_address_args,
     const ChannelArgs& args) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     auto key = grpc_sockaddr_to_string(&address, /*normalize=*/false);
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] creating subchannel for %s, "
@@ -1113,7 +1112,7 @@ void XdsOverrideHostLb::SubchannelWrapper::CancelConnectivityStateWatch(
 }
 
 void XdsOverrideHostLb::SubchannelWrapper::Orphaned() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
     gpr_log(GPR_INFO,
             "[xds_override_host_lb %p] subchannel wrapper %p orphaned",
             policy_.get(), this);
@@ -1227,7 +1226,7 @@ void XdsOverrideHostLb::SubchannelEntry::OnSubchannelWrapperOrphan(
   auto* subchannel = GetSubchannel();
   if (subchannel != wrapper) return;
   if (last_used_time_ < (Timestamp::Now() - connection_idle_timeout)) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO,
               "[xds_override_host_lb] removing unowned subchannel wrapper %p",
               subchannel);
@@ -1238,7 +1237,7 @@ void XdsOverrideHostLb::SubchannelEntry::OnSubchannelWrapperOrphan(
     // is still within its idle timeout, so we make a new copy of
     // the wrapper with the same underlying subchannel, and we hold
     // our own ref to it.
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_override_host_lb)) {
       gpr_log(GPR_INFO,
               "[xds_override_host_lb] subchannel wrapper %p: cloning "
               "to gain ownership",

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

@@ -23,10 +23,10 @@
 
 #include "src/core/lib/gprpp/ref_counted_ptr.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/load_balancing/lb_policy.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 {
 

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

@@ -40,22 +40,20 @@
 #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"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_writer.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"
 #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"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/xds_client/xds_client_stats.h"
 
 namespace grpc_core {
 
-TraceFlag grpc_xds_wrr_locality_lb_trace(false, "xds_wrr_locality_lb");
-
 namespace {
 
 constexpr absl::string_view kXdsWrrLocality = "xds_wrr_locality_experimental";
@@ -137,13 +135,13 @@ XdsWrrLocalityLb::XdsWrrLocalityLb(Args args)
     : LoadBalancingPolicy(std::move(args)) {}
 
 XdsWrrLocalityLb::~XdsWrrLocalityLb() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO, "[xds_wrr_locality_lb %p] destroying", this);
   }
 }
 
 void XdsWrrLocalityLb::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO, "[xds_wrr_locality_lb %p] shutting down", this);
   }
   if (child_policy_ != nullptr) {
@@ -162,7 +160,7 @@ void XdsWrrLocalityLb::ResetBackoffLocked() {
 }
 
 absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO, "[xds_wrr_locality_lb %p] Received update", this);
   }
   auto config = args.config.TakeAsSubclass<XdsWrrLocalityLbConfig>();
@@ -204,7 +202,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
            })},
       }),
   });
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO,
             "[xds_wrr_locality_lb %p] generated child policy config: %s", this,
             JsonDump(child_config_json, /*indent=*/1).c_str());
@@ -240,7 +238,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
   update_args.resolution_note = std::move(args.resolution_note);
   update_args.args = std::move(args.args);
   // Update the policy.
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO, "[xds_wrr_locality_lb %p] updating child policy %p", this,
             child_policy_.get());
   }
@@ -257,7 +255,7 @@ OrphanablePtr<LoadBalancingPolicy> XdsWrrLocalityLb::CreateChildPolicyLocked(
   auto lb_policy =
       CoreConfiguration::Get().lb_policy_registry().CreateLoadBalancingPolicy(
           "weighted_target_experimental", std::move(lb_policy_args));
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
     gpr_log(GPR_INFO, "[xds_wrr_locality_lb %p] created new child policy %p",
             this, lb_policy.get());
   }

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -67,6 +67,8 @@ extern void RegisterWeightedRoundRobinLbPolicy(
     CoreConfiguration::Builder* builder);
 extern void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
 extern void RegisterConnectedChannel(CoreConfiguration::Builder* builder);
+extern void RegisterLoadBalancedCallDestination(
+    CoreConfiguration::Builder* builder);
 #ifndef GRPC_NO_RLS
 extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
 #endif  // !GRPC_NO_RLS
@@ -79,10 +81,11 @@ namespace {
 void RegisterBuiltins(CoreConfiguration::Builder* builder) {
   RegisterServerCallTracerFilter(builder);
   builder->channel_init()
-      ->RegisterFilter<LameClientFilter>(GRPC_CLIENT_LAME_CHANNEL)
+      ->RegisterV2Filter<LameClientFilter>(GRPC_CLIENT_LAME_CHANNEL)
       .Terminal();
   builder->channel_init()
       ->RegisterFilter(GRPC_SERVER_CHANNEL, &Server::kServerTopFilter)
+      .SkipV3()
       .BeforeAll();
 }
 
@@ -118,6 +121,7 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterSockaddrResolver(builder);
   RegisterFakeResolver(builder);
   RegisterHttpProxyMapper(builder);
+  RegisterLoadBalancedCallDestination(builder);
 #ifdef GPR_SUPPORT_BINDER_TRANSPORT
   RegisterBinderResolver(builder);
 #endif

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

@@ -37,6 +37,7 @@
 #include <memory>
 #include <utility>
 
+#include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
@@ -126,12 +127,12 @@ class BinderResolverFactory final : public ResolverFactory {
     grpc_resolved_address addr;
     {
       if (!uri.authority().empty()) {
-        gpr_log(GPR_ERROR, "authority is not supported in binder scheme");
+        LOG(ERROR) << "authority is not supported in binder scheme";
         return false;
       }
       grpc_error_handle error = BinderAddrPopulate(uri.path(), &addr);
       if (!error.ok()) {
-        gpr_log(GPR_ERROR, "%s", StatusToString(error).c_str());
+        LOG(ERROR) << StatusToString(error);
         return false;
       }
     }

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

@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@@ -204,7 +205,7 @@ AresClientChannelDNSResolver::AresClientChannelDNSResolver(
                           .set_jitter(GRPC_DNS_RECONNECT_JITTER)
                           .set_max_backoff(Duration::Milliseconds(
                               GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS * 1000)),
-                      &grpc_trace_cares_resolver),
+                      &cares_resolver_trace),
       request_service_config_(
           !channel_args()
                .GetBool(GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION)
@@ -348,7 +349,7 @@ class AresClientChannelDNSResolverFactory final : public ResolverFactory {
 
   bool IsValidUri(const URI& uri) const override {
     if (absl::StripPrefix(uri.path(), "/").empty()) {
-      gpr_log(GPR_ERROR, "no server name supplied in dns URI");
+      LOG(ERROR) << "no server name supplied in dns URI";
       return false;
     }
     return true;

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

@@ -39,7 +39,6 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
@@ -50,6 +49,7 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
 #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/util/string.h"
 
 // TODO(apolcyn): remove this hack after fixing upstream.
 // Our grpc/c-ares code on Windows uses the ares_set_socket_functions API,

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

@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/impl/channel_arg_names.h>
@@ -60,7 +61,6 @@
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/time.h"
@@ -71,15 +71,11 @@
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
 #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/util/string.h"
 
 using grpc_core::EndpointAddresses;
 using grpc_core::EndpointAddressesList;
 
-grpc_core::TraceFlag grpc_trace_cares_address_sorting(false,
-                                                      "cares_address_sorting");
-
-grpc_core::TraceFlag grpc_trace_cares_resolver(false, "cares_resolver");
-
 typedef struct fd_node {
   // default constructor exists only for linked list manipulation
   fd_node() : ev_driver(nullptr) {}
@@ -571,7 +567,7 @@ static void log_address_sorting_list(const grpc_ares_request* r,
 
 void grpc_cares_wrapper_address_sorting_sort(const grpc_ares_request* r,
                                              EndpointAddressesList* addresses) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_cares_address_sorting)) {
+  if (GRPC_TRACE_FLAG_ENABLED(cares_address_sorting)) {
     log_address_sorting_list(r, *addresses, "input");
   }
   address_sorting_sortable* sortables = static_cast<address_sorting_sortable*>(
@@ -591,7 +587,7 @@ void grpc_cares_wrapper_address_sorting_sort(const grpc_ares_request* r,
   }
   gpr_free(sortables);
   *addresses = std::move(sorted);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_cares_address_sorting)) {
+  if (GRPC_TRACE_FLAG_ENABLED(cares_address_sorting)) {
     log_address_sorting_list(r, *addresses, "output");
   }
 }
@@ -883,14 +879,11 @@ grpc_error_handle grpc_dns_lookup_ares_continued(
   grpc_core::SplitHostPort(name, host, port);
   if (host->empty()) {
     error =
-        grpc_error_set_str(GRPC_ERROR_CREATE("unparseable host:port"),
-                           grpc_core::StatusStrProperty::kTargetAddress, name);
+        GRPC_ERROR_CREATE(absl::StrCat("unparseable host:port \"", name, "\""));
     return error;
   } else if (check_port && port->empty()) {
     if (default_port == nullptr || strlen(default_port) == 0) {
-      error = grpc_error_set_str(GRPC_ERROR_CREATE("no port in name"),
-                                 grpc_core::StatusStrProperty::kTargetAddress,
-                                 name);
+      error = GRPC_ERROR_CREATE(absl::StrCat("no port in name \"", name, "\""));
       return error;
     }
     *port = default_port;
@@ -952,7 +945,7 @@ static bool resolve_as_ip_literal_locked(
 static bool target_matches_localhost_inner(const char* name, std::string* host,
                                            std::string* port) {
   if (!grpc_core::SplitHostPort(name, host, port)) {
-    gpr_log(GPR_ERROR, "Unable to split host and port for name: %s", name);
+    LOG(ERROR) << "Unable to split host and port for name: " << name;
     return false;
   }
   return gpr_stricmp(host->c_str(), "localhost") == 0;

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

@@ -39,13 +39,9 @@
 
 #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000
 
-extern grpc_core::TraceFlag grpc_trace_cares_address_sorting;
-
-extern grpc_core::TraceFlag grpc_trace_cares_resolver;
-
 #define GRPC_CARES_TRACE_LOG(format, ...)                           \
   do {                                                              \
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_cares_resolver)) {       \
+    if (GRPC_TRACE_FLAG_ENABLED(cares_resolver)) {                  \
       gpr_log(GPR_DEBUG, "(c-ares resolver) " format, __VA_ARGS__); \
     }                                                               \
   } while (0)

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

@@ -25,10 +25,10 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/iomgr/socket_windows.h"
 #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/string.h"
 
 bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
 

data/src/core/resolver/dns/dns_resolver_plugin.cc

@@ -15,6 +15,7 @@
 
 #include <memory>
 
+#include "absl/log/log.h"
 #include "absl/strings/match.h"
 
 #include <grpc/support/log.h>
@@ -31,15 +32,15 @@
 namespace grpc_core {
 
 void RegisterDnsResolver(CoreConfiguration::Builder* builder) {
-#ifdef GRPC_IOS_EVENT_ENGINE_CLIENT
-  gpr_log(GPR_DEBUG, "Using EventEngine dns resolver");
+#if GRPC_IOS_EVENT_ENGINE_CLIENT
+  VLOG(2) << "Using EventEngine dns resolver";
   builder->resolver_registry()->RegisterResolverFactory(
       std::make_unique<EventEngineClientChannelDNSResolverFactory>());
   return;
 #endif
 #ifndef GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER
   if (IsEventEngineDnsEnabled()) {
-    gpr_log(GPR_DEBUG, "Using EventEngine dns resolver");
+    VLOG(2) << "Using EventEngine dns resolver";
     builder->resolver_registry()->RegisterResolverFactory(
         std::make_unique<EventEngineClientChannelDNSResolverFactory>());
     return;
@@ -48,14 +49,14 @@ void RegisterDnsResolver(CoreConfiguration::Builder* builder) {
   auto resolver = ConfigVars::Get().DnsResolver();
   // ---- Ares resolver ----
   if (ShouldUseAresDnsResolver(resolver)) {
-    gpr_log(GPR_DEBUG, "Using ares dns resolver");
+    VLOG(2) << "Using ares dns resolver";
     RegisterAresDnsResolver(builder);
     return;
   }
   // ---- Native resolver ----
   if (absl::EqualsIgnoreCase(resolver, "native") ||
       !builder->resolver_registry()->HasResolverFactory("dns")) {
-    gpr_log(GPR_DEBUG, "Using native dns resolver");
+    VLOG(2) << "Using native dns resolver";
     RegisterNativeDnsResolver(builder);
     return;
   }