grpc 1.65.2 → 1.66.0.pre3

data/src/core/lib/security/context/security_context.cc

@@ -28,7 +28,6 @@
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
@@ -38,7 +37,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/call.h"
 
 // --- grpc_call ---
@@ -47,8 +45,8 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call,
                                           grpc_call_credentials* creds) {
   grpc_core::ExecCtx exec_ctx;
   grpc_client_security_context* ctx = nullptr;
-  GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2,
-                 (call, creds));
+  GRPC_TRACE_LOG(api, INFO) << "grpc_call_set_credentials(call=" << call
+                            << ", creds=" << creds << ")";
   if (!grpc_call_is_client(call)) {
     LOG(ERROR) << "Method is client-side only.";
     return GRPC_CALL_ERROR_NOT_ON_SERVER;
@@ -69,7 +67,7 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call,
 grpc_auth_context* grpc_call_auth_context(grpc_call* call) {
   auto* sec_ctx =
       grpc_call_get_arena(call)->GetContext<grpc_core::SecurityContext>();
-  GRPC_API_TRACE("grpc_call_auth_context(call=%p)", 1, (call));
+  GRPC_TRACE_LOG(api, INFO) << "grpc_call_auth_context(call=" << call << ")";
   if (sec_ctx == nullptr) return nullptr;
   if (grpc_call_is_client(call)) {
     auto* sc = grpc_core::DownCast<grpc_client_security_context*>(sec_ctx);
@@ -93,7 +91,8 @@ grpc_auth_context* grpc_call_auth_context(grpc_call* call) {
 }
 
 void grpc_auth_context_release(grpc_auth_context* context) {
-  GRPC_API_TRACE("grpc_auth_context_release(context=%p)", 1, (context));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_release(context=" << context << ")";
   if (context == nullptr) return;
   context->Unref(DEBUG_LOCATION, "grpc_auth_context_unref");
 }
@@ -143,8 +142,8 @@ static grpc_auth_property_iterator empty_iterator = {nullptr, 0, nullptr};
 
 const char* grpc_auth_context_peer_identity_property_name(
     const grpc_auth_context* ctx) {
-  GRPC_API_TRACE("grpc_auth_context_peer_identity_property_name(ctx=%p)", 1,
-                 (ctx));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_peer_identity_property_name(ctx=" << ctx << ")";
   return ctx->peer_identity_property_name();
 }
 
@@ -153,12 +152,12 @@ int grpc_auth_context_set_peer_identity_property_name(grpc_auth_context* ctx,
   grpc_auth_property_iterator it =
       grpc_auth_context_find_properties_by_name(ctx, name);
   const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it);
-  GRPC_API_TRACE(
-      "grpc_auth_context_set_peer_identity_property_name(ctx=%p, name=%s)", 2,
-      (ctx, name));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_set_peer_identity_property_name(ctx=" << ctx
+      << ", name=" << name << ")";
   if (prop == nullptr) {
-    gpr_log(GPR_ERROR, "Property name %s not found in auth context.",
-            name != nullptr ? name : "NULL");
+    LOG(ERROR) << "Property name " << (name != nullptr ? name : "NULL")
+               << " not found in auth context.";
     return 0;
   }
   ctx->set_peer_identity_property_name(prop->name);
@@ -166,14 +165,16 @@ int grpc_auth_context_set_peer_identity_property_name(grpc_auth_context* ctx,
 }
 
 int grpc_auth_context_peer_is_authenticated(const grpc_auth_context* ctx) {
-  GRPC_API_TRACE("grpc_auth_context_peer_is_authenticated(ctx=%p)", 1, (ctx));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_peer_is_authenticated(ctx=" << ctx << ")";
   return ctx->is_authenticated();
 }
 
 grpc_auth_property_iterator grpc_auth_context_property_iterator(
     const grpc_auth_context* ctx) {
   grpc_auth_property_iterator it = empty_iterator;
-  GRPC_API_TRACE("grpc_auth_context_property_iterator(ctx=%p)", 1, (ctx));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_property_iterator(ctx=" << ctx << ")";
   if (ctx == nullptr) return it;
   it.ctx = ctx;
   return it;
@@ -181,7 +182,8 @@ grpc_auth_property_iterator grpc_auth_context_property_iterator(
 
 const grpc_auth_property* grpc_auth_property_iterator_next(
     grpc_auth_property_iterator* it) {
-  GRPC_API_TRACE("grpc_auth_property_iterator_next(it=%p)", 1, (it));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_property_iterator_next(it=" << it << ")";
   if (it == nullptr || it->ctx == nullptr) return nullptr;
   while (it->index == it->ctx->properties().count) {
     if (it->ctx->chained() == nullptr) return nullptr;
@@ -207,8 +209,9 @@ const grpc_auth_property* grpc_auth_property_iterator_next(
 grpc_auth_property_iterator grpc_auth_context_find_properties_by_name(
     const grpc_auth_context* ctx, const char* name) {
   grpc_auth_property_iterator it = empty_iterator;
-  GRPC_API_TRACE("grpc_auth_context_find_properties_by_name(ctx=%p, name=%s)",
-                 2, (ctx, name));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_find_properties_by_name(ctx=" << ctx
+      << ", name=" << name << ")";
   if (ctx == nullptr || name == nullptr) return empty_iterator;
   it.ctx = ctx;
   it.name = name;
@@ -217,7 +220,8 @@ grpc_auth_property_iterator grpc_auth_context_find_properties_by_name(
 
 grpc_auth_property_iterator grpc_auth_context_peer_identity(
     const grpc_auth_context* ctx) {
-  GRPC_API_TRACE("grpc_auth_context_peer_identity(ctx=%p)", 1, (ctx));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_peer_identity(ctx=" << ctx << ")";
   if (ctx == nullptr) return empty_iterator;
   return grpc_auth_context_find_properties_by_name(
       ctx, ctx->peer_identity_property_name());
@@ -247,12 +251,11 @@ void grpc_auth_context::add_property(const char* name, const char* value,
 
 void grpc_auth_context_add_property(grpc_auth_context* ctx, const char* name,
                                     const char* value, size_t value_length) {
-  GRPC_API_TRACE(
+  GRPC_TRACE_LOG(api, INFO) << absl::StrFormat(
       "grpc_auth_context_add_property(ctx=%p, name=%s, value=%*.*s, "
       "value_length=%lu)",
-      6,
-      (ctx, name, (int)value_length, (int)value_length, value,
-       (unsigned long)value_length));
+      ctx, name, (int)value_length, (int)value_length, value,
+      (unsigned long)value_length);
   ctx->add_property(name, value, value_length);
 }
 
@@ -268,9 +271,9 @@ void grpc_auth_context::add_cstring_property(const char* name,
 void grpc_auth_context_add_cstring_property(grpc_auth_context* ctx,
                                             const char* name,
                                             const char* value) {
-  GRPC_API_TRACE(
-      "grpc_auth_context_add_cstring_property(ctx=%p, name=%s, value=%s)", 3,
-      (ctx, name, value));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_auth_context_add_cstring_property(ctx=" << ctx
+      << ", name=" << name << ", value=" << value << ")";
   ctx->add_cstring_property(name, value);
 }
 
@@ -311,8 +314,8 @@ grpc_arg grpc_auth_context_to_arg(grpc_auth_context* c) {
 grpc_auth_context* grpc_auth_context_from_arg(const grpc_arg* arg) {
   if (strcmp(arg->key, GRPC_AUTH_CONTEXT_ARG) != 0) return nullptr;
   if (arg->type != GRPC_ARG_POINTER) {
-    gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type,
-            GRPC_AUTH_CONTEXT_ARG);
+    LOG(ERROR) << "Invalid type " << arg->type << " for arg "
+               << GRPC_AUTH_CONTEXT_ARG;
     return nullptr;
   }
   return static_cast<grpc_auth_context*>(arg->value.pointer.p);

data/src/core/lib/security/credentials/alts/check_gcp_environment.cc

@@ -58,7 +58,7 @@ namespace internal {
 char* read_bios_file(const char* bios_file) {
   FILE* fp = fopen(bios_file, "r");
   if (!fp) {
-    LOG(INFO) << "BIOS data file does not exist or cannot be opened.";
+    VLOG(2) << "BIOS data file does not exist or cannot be opened.";
     return nullptr;
   }
   char buf[kBiosDataBufferSize + 1];

data/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc

@@ -26,7 +26,7 @@
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
 bool grpc_alts_is_running_on_gcp() {
-  LOG(INFO) << "ALTS: Platforms other than Linux and Windows are not supported";
+  VLOG(2) << "ALTS: Platforms other than Linux and Windows are not supported";
   return false;
 }
 

data/src/core/lib/security/credentials/composite/composite_credentials.cc

@@ -32,7 +32,6 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/promise/try_seq.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
 //
@@ -127,10 +126,9 @@ composite_call_credentials_create(
 grpc_call_credentials* grpc_composite_call_credentials_create(
     grpc_call_credentials* creds1, grpc_call_credentials* creds2,
     void* reserved) {
-  GRPC_API_TRACE(
-      "grpc_composite_call_credentials_create(creds1=%p, creds2=%p, "
-      "reserved=%p)",
-      3, (creds1, creds2, reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_composite_call_credentials_create(creds1=" << creds1
+      << ", creds2=" << creds2 << ", reserved=" << reserved << ")";
   CHECK_EQ(reserved, nullptr);
   CHECK_NE(creds1, nullptr);
   CHECK_NE(creds2, nullptr);
@@ -163,10 +161,10 @@ grpc_channel_credentials* grpc_composite_channel_credentials_create(
     void* reserved) {
   CHECK(channel_creds != nullptr && call_creds != nullptr &&
         reserved == nullptr);
-  GRPC_API_TRACE(
-      "grpc_composite_channel_credentials_create(channel_creds=%p, "
-      "call_creds=%p, reserved=%p)",
-      3, (channel_creds, call_creds, reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_composite_channel_credentials_create(channel_creds="
+      << channel_creds << ", call_creds=" << call_creds
+      << ", reserved=" << reserved << ")";
   return new grpc_composite_channel_credentials(channel_creds->Ref(),
                                                 call_creds->Ref());
 }

data/src/core/lib/security/credentials/credentials.cc

@@ -30,19 +30,20 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/util/useful.h"
 
 // -- Common. --
 
 void grpc_channel_credentials_release(grpc_channel_credentials* creds) {
-  GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_channel_credentials_release(creds=" << creds << ")";
   grpc_core::ExecCtx exec_ctx;
   if (creds) creds->Unref();
 }
 
 void grpc_call_credentials_release(grpc_call_credentials* creds) {
-  GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_call_credentials_release(creds=" << creds << ")";
   grpc_core::ExecCtx exec_ctx;
   if (creds) creds->Unref();
 }
@@ -95,18 +96,19 @@ grpc_channel_credentials* grpc_channel_credentials_find_in_args(
 }
 
 void grpc_server_credentials_release(grpc_server_credentials* creds) {
-  GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_server_credentials_release(creds=" << creds << ")";
   grpc_core::ExecCtx exec_ctx;
   if (creds) creds->Unref();
 }
 
 void grpc_server_credentials::set_auth_metadata_processor(
     const grpc_auth_metadata_processor& processor) {
-  GRPC_API_TRACE(
-      "grpc_server_credentials_set_auth_metadata_processor("
-      "creds=%p, "
-      "processor=grpc_auth_metadata_processor { process: %p, state: %p })",
-      3, (this, (void*)(intptr_t)processor.process, processor.state));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_server_credentials_set_auth_metadata_processor(creds=" << this
+      << ", processor=grpc_auth_metadata_processor { process: "
+      << (void*)(intptr_t)processor.process << ", state: " << processor.state
+      << " })";
   DestroyProcessor();
   processor_ = processor;
 }

data/src/core/lib/security/credentials/google_default/google_default_credentials.cc

@@ -63,7 +63,6 @@
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/load_balancing/grpclb/grpclb.h"
@@ -385,8 +384,8 @@ grpc_channel_credentials* grpc_google_default_credentials_create(
   grpc_error_handle error;
   grpc_core::ExecCtx exec_ctx;
 
-  GRPC_API_TRACE("grpc_google_default_credentials_create(%p)", 1,
-                 (call_credentials));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_google_default_credentials_create(" << call_credentials << ")";
 
   if (call_creds == nullptr) {
     call_creds = make_default_call_creds(&error);

data/src/core/lib/security/credentials/iam/iam_credentials.cc

@@ -34,7 +34,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
 grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
@@ -70,10 +69,9 @@ grpc_core::UniqueTypeName grpc_google_iam_credentials::Type() {
 grpc_call_credentials* grpc_google_iam_credentials_create(
     const char* token, const char* authority_selector, void* reserved) {
   grpc_core::ExecCtx exec_ctx;
-  GRPC_API_TRACE(
-      "grpc_iam_credentials_create(token=%s, authority_selector=%s, "
-      "reserved=%p)",
-      3, (token, authority_selector, reserved));
+  GRPC_TRACE_LOG(api, INFO) << "grpc_iam_credentials_create(token=" << token
+                            << ", authority_selector=" << authority_selector
+                            << ", reserved=" << reserved << ")";
   CHECK_EQ(reserved, nullptr);
   CHECK_NE(token, nullptr);
   CHECK_NE(authority_selector, nullptr);

data/src/core/lib/security/credentials/jwt/json_token.cc

@@ -190,7 +190,7 @@ static char* encoded_jwt_claim(const grpc_auth_json_key* json_key,
   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
   gpr_timespec expiration = gpr_time_add(now, token_lifetime);
   if (gpr_time_cmp(token_lifetime, grpc_max_auth_token_lifetime()) > 0) {
-    LOG(INFO) << "Cropping token lifetime to maximum allowed value.";
+    VLOG(2) << "Cropping token lifetime to maximum allowed value.";
     expiration = gpr_time_add(now, grpc_max_auth_token_lifetime());
   }
 

data/src/core/lib/security/credentials/jwt/jwt_credentials.cc

@@ -32,7 +32,6 @@
 #include <grpc/credentials.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
@@ -42,7 +41,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/security/credentials/call_creds_util.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/util/json/json.h"
@@ -117,9 +115,8 @@ grpc_service_account_jwt_access_credentials::
     : key_(key) {
   gpr_timespec max_token_lifetime = grpc_max_auth_token_lifetime();
   if (gpr_time_cmp(token_lifetime, max_token_lifetime) > 0) {
-    gpr_log(GPR_INFO,
-            "Cropping token lifetime to maximum allowed value (%d secs).",
-            static_cast<int>(max_token_lifetime.tv_sec));
+    VLOG(2) << "Cropping token lifetime to maximum allowed value ("
+            << max_token_lifetime.tv_sec << " secs).";
     token_lifetime = grpc_max_auth_token_lifetime();
   }
   jwt_lifetime_ = token_lifetime;
@@ -158,15 +155,12 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create(
     const char* json_key, gpr_timespec token_lifetime, void* reserved) {
   if (GRPC_TRACE_FLAG_ENABLED(api)) {
     char* clean_json = redact_private_key(json_key);
-    gpr_log(GPR_INFO,
-            "grpc_service_account_jwt_access_credentials_create("
-            "json_key=%s, "
-            "token_lifetime="
-            "gpr_timespec { tv_sec: %" PRId64
-            ", tv_nsec: %d, clock_type: %d }, "
-            "reserved=%p)",
-            clean_json, token_lifetime.tv_sec, token_lifetime.tv_nsec,
-            static_cast<int>(token_lifetime.clock_type), reserved);
+    VLOG(2) << "grpc_service_account_jwt_access_credentials_create("
+            << "json_key=" << clean_json
+            << ", token_lifetime=gpr_timespec { tv_sec: "
+            << token_lifetime.tv_sec << ", tv_nsec: " << token_lifetime.tv_nsec
+            << ", clock_type: " << token_lifetime.clock_type
+            << " }, reserved=" << reserved << ")";
     gpr_free(clean_json);
   }
   CHECK_EQ(reserved, nullptr);

data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc

@@ -41,7 +41,6 @@
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
@@ -57,7 +56,6 @@
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/security/util/json_util.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
@@ -118,8 +116,7 @@ grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string(
   Json json;
   auto json_or = grpc_core::JsonParse(json_string);
   if (!json_or.ok()) {
-    gpr_log(GPR_ERROR, "JSON parsing failed: %s",
-            json_or.status().ToString().c_str());
+    LOG(ERROR) << "JSON parsing failed: " << json_or.status();
   } else {
     json = std::move(*json_or);
   }
@@ -175,9 +172,10 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response(
   }
 
   if (response->status != 200) {
-    gpr_log(GPR_ERROR, "Call to http server ended with error %d [%s].",
-            response->status,
-            null_terminated_body != nullptr ? null_terminated_body : "");
+    LOG(ERROR) << "Call to http server ended with error " << response->status
+               << " ["
+               << (null_terminated_body != nullptr ? null_terminated_body : "")
+               << "]";
     status = GRPC_CREDENTIALS_ERROR;
     goto end;
   } else {
@@ -188,8 +186,8 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response(
     auto json = grpc_core::JsonParse(
         null_terminated_body != nullptr ? null_terminated_body : "");
     if (!json.ok()) {
-      gpr_log(GPR_ERROR, "Could not parse JSON from %s: %s",
-              null_terminated_body, json.status().ToString().c_str());
+      LOG(ERROR) << "Could not parse JSON from " << null_terminated_body << ": "
+                 << json.status();
       status = GRPC_CREDENTIALS_ERROR;
       goto end;
     }
@@ -424,8 +422,8 @@ class grpc_compute_engine_token_fetcher_credentials
 
 grpc_call_credentials* grpc_google_compute_engine_credentials_create(
     void* reserved) {
-  GRPC_API_TRACE("grpc_compute_engine_credentials_create(reserved=%p)", 1,
-                 (reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_compute_engine_credentials_create(reserved=" << reserved << ")";
   CHECK_EQ(reserved, nullptr);
   return grpc_core::MakeRefCounted<
              grpc_compute_engine_token_fetcher_credentials>()
@@ -514,10 +512,9 @@ grpc_call_credentials* grpc_google_refresh_token_credentials_create(
   grpc_auth_refresh_token token =
       grpc_auth_refresh_token_create_from_string(json_refresh_token);
   if (GRPC_TRACE_FLAG_ENABLED(api)) {
-    gpr_log(GPR_INFO,
-            "grpc_refresh_token_credentials_create(json_refresh_token=%s, "
-            "reserved=%p)",
-            create_loggable_refresh_token(&token).c_str(), reserved);
+    LOG(INFO) << "grpc_refresh_token_credentials_create(json_refresh_token="
+              << create_loggable_refresh_token(&token)
+              << ", reserved=" << reserved << ")";
   }
   CHECK_EQ(reserved, nullptr);
   return grpc_refresh_token_credentials_create_from_auth_refresh_token(token)
@@ -541,8 +538,8 @@ void MaybeAddToBody(const char* field_name, const char* field,
 grpc_error_handle LoadTokenFile(const char* path, grpc_slice* token) {
   auto slice = LoadFile(path, /*add_null_terminator=*/true);
   if (!slice.ok()) return slice.status();
-  if (slice->length() == 0) {
-    gpr_log(GPR_ERROR, "Token file %s is empty", path);
+  if (slice->empty()) {
+    LOG(ERROR) << "Token file " << path << " is empty";
     return GRPC_ERROR_CREATE("Token file is empty.");
   }
   *token = slice->TakeCSlice();
@@ -706,8 +703,8 @@ grpc_call_credentials* grpc_sts_credentials_create(
   absl::StatusOr<grpc_core::URI> sts_url =
       grpc_core::ValidateStsCredentialsOptions(options);
   if (!sts_url.ok()) {
-    gpr_log(GPR_ERROR, "STS Credentials creation failed. Error: %s.",
-            sts_url.status().ToString().c_str());
+    LOG(ERROR) << "STS Credentials creation failed. Error: "
+               << sts_url.status();
     return nullptr;
   }
   return grpc_core::MakeRefCounted<grpc_core::StsTokenFetcherCredentials>(
@@ -745,10 +742,9 @@ std::string grpc_access_token_credentials::debug_string() {
 
 grpc_call_credentials* grpc_access_token_credentials_create(
     const char* access_token, void* reserved) {
-  GRPC_API_TRACE(
-      "grpc_access_token_credentials_create(access_token=<redacted>, "
-      "reserved=%p)",
-      1, (reserved));
+  GRPC_TRACE_LOG(api, INFO) << "grpc_access_token_credentials_create(access_"
+                               "token=<redacted>, reserved="
+                            << reserved << ")";
   CHECK_EQ(reserved, nullptr);
   return grpc_core::MakeRefCounted<grpc_access_token_credentials>(access_token)
       .release();

data/src/core/lib/security/credentials/plugin/plugin_credentials.cc

@@ -28,7 +28,6 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/error.h"
@@ -36,7 +35,6 @@
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/validate_metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
@@ -124,10 +122,8 @@ void grpc_plugin_credentials::PendingRequest::RequestMetadataReady(
   grpc_core::RefCountedPtr<grpc_plugin_credentials::PendingRequest> r(
       static_cast<grpc_plugin_credentials::PendingRequest*>(request));
   if (GRPC_TRACE_FLAG_ENABLED(plugin_credentials)) {
-    gpr_log(GPR_INFO,
-            "plugin_credentials[%p]: request %p: plugin returned "
-            "asynchronously",
-            r->creds(), r.get());
+    LOG(INFO) << "plugin_credentials[" << r->creds() << "]: request " << r.get()
+              << ": plugin returned asynchronously";
   }
   for (size_t i = 0; i < num_md; ++i) {
     grpc_metadata p;
@@ -155,8 +151,8 @@ grpc_plugin_credentials::GetRequestMetadata(
       args);
   // Invoke the plugin.  The callback holds a ref to us.
   if (GRPC_TRACE_FLAG_ENABLED(plugin_credentials)) {
-    gpr_log(GPR_INFO, "plugin_credentials[%p]: request %p: invoking plugin",
-            this, request.get());
+    LOG(INFO) << "plugin_credentials[" << this << "]: request " << request.get()
+              << ": invoking plugin";
   }
   grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX];
   size_t num_creds_md = 0;
@@ -173,19 +169,15 @@ grpc_plugin_credentials::GetRequestMetadata(
                             &status, &error_details)) {
     child_request.release();
     if (GRPC_TRACE_FLAG_ENABLED(plugin_credentials)) {
-      gpr_log(GPR_INFO,
-              "plugin_credentials[%p]: request %p: plugin will return "
-              "asynchronously",
-              this, request.get());
+      LOG(INFO) << "plugin_credentials[" << this << "]: request "
+                << request.get() << ": plugin will return asynchronously";
     }
     return [request] { return request->PollAsyncResult(); };
   }
   // Synchronous return.
   if (GRPC_TRACE_FLAG_ENABLED(plugin_credentials)) {
-    gpr_log(GPR_INFO,
-            "plugin_credentials[%p]: request %p: plugin returned "
-            "synchronously",
-            this, request.get());
+    LOG(INFO) << "plugin_credentials[" << this << "]: request " << request.get()
+              << ": plugin returned synchronously";
   }
   auto result = request->ProcessPluginResult(creds_md, num_creds_md, status,
                                              error_details);
@@ -207,8 +199,9 @@ grpc_plugin_credentials::grpc_plugin_credentials(
 grpc_call_credentials* grpc_metadata_credentials_create_from_plugin(
     grpc_metadata_credentials_plugin plugin,
     grpc_security_level min_security_level, void* reserved) {
-  GRPC_API_TRACE("grpc_metadata_credentials_create_from_plugin(reserved=%p)", 1,
-                 (reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_metadata_credentials_create_from_plugin(reserved=" << reserved
+      << ")";
   CHECK_EQ(reserved, nullptr);
   return new grpc_plugin_credentials(plugin, min_security_level);
 }

data/src/core/lib/security/credentials/ssl/ssl_credentials.cc

@@ -35,7 +35,6 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
-#include "src/core/lib/surface/api_trace.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
@@ -225,12 +224,11 @@ grpc_security_status grpc_ssl_credentials::InitializeClientHandshakerFactory(
 grpc_channel_credentials* grpc_ssl_credentials_create(
     const char* pem_root_certs, grpc_ssl_pem_key_cert_pair* pem_key_cert_pair,
     const verify_peer_options* verify_options, void* reserved) {
-  GRPC_API_TRACE(
-      "grpc_ssl_credentials_create(pem_root_certs=%s, "
-      "pem_key_cert_pair=%p, "
-      "verify_options=%p, "
-      "reserved=%p)",
-      4, (pem_root_certs, pem_key_cert_pair, verify_options, reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_ssl_credentials_create(pem_root_certs=" << pem_root_certs
+      << ", pem_key_cert_pair=" << pem_key_cert_pair
+      << ", verify_options=" << verify_options << ", reserved=" << reserved
+      << ")";
   CHECK_EQ(reserved, nullptr);
 
   return new grpc_ssl_credentials(
@@ -241,12 +239,11 @@ grpc_channel_credentials* grpc_ssl_credentials_create(
 grpc_channel_credentials* grpc_ssl_credentials_create_ex(
     const char* pem_root_certs, grpc_ssl_pem_key_cert_pair* pem_key_cert_pair,
     const grpc_ssl_verify_peer_options* verify_options, void* reserved) {
-  GRPC_API_TRACE(
-      "grpc_ssl_credentials_create(pem_root_certs=%s, "
-      "pem_key_cert_pair=%p, "
-      "verify_options=%p, "
-      "reserved=%p)",
-      4, (pem_root_certs, pem_key_cert_pair, verify_options, reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_ssl_credentials_create(pem_root_certs=" << pem_root_certs
+      << ", pem_key_cert_pair=" << pem_key_cert_pair
+      << ", verify_options=" << verify_options << ", reserved=" << reserved
+      << ")";
   CHECK_EQ(reserved, nullptr);
 
   return new grpc_ssl_credentials(pem_root_certs, pem_key_cert_pair,
@@ -425,13 +422,12 @@ grpc_server_credentials* grpc_ssl_server_credentials_create_ex(
     size_t num_key_cert_pairs,
     grpc_ssl_client_certificate_request_type client_certificate_request,
     void* reserved) {
-  GRPC_API_TRACE(
-      "grpc_ssl_server_credentials_create_ex("
-      "pem_root_certs=%s, pem_key_cert_pairs=%p, num_key_cert_pairs=%lu, "
-      "client_certificate_request=%d, reserved=%p)",
-      5,
-      (pem_root_certs, pem_key_cert_pairs, (unsigned long)num_key_cert_pairs,
-       client_certificate_request, reserved));
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_ssl_server_credentials_create_ex(pem_root_certs="
+      << pem_root_certs << ", pem_key_cert_pairs=" << pem_key_cert_pairs
+      << ", num_key_cert_pairs=" << (unsigned long)num_key_cert_pairs
+      << ", client_certificate_request=" << client_certificate_request
+      << ", reserved=" << reserved << ")";
   CHECK_EQ(reserved, nullptr);
 
   grpc_ssl_server_certificate_config* cert_config =