grpc 1.66.0.pre5 → 1.67.0.pre1

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

@@ -29,7 +29,6 @@
 
 #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"
@@ -136,15 +135,13 @@ XdsWrrLocalityLb::XdsWrrLocalityLb(Args args)
     : LoadBalancingPolicy(std::move(args)) {}
 
 XdsWrrLocalityLb::~XdsWrrLocalityLb() {
-  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this << "] destroying";
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] destroying";
 }
 
 void XdsWrrLocalityLb::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this << "] shutting down";
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] shutting down";
   if (child_policy_ != nullptr) {
     grpc_pollset_set_del_pollset_set(child_policy_->interested_parties(),
                                      interested_parties());
@@ -161,9 +158,8 @@ void XdsWrrLocalityLb::ResetBackoffLocked() {
 }
 
 absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this << "] Received update";
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] Received update";
   auto config = args.config.TakeAsSubclass<XdsWrrLocalityLbConfig>();
   // Scan the addresses to find the weight for each locality.
   std::map<RefCountedStringValue, uint32_t> locality_weights;
@@ -203,11 +199,9 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
            })},
       }),
   });
-  if (GRPC_TRACE_FLAG_ENABLED(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this
-              << "] generated child policy config: "
-              << JsonDump(child_config_json, /*indent=*/1);
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] generated child policy config: "
+      << JsonDump(child_config_json, /*indent=*/1);
   // Parse config.
   auto child_config =
       CoreConfiguration::Get().lb_policy_registry().ParseLoadBalancingConfig(
@@ -239,10 +233,9 @@ 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(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this << "] updating child policy "
-              << child_policy_.get();
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] updating child policy "
+      << child_policy_.get();
   return child_policy_->UpdateLocked(std::move(update_args));
 }
 
@@ -256,10 +249,9 @@ 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(xds_wrr_locality_lb)) {
-    LOG(INFO) << "[xds_wrr_locality_lb " << this
-              << "] created new child policy " << lb_policy.get();
-  }
+  GRPC_TRACE_LOG(xds_wrr_locality_lb, INFO)
+      << "[xds_wrr_locality_lb " << this << "] created new child policy "
+      << lb_policy.get();
   // Add our interested_parties pollset_set to that of the newly created
   // child policy. This will make the child policy progress upon activity on
   // this LB policy, which in turn is tied to the application's call.

data/src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -23,6 +23,8 @@ namespace grpc_core {
 #ifndef GRPC_NO_XDS
 extern void RbacFilterRegister(CoreConfiguration::Builder* builder);
 extern void StatefulSessionFilterRegister(CoreConfiguration::Builder* builder);
+extern void GcpAuthenticationFilterRegister(
+    CoreConfiguration::Builder* builder);
 extern void RegisterXdsChannelStackModifier(
     CoreConfiguration::Builder* builder);
 extern void RegisterChannelDefaultCreds(CoreConfiguration::Builder* builder);
@@ -47,6 +49,7 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   // re2 library by default
   RbacFilterRegister(builder);
   StatefulSessionFilterRegister(builder);
+  GcpAuthenticationFilterRegister(builder);
   RegisterXdsChannelStackModifier(builder);
   RegisterChannelDefaultCreds(builder);
   RegisterXdsResolver(builder);

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

@@ -43,8 +43,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/orphanable.h"

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

@@ -34,7 +34,6 @@
 
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
@@ -106,9 +105,10 @@ class AresClientChannelDNSResolver final : public PollingResolver {
           resolver_->authority().c_str(), resolver_->name_to_resolve().c_str(),
           kDefaultSecurePort, resolver_->interested_parties(),
           &on_hostname_resolved_, &addresses_, resolver_->query_timeout_ms_));
-      GRPC_CARES_TRACE_LOG(
-          "resolver:%p Started resolving hostnames. hostname_request_:%p",
-          resolver_.get(), hostname_request_.get());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) resolver:" << resolver_.get()
+          << " Started resolving hostnames. hostname_request_:"
+          << hostname_request_.get();
       if (resolver_->enable_srv_queries_) {
         Ref(DEBUG_LOCATION, "OnSRVResolved").release();
         GRPC_CLOSURE_INIT(&on_srv_resolved_, OnSRVResolved, this, nullptr);
@@ -117,9 +117,10 @@ class AresClientChannelDNSResolver final : public PollingResolver {
             resolver_->name_to_resolve().c_str(),
             resolver_->interested_parties(), &on_srv_resolved_,
             &balancer_addresses_, resolver_->query_timeout_ms_));
-        GRPC_CARES_TRACE_LOG(
-            "resolver:%p Started resolving SRV records. srv_request_:%p",
-            resolver_.get(), srv_request_.get());
+        GRPC_TRACE_VLOG(cares_resolver, 2)
+            << "(c-ares resolver) resolver:" << resolver_.get()
+            << " Started resolving SRV records. srv_request_:"
+            << srv_request_.get();
       }
       if (resolver_->request_service_config_) {
         Ref(DEBUG_LOCATION, "OnTXTResolved").release();
@@ -129,9 +130,10 @@ class AresClientChannelDNSResolver final : public PollingResolver {
             resolver_->name_to_resolve().c_str(),
             resolver_->interested_parties(), &on_txt_resolved_,
             &service_config_json_, resolver_->query_timeout_ms_));
-        GRPC_CARES_TRACE_LOG(
-            "resolver:%p Started resolving TXT records. txt_request_:%p",
-            resolver_.get(), txt_request_.get());
+        GRPC_TRACE_VLOG(cares_resolver, 2)
+            << "(c-ares resolver) resolver:" << resolver_.get()
+            << " Started resolving TXT records. txt_request_:"
+            << txt_request_.get();
       }
     }
 
@@ -219,8 +221,9 @@ AresClientChannelDNSResolver::AresClientChannelDNSResolver(
                           .value_or(GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS))) {}
 
 AresClientChannelDNSResolver::~AresClientChannelDNSResolver() {
-  GRPC_CARES_TRACE_LOG("resolver:%p destroying AresClientChannelDNSResolver",
-                       this);
+  GRPC_TRACE_VLOG(cares_resolver, 2)
+      << "(c-ares resolver) resolver:" << this
+      << " destroying AresClientChannelDNSResolver";
 }
 
 OrphanablePtr<Orphanable> AresClientChannelDNSResolver::StartRequest() {
@@ -283,15 +286,16 @@ AresClientChannelDNSResolver::AresRequestWrapper::OnResolvedLocked(
     grpc_error_handle error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(on_resolved_mu_) {
   if (hostname_request_ != nullptr || srv_request_ != nullptr ||
       txt_request_ != nullptr) {
-    GRPC_CARES_TRACE_LOG(
-        "resolver:%p OnResolved() waiting for results (hostname: %s, srv: %s, "
-        "txt: %s)",
-        this, hostname_request_ != nullptr ? "waiting" : "done",
-        srv_request_ != nullptr ? "waiting" : "done",
-        txt_request_ != nullptr ? "waiting" : "done");
+    GRPC_TRACE_VLOG(cares_resolver, 2)
+        << "(c-ares resolver) resolver:" << this
+        << " OnResolved() waiting for results (hostname: "
+        << (hostname_request_ != nullptr ? "waiting" : "done")
+        << ", srv: " << (srv_request_ != nullptr ? "waiting" : "done")
+        << ", txt: " << (txt_request_ != nullptr ? "waiting" : "done") << ")";
     return absl::nullopt;
   }
-  GRPC_CARES_TRACE_LOG("resolver:%p OnResolved() proceeding", this);
+  GRPC_TRACE_VLOG(cares_resolver, 2)
+      << "(c-ares resolver) resolver:" << this << " OnResolved() proceeding";
   Result result;
   result.args = resolver_->channel_args();
   // TODO(roth): Change logic to be able to report failures for addresses
@@ -309,8 +313,9 @@ AresClientChannelDNSResolver::AresRequestWrapper::OnResolvedLocked(
             absl::StrCat("failed to parse service config: ",
                          StatusToString(service_config_string.status())));
       } else if (!service_config_string->empty()) {
-        GRPC_CARES_TRACE_LOG("resolver:%p selected service config choice: %s",
-                             this, service_config_string->c_str());
+        GRPC_TRACE_VLOG(cares_resolver, 2)
+            << "(c-ares resolver) resolver:" << this
+            << " selected service config choice: " << *service_config_string;
         result.service_config = ServiceConfigImpl::Create(
             resolver_->channel_args(), *service_config_string);
         if (!result.service_config.ok()) {
@@ -325,8 +330,9 @@ AresClientChannelDNSResolver::AresRequestWrapper::OnResolvedLocked(
           SetGrpcLbBalancerAddresses(result.args, *balancer_addresses_);
     }
   } else {
-    GRPC_CARES_TRACE_LOG("resolver:%p dns resolution failed: %s", this,
-                         StatusToString(error).c_str());
+    GRPC_TRACE_VLOG(cares_resolver, 2)
+        << "(c-ares resolver) resolver:" << this
+        << " dns resolution failed: " << StatusToString(error);
     std::string error_message;
     grpc_error_get_str(error, StatusStrProperty::kDescription, &error_message);
     absl::Status status = absl::UnavailableError(
@@ -375,8 +381,9 @@ class AresDNSResolver final : public DNSResolver {
   class AresRequest {
    public:
     virtual ~AresRequest() {
-      GRPC_CARES_TRACE_LOG("AresRequest:%p dtor ares_request_:%p", this,
-                           grpc_ares_request_.get());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresRequest:" << this
+          << " dtor ares_request_:" << grpc_ares_request_.get();
       resolver_->UnregisterRequest(task_handle());
       grpc_pollset_set_destroy(pollset_set_);
     }
@@ -397,8 +404,9 @@ class AresDNSResolver final : public DNSResolver {
     bool Cancel() {
       MutexLock lock(&mu_);
       if (grpc_ares_request_ != nullptr) {
-        GRPC_CARES_TRACE_LOG("AresRequest:%p Cancel ares_request_:%p", this,
-                             grpc_ares_request_.get());
+        GRPC_TRACE_VLOG(cares_resolver, 2)
+            << "(c-ares resolver) AresRequest:" << this
+            << " Cancel ares_request_:" << grpc_ares_request_.get();
         if (completed_) return false;
         // OnDnsLookupDone will still be run
         completed_ = true;
@@ -499,7 +507,8 @@ class AresDNSResolver final : public DNSResolver {
                       aba_token),
           default_port_(default_port),
           on_resolve_address_done_(std::move(on_resolve_address_done)) {
-      GRPC_CARES_TRACE_LOG("AresHostnameRequest:%p ctor", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresHostnameRequest:" << this << " ctor";
     }
 
     std::unique_ptr<grpc_ares_request> MakeRequestLocked() override {
@@ -508,13 +517,15 @@ class AresDNSResolver final : public DNSResolver {
               name_server().c_str(), name().c_str(), default_port_.c_str(),
               pollset_set(), on_dns_lookup_done(), &addresses_,
               timeout().millis()));
-      GRPC_CARES_TRACE_LOG("AresHostnameRequest:%p Start ares_request_:%p",
-                           this, ares_request.get());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresHostnameRequest:" << this
+          << " Start ares_request_:" << ares_request.get();
       return ares_request;
     }
 
     void OnComplete(grpc_error_handle error) override {
-      GRPC_CARES_TRACE_LOG("AresHostnameRequest:%p OnComplete", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresHostnameRequest:" << this << " OnComplete";
       if (!error.ok()) {
         on_resolve_address_done_(grpc_error_to_absl_status(error));
         return;
@@ -550,7 +561,8 @@ class AresDNSResolver final : public DNSResolver {
         : AresRequest(name, name_server, timeout, interested_parties, resolver,
                       aba_token),
           on_resolve_address_done_(std::move(on_resolve_address_done)) {
-      GRPC_CARES_TRACE_LOG("AresSRVRequest:%p ctor", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresSRVRequest:" << this << " ctor";
     }
 
     std::unique_ptr<grpc_ares_request> MakeRequestLocked() override {
@@ -558,13 +570,15 @@ class AresDNSResolver final : public DNSResolver {
           std::unique_ptr<grpc_ares_request>(grpc_dns_lookup_srv_ares(
               name_server().c_str(), name().c_str(), pollset_set(),
               on_dns_lookup_done(), &balancer_addresses_, timeout().millis()));
-      GRPC_CARES_TRACE_LOG("AresSRVRequest:%p Start ares_request_:%p", this,
-                           ares_request.get());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresSRVRequest:" << this
+          << " Start ares_request_:" << ares_request.get();
       return ares_request;
     }
 
     void OnComplete(grpc_error_handle error) override {
-      GRPC_CARES_TRACE_LOG("AresSRVRequest:%p OnComplete", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresSRVRequest:" << this << " OnComplete";
       if (!error.ok()) {
         on_resolve_address_done_(grpc_error_to_absl_status(error));
         return;
@@ -596,7 +610,8 @@ class AresDNSResolver final : public DNSResolver {
         : AresRequest(name, name_server, timeout, interested_parties, resolver,
                       aba_token),
           on_resolved_(std::move(on_resolved)) {
-      GRPC_CARES_TRACE_LOG("AresTXTRequest:%p ctor", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresTXTRequest:" << this << " ctor";
     }
 
     ~AresTXTRequest() override { gpr_free(service_config_json_); }
@@ -606,13 +621,15 @@ class AresDNSResolver final : public DNSResolver {
           std::unique_ptr<grpc_ares_request>(grpc_dns_lookup_txt_ares(
               name_server().c_str(), name().c_str(), pollset_set(),
               on_dns_lookup_done(), &service_config_json_, timeout().millis()));
-      GRPC_CARES_TRACE_LOG("AresSRVRequest:%p Start ares_request_:%p", this,
-                           ares_request.get());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresSRVRequest:" << this
+          << " Start ares_request_:" << ares_request.get();
       return ares_request;
     }
 
     void OnComplete(grpc_error_handle error) override {
-      GRPC_CARES_TRACE_LOG("AresSRVRequest:%p OnComplete", this);
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresSRVRequest:" << this << " OnComplete";
       if (!error.ok()) {
         on_resolved_(grpc_error_to_absl_status(error));
         return;
@@ -684,14 +701,15 @@ class AresDNSResolver final : public DNSResolver {
     MutexLock lock(&mu_);
     if (!open_requests_.contains(handle)) {
       // Unknown request, possibly completed already, or an invalid handle.
-      GRPC_CARES_TRACE_LOG(
-          "AresDNSResolver:%p attempt to cancel unknown TaskHandle:%s", this,
-          HandleToString(handle).c_str());
+      GRPC_TRACE_VLOG(cares_resolver, 2)
+          << "(c-ares resolver) AresDNSResolver:" << this
+          << " attempt to cancel unknown TaskHandle:" << HandleToString(handle);
       return false;
     }
     auto* request = reinterpret_cast<AresRequest*>(handle.keys[0]);
-    GRPC_CARES_TRACE_LOG("AresDNSResolver:%p cancel ares_request:%p", this,
-                         request);
+    GRPC_TRACE_VLOG(cares_resolver, 2)
+        << "(c-ares resolver) AresDNSResolver:" << this
+        << " cancel ares_request:" << request;
     return request->Cancel();
   }
 

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

@@ -39,8 +39,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"