grpc 1.64.0.pre1 → 1.65.0.pre1

data/src/core/load_balancing/priority/priority.cc

@@ -51,9 +51,6 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.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/transport/connectivity_state.h"
 #include "src/core/load_balancing/address_filtering.h"
 #include "src/core/load_balancing/child_policy_handler.h"
@@ -62,11 +59,12 @@
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.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"
 
 namespace grpc_core {
 
-TraceFlag grpc_lb_priority_trace(false, "priority_lb");
-
 namespace {
 
 using ::grpc_event_engine::experimental::EventEngine;
@@ -296,19 +294,19 @@ PriorityLb::PriorityLb(Args args)
           channel_args()
               .GetDurationFromIntMillis(GRPC_ARG_PRIORITY_FAILOVER_TIMEOUT_MS)
               .value_or(kDefaultChildFailoverTimeout))) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] created", this);
   }
 }
 
 PriorityLb::~PriorityLb() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] destroying priority LB policy", this);
   }
 }
 
 void PriorityLb::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] shutting down", this);
   }
   shutting_down_ = true;
@@ -318,7 +316,7 @@ void PriorityLb::ShutdownLocked() {
 void PriorityLb::ExitIdleLocked() {
   if (current_priority_ != UINT32_MAX) {
     const std::string& child_name = config_->priorities()[current_priority_];
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO,
               "[priority_lb %p] exiting IDLE for current priority %d child %s",
               this, current_priority_, child_name.c_str());
@@ -332,7 +330,7 @@ void PriorityLb::ResetBackoffLocked() {
 }
 
 absl::Status PriorityLb::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] received update", this);
   }
   // Update config.
@@ -404,7 +402,7 @@ void PriorityLb::ChoosePriorityLocked() {
        ++priority) {
     // If the child for the priority does not exist yet, create it.
     const std::string& child_name = config_->priorities()[priority];
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO, "[priority_lb %p] trying priority %u, child %s", this,
               priority, child_name.c_str());
     }
@@ -445,7 +443,7 @@ void PriorityLb::ChoosePriorityLocked() {
       return;
     }
     // Child has been failing for a while.  Move on to the next priority.
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO,
               "[priority_lb %p] skipping priority %u, child %s: state=%s, "
               "failover timer not pending",
@@ -455,7 +453,7 @@ void PriorityLb::ChoosePriorityLocked() {
   }
   // If we didn't find any priority to try, pick the first one in state
   // CONNECTING.
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] no priority reachable, checking for CONNECTING "
             "priority to delegate to",
@@ -465,7 +463,7 @@ void PriorityLb::ChoosePriorityLocked() {
        ++priority) {
     // If the child for the priority does not exist yet, create it.
     const std::string& child_name = config_->priorities()[priority];
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO, "[priority_lb %p] trying priority %u, child %s", this,
               priority, child_name.c_str());
     }
@@ -486,7 +484,7 @@ void PriorityLb::ChoosePriorityLocked() {
 void PriorityLb::SetCurrentPriorityLocked(int32_t priority,
                                           bool deactivate_lower_priorities,
                                           const char* reason) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] selecting priority %u, child %s (%s, "
             "deactivate_lower_priorities=%d)",
@@ -515,7 +513,7 @@ void PriorityLb::SetCurrentPriorityLocked(int32_t priority,
 PriorityLb::ChildPriority::DeactivationTimer::DeactivationTimer(
     RefCountedPtr<PriorityLb::ChildPriority> child_priority)
     : child_priority_(std::move(child_priority)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] child %s (%p): deactivating -- will remove in "
             "%" PRId64 "ms",
@@ -539,7 +537,7 @@ PriorityLb::ChildPriority::DeactivationTimer::DeactivationTimer(
 
 void PriorityLb::ChildPriority::DeactivationTimer::Orphan() {
   if (timer_handle_.has_value()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): reactivating",
               child_priority_->priority_policy_.get(),
               child_priority_->name_.c_str(), child_priority_.get());
@@ -555,7 +553,7 @@ void PriorityLb::ChildPriority::DeactivationTimer::Orphan() {
 void PriorityLb::ChildPriority::DeactivationTimer::OnTimerLocked() {
   if (timer_handle_.has_value()) {
     timer_handle_.reset();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO,
               "[priority_lb %p] child %s (%p): deactivation timer fired, "
               "deleting child",
@@ -573,7 +571,7 @@ void PriorityLb::ChildPriority::DeactivationTimer::OnTimerLocked() {
 PriorityLb::ChildPriority::FailoverTimer::FailoverTimer(
     RefCountedPtr<PriorityLb::ChildPriority> child_priority)
     : child_priority_(std::move(child_priority)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(
         GPR_INFO,
         "[priority_lb %p] child %s (%p): starting failover timer for %" PRId64
@@ -599,7 +597,7 @@ PriorityLb::ChildPriority::FailoverTimer::FailoverTimer(
 
 void PriorityLb::ChildPriority::FailoverTimer::Orphan() {
   if (timer_handle_.has_value()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO,
               "[priority_lb %p] child %s (%p): cancelling failover timer",
               child_priority_->priority_policy_.get(),
@@ -616,7 +614,7 @@ void PriorityLb::ChildPriority::FailoverTimer::Orphan() {
 void PriorityLb::ChildPriority::FailoverTimer::OnTimerLocked() {
   if (timer_handle_.has_value()) {
     timer_handle_.reset();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
       gpr_log(GPR_INFO,
               "[priority_lb %p] child %s (%p): failover timer fired, "
               "reporting TRANSIENT_FAILURE",
@@ -637,7 +635,7 @@ void PriorityLb::ChildPriority::FailoverTimer::OnTimerLocked() {
 PriorityLb::ChildPriority::ChildPriority(
     RefCountedPtr<PriorityLb> priority_policy, std::string name)
     : priority_policy_(std::move(priority_policy)), name_(std::move(name)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] creating child %s (%p)",
             priority_policy_.get(), name_.c_str(), this);
   }
@@ -646,7 +644,7 @@ PriorityLb::ChildPriority::ChildPriority(
 }
 
 void PriorityLb::ChildPriority::Orphan() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): orphaned",
             priority_policy_.get(), name_.c_str(), this);
   }
@@ -676,7 +674,7 @@ absl::Status PriorityLb::ChildPriority::UpdateLocked(
     RefCountedPtr<LoadBalancingPolicy::Config> config,
     bool ignore_reresolution_requests) {
   if (priority_policy_->shutting_down_) return absl::OkStatus();
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): start update",
             priority_policy_.get(), name_.c_str(), this);
   }
@@ -702,7 +700,7 @@ absl::Status PriorityLb::ChildPriority::UpdateLocked(
   update_args.resolution_note = priority_policy_->resolution_note_;
   update_args.args = priority_policy_->args_;
   // Update the policy.
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] child %s (%p): updating child policy handler %p",
             priority_policy_.get(), name_.c_str(), this, child_policy_.get());
@@ -719,8 +717,8 @@ PriorityLb::ChildPriority::CreateChildPolicyLocked(const ChannelArgs& args) {
       std::make_unique<Helper>(this->Ref(DEBUG_LOCATION, "Helper"));
   OrphanablePtr<LoadBalancingPolicy> lb_policy =
       MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args),
-                                         &grpc_lb_priority_trace);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+                                         &priority_lb_trace);
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] child %s (%p): created new child policy "
             "handler %p",
@@ -745,7 +743,7 @@ void PriorityLb::ChildPriority::ResetBackoffLocked() {
 void PriorityLb::ChildPriority::OnConnectivityStateUpdateLocked(
     grpc_connectivity_state state, const absl::Status& status,
     RefCountedPtr<SubchannelPicker> picker) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
     gpr_log(GPR_INFO,
             "[priority_lb %p] child %s (%p): state update: %s (%s) picker %p",
             priority_policy_.get(), name_.c_str(), this,

data/src/core/load_balancing/ring_hash/ring_hash.cc

@@ -60,7 +60,6 @@
 #include "src/core/lib/iomgr/exec_ctx.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/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
@@ -68,11 +67,10 @@
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
-TraceFlag grpc_lb_ring_hash_trace(false, "ring_hash_lb");
-
 UniqueTypeName RequestHashAttribute::TypeName() {
   static UniqueTypeName::Factory kFactory("request_hash");
   return kFactory.Create();
@@ -530,7 +528,7 @@ void RingHash::RingHashEndpoint::CreateChildPolicy() {
   child_policy_ =
       CoreConfiguration::Get().lb_policy_registry().CreateLoadBalancingPolicy(
           "pick_first", std::move(lb_policy_args));
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     const EndpointAddresses& endpoint = ring_hash_->endpoints_[index_];
     gpr_log(GPR_INFO,
             "[RH %p] endpoint %p (index %" PRIuPTR " of %" PRIuPTR
@@ -574,7 +572,7 @@ absl::Status RingHash::RingHashEndpoint::UpdateChildPolicyLocked() {
 void RingHash::RingHashEndpoint::OnStateUpdate(
     grpc_connectivity_state new_state, const absl::Status& status,
     RefCountedPtr<SubchannelPicker> picker) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     gpr_log(
         GPR_INFO,
         "[RH %p] connectivity changed for endpoint %p (%s, child_policy=%p): "
@@ -602,19 +600,19 @@ void RingHash::RingHashEndpoint::OnStateUpdate(
 //
 
 RingHash::RingHash(Args args) : LoadBalancingPolicy(std::move(args)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     gpr_log(GPR_INFO, "[RH %p] Created", this);
   }
 }
 
 RingHash::~RingHash() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     gpr_log(GPR_INFO, "[RH %p] Destroying Ring Hash policy", this);
   }
 }
 
 void RingHash::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     gpr_log(GPR_INFO, "[RH %p] Shutting down", this);
   }
   shutdown_ = true;
@@ -630,7 +628,7 @@ void RingHash::ResetBackoffLocked() {
 absl::Status RingHash::UpdateLocked(UpdateArgs args) {
   // Check address list.
   if (args.addresses.ok()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
       gpr_log(GPR_INFO, "[RH %p] received update", this);
     }
     // De-dup endpoints, taking weight into account.
@@ -646,7 +644,7 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
             endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
         int prev_weight_arg =
             prev_endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
           gpr_log(GPR_INFO,
                   "[RH %p] merging duplicate endpoint for %s, combined "
                   "weight %d",
@@ -661,7 +659,7 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
       }
     });
   } else {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
       gpr_log(GPR_INFO, "[RH %p] received update with addresses error: %s",
               this, args.addresses.status().ToString().c_str());
     }
@@ -771,7 +769,7 @@ void RingHash::UpdateAggregatedConnectivityStateLocked(
     state = GRPC_CHANNEL_TRANSIENT_FAILURE;
     start_connection_attempt = true;
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     gpr_log(GPR_INFO,
             "[RH %p] setting connectivity state to %s (num_idle=%" PRIuPTR
             ", num_connecting=%" PRIuPTR ", num_ready=%" PRIuPTR
@@ -849,7 +847,7 @@ void RingHash::UpdateAggregatedConnectivityStateLocked(
       auto it = endpoint_map_.find(
           EndpointAddressSet(endpoints_[first_idle_index].addresses()));
       CHECK(it != endpoint_map_.end());
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
         gpr_log(GPR_INFO,
                 "[RH %p] triggering internal connection attempt for endpoint "
                 "%p (%s) (index %" PRIuPTR " of %" PRIuPTR ")",

data/src/core/load_balancing/ring_hash/ring_hash.h

@@ -23,10 +23,10 @@
 
 #include "src/core/lib/gprpp/unique_type_name.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/service_config/service_config_call_data.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 {