grpc 1.65.1 → 1.66.0.pre3

data/src/core/load_balancing/weighted_target/weighted_target.cc

@@ -28,6 +28,7 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/meta/type_traits.h"
 #include "absl/random/random.h"
 #include "absl/status/status.h"
@@ -39,7 +40,6 @@
 
 #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/lib/channel/channel_args.h"
@@ -285,21 +285,20 @@ WeightedTargetLb::PickResult WeightedTargetLb::WeightedPicker::Pick(
 WeightedTargetLb::WeightedTargetLb(Args args)
     : LoadBalancingPolicy(std::move(args)) {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] created", this);
+    LOG(INFO) << "[weighted_target_lb " << this << "] created";
   }
 }
 
 WeightedTargetLb::~WeightedTargetLb() {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] destroying weighted_target LB policy",
-            this);
+    LOG(INFO) << "[weighted_target_lb " << this
+              << "] destroying weighted_target LB policy";
   }
 }
 
 void WeightedTargetLb::ShutdownLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] shutting down", this);
+    LOG(INFO) << "[weighted_target_lb " << this << "] shutting down";
   }
   shutting_down_ = true;
   targets_.clear();
@@ -312,7 +311,7 @@ void WeightedTargetLb::ResetBackoffLocked() {
 absl::Status WeightedTargetLb::UpdateLocked(UpdateArgs args) {
   if (shutting_down_) return absl::OkStatus();
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] Received update", this);
+    LOG(INFO) << "[weighted_target_lb " << this << "] received update";
   }
   update_in_progress_ = true;
   // Update config.
@@ -384,10 +383,8 @@ void WeightedTargetLb::UpdateStateLocked() {
   // is being propagated to our children.
   if (update_in_progress_) return;
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] scanning children to determine "
-            "connectivity state",
-            this);
+    LOG(INFO) << "[weighted_target_lb " << this
+              << "] scanning children to determine connectivity state";
   }
   // Construct lists of child pickers with associated weights, one for
   // children that are in state READY and another for children that are
@@ -411,11 +408,11 @@ void WeightedTargetLb::UpdateStateLocked() {
     }
     auto child_picker = child->picker();
     if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-      gpr_log(GPR_INFO,
-              "[weighted_target_lb %p]   child=%s state=%s weight=%u picker=%p",
-              this, child_name.c_str(),
-              ConnectivityStateName(child->connectivity_state()),
-              child->weight(), child_picker.get());
+      LOG(INFO) << "[weighted_target_lb " << this << "]   child=" << child_name
+                << " state="
+                << ConnectivityStateName(child->connectivity_state())
+                << " weight=" << child->weight()
+                << " picker=" << child_picker.get();
     }
     switch (child->connectivity_state()) {
       case GRPC_CHANNEL_READY: {
@@ -454,8 +451,8 @@ void WeightedTargetLb::UpdateStateLocked() {
     connectivity_state = GRPC_CHANNEL_TRANSIENT_FAILURE;
   }
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] connectivity changed to %s",
-            this, ConnectivityStateName(connectivity_state));
+    LOG(INFO) << "[weighted_target_lb " << this << "] connectivity changed to "
+              << ConnectivityStateName(connectivity_state);
   }
   RefCountedPtr<SubchannelPicker> picker;
   absl::Status status;
@@ -498,11 +495,11 @@ WeightedTargetLb::WeightedChild::DelayedRemovalTimer::DelayedRemovalTimer(
 void WeightedTargetLb::WeightedChild::DelayedRemovalTimer::Orphan() {
   if (timer_handle_.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-      gpr_log(GPR_INFO,
-              "[weighted_target_lb %p] WeightedChild %p %s: cancelling "
-              "delayed removal timer",
-              weighted_child_->weighted_target_policy_.get(),
-              weighted_child_.get(), weighted_child_->name_.c_str());
+      LOG(INFO) << "[weighted_target_lb "
+                << weighted_child_->weighted_target_policy_.get()
+                << "] WeightedChild " << weighted_child_.get() << " "
+                << weighted_child_->name_
+                << ": cancelling delayed removal timer";
     }
     weighted_child_->weighted_target_policy_->channel_control_helper()
         ->GetEventEngine()
@@ -529,25 +526,25 @@ WeightedTargetLb::WeightedChild::WeightedChild(
       name_(name),
       picker_(MakeRefCounted<QueuePicker>(nullptr)) {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] created WeightedChild %p for %s",
-            weighted_target_policy_.get(), this, name_.c_str());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] created WeightedChild " << this << " for " << name_;
   }
 }
 
 WeightedTargetLb::WeightedChild::~WeightedChild() {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: destroying child",
-            weighted_target_policy_.get(), this, name_.c_str());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": destroying child";
   }
   weighted_target_policy_.reset(DEBUG_LOCATION, "WeightedChild");
 }
 
 void WeightedTargetLb::WeightedChild::Orphan() {
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: shutting down child",
-            weighted_target_policy_.get(), this, name_.c_str());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": shutting down child";
   }
   // Remove the child policy's interested_parties pollset_set from the
   // xDS policy.
@@ -574,11 +571,9 @@ WeightedTargetLb::WeightedChild::CreateChildPolicyLocked(
       MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args),
                                          &weighted_target_lb_trace);
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: Created new child "
-            "policy handler %p",
-            weighted_target_policy_.get(), this, name_.c_str(),
-            lb_policy.get());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": created new child policy handler " << lb_policy.get();
   }
   // Add the xDS's interested_parties pollset_set to that of the newly created
   // child policy. This will make the child policy progress upon activity on
@@ -596,16 +591,17 @@ absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
   if (weighted_target_policy_->shutting_down_) return absl::OkStatus();
   // Update child weight.
   if (weight_ != config.weight && GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO, "[weighted_target_lb %p] WeightedChild %p %s: weight=%u",
-            weighted_target_policy_.get(), this, name_.c_str(), config.weight);
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": weight=" << config.weight;
   }
   weight_ = config.weight;
   // Reactivate if needed.
   if (delayed_removal_timer_ != nullptr) {
     if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-      gpr_log(GPR_INFO,
-              "[weighted_target_lb %p] WeightedChild %p %s: reactivating",
-              weighted_target_policy_.get(), this, name_.c_str());
+      LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+                << "] WeightedChild " << this << " " << name_
+                << ": reactivating";
     }
     delayed_removal_timer_.reset();
   }
@@ -622,11 +618,9 @@ absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
   update_args.args = std::move(args);
   // Update the policy.
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: Updating child "
-            "policy handler %p",
-            weighted_target_policy_.get(), this, name_.c_str(),
-            child_policy_.get());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": updating child policy handler " << child_policy_.get();
   }
   return child_policy_->UpdateLocked(std::move(update_args));
 }
@@ -641,12 +635,11 @@ void WeightedTargetLb::WeightedChild::OnConnectivityStateUpdateLocked(
   // Cache the picker in the WeightedChild.
   picker_ = std::move(picker);
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: connectivity "
-            "state update: state=%s (%s) picker=%p",
-            weighted_target_policy_.get(), this, name_.c_str(),
-            ConnectivityStateName(state), status.ToString().c_str(),
-            picker_.get());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_
+              << ": connectivity state update: state="
+              << ConnectivityStateName(state) << " (" << status
+              << ") picker=" << picker_.get();
   }
   // If the child reports IDLE, immediately tell it to exit idle.
   if (state == GRPC_CHANNEL_IDLE) child_policy_->ExitIdleLocked();
@@ -665,9 +658,8 @@ void WeightedTargetLb::WeightedChild::DeactivateLocked() {
   // If already deactivated, don't do that again.
   if (weight_ == 0) return;
   if (GRPC_TRACE_FLAG_ENABLED(weighted_target_lb)) {
-    gpr_log(GPR_INFO,
-            "[weighted_target_lb %p] WeightedChild %p %s: deactivating",
-            weighted_target_policy_.get(), this, name_.c_str());
+    LOG(INFO) << "[weighted_target_lb " << weighted_target_policy_.get()
+              << "] WeightedChild " << this << " " << name_ << ": deactivating";
   }
   // Set the child weight to 0 so that future picker won't contain this child.
   weight_ = 0;

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

@@ -24,6 +24,7 @@
 #include <vector>
 
 #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"
@@ -34,7 +35,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
@@ -184,19 +184,19 @@ class CdsLb final : public LoadBalancingPolicy {
 
 CdsLb::CdsLb(Args args) : LoadBalancingPolicy(std::move(args)) {
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] created", this);
+    LOG(INFO) << "[cdslb " << this << "] created";
   }
 }
 
 CdsLb::~CdsLb() {
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] destroying cds LB policy", this);
+    LOG(INFO) << "[cdslb " << this << "] destroying cds LB policy";
   }
 }
 
 void CdsLb::ShutdownLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] shutting down", this);
+    LOG(INFO) << "[cdslb " << this << "] shutting down";
   }
   shutting_down_ = true;
   ResetState();
@@ -281,8 +281,9 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
   // Get new config.
   auto new_config = args.config.TakeAsSubclass<CdsLbConfig>();
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] received update: cluster=%s is_dynamic=%d",
-            this, new_config->cluster().c_str(), new_config->is_dynamic());
+    LOG(INFO) << "[cdslb " << this
+              << "] received update: cluster=" << new_config->cluster()
+              << " is_dynamic=" << new_config->is_dynamic();
   }
   CHECK(new_config != nullptr);
   // Cluster name should never change, because we should use a different
@@ -295,9 +296,9 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
   // Start dynamic subscription if needed.
   if (new_config->is_dynamic() && subscription_ == nullptr) {
     if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-      gpr_log(GPR_INFO,
-              "[cdslb %p] obtaining dynamic subscription for cluster %s", this,
-              cluster_name_.c_str());
+      LOG(INFO) << "[cdslb " << this
+                << "] obtaining dynamic subscription for cluster "
+                << cluster_name_;
     }
     auto* dependency_mgr = args.args.GetObject<XdsDependencyManager>();
     if (dependency_mgr == nullptr) {
@@ -326,10 +327,9 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
       // recently subscribed but another update came through before we
       // got the new cluster, in which case it will still be missing.
       if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-        gpr_log(GPR_INFO,
-                "[cdslb %p] xDS config has no entry for dynamic cluster %s, "
-                "waiting for subsequent update",
-                this, cluster_name_.c_str());
+        LOG(INFO) << "[cdslb " << this
+                  << "] xDS config has no entry for dynamic cluster "
+                  << cluster_name_ << ", waiting for subsequent update";
       }
       // Stay in CONNECTING until we get an update that has the cluster.
       return absl::OkStatus();
@@ -453,9 +453,9 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
     grpc_pollset_set_add_pollset_set(child_policy_->interested_parties(),
                                      interested_parties());
     if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-      gpr_log(GPR_INFO, "[cdslb %p] created child policy %s (%p)", this,
-              std::string((*child_config)->name()).c_str(),
-              child_policy_.get());
+      LOG(INFO) << "[cdslb " << this << "] created child policy "
+                << (*child_config)->name() << " (" << child_policy_.get()
+                << ")";
     }
   }
   // Update child policy.
@@ -663,8 +663,8 @@ Json CdsLb::CreateChildPolicyConfigForLeafCluster(
        Json::FromObject(std::move(outlier_detection_config))},
   })});
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] generated config for child policy: %s", this,
-            JsonDump(outlier_detection_policy, /*indent=*/1).c_str());
+    LOG(INFO) << "[cdslb " << this << "] generated config for child policy: "
+              << JsonDump(outlier_detection_policy, /*indent=*/1);
   }
   return outlier_detection_policy;
 }
@@ -696,8 +696,8 @@ Json CdsLb::CreateChildPolicyConfigForAggregateCluster(
        })},
   })});
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] generated config for child policy: %s", this,
-            JsonDump(json, /*indent=*/1).c_str());
+    LOG(INFO) << "[cdslb " << this << "] generated config for child policy: "
+              << JsonDump(json, /*indent=*/1);
   }
   return json;
 }
@@ -715,8 +715,8 @@ void CdsLb::ResetState() {
 
 void CdsLb::ReportTransientFailure(absl::Status status) {
   if (GRPC_TRACE_FLAG_ENABLED(cds_lb)) {
-    gpr_log(GPR_INFO, "[cdslb %p] reporting TRANSIENT_FAILURE: %s", this,
-            status.ToString().c_str());
+    LOG(INFO) << "[cdslb " << this
+              << "] reporting TRANSIENT_FAILURE: " << status;
   }
   ResetState();
   channel_control_helper()->UpdateState(