grpc 1.66.0 → 1.67.0.pre1

data/src/core/lib/iomgr/exec_ctx.h

@@ -33,14 +33,15 @@
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/cpu.h>
-#include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/fork.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/time_precise.h"
 
 #if !defined(_WIN32) || !defined(_DLL)
@@ -109,17 +110,33 @@ class Combiner;
 ///               since that implies a core re-entry outside of application
 ///               callbacks.
 ///
-class GRPC_DLL ExecCtx {
+class GRPC_DLL ExecCtx : public latent_see::ParentScope {
  public:
   /// Default Constructor
 
-  ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) {
+  ExecCtx()
+      : latent_see::ParentScope(GRPC_LATENT_SEE_METADATA("ExecCtx")),
+        flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) {
+#if !TARGET_OS_IPHONE
+    if (!IsTimeCachingInPartyEnabled()) {
+      time_cache_.emplace();
+    }
+#endif
     Fork::IncExecCtxCount();
     Set(this);
   }
 
   /// Parameterised Constructor
-  explicit ExecCtx(uintptr_t fl) : flags_(fl) {
+  explicit ExecCtx(uintptr_t fl)
+      : ExecCtx(fl, GRPC_LATENT_SEE_METADATA("ExecCtx")) {}
+
+  explicit ExecCtx(uintptr_t fl, latent_see::Metadata* latent_see_metadata)
+      : latent_see::ParentScope(latent_see_metadata), flags_(fl) {
+#if !TARGET_OS_IPHONE
+    if (!IsTimeCachingInPartyEnabled()) {
+      time_cache_.emplace();
+    }
+#endif
     if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
       Fork::IncExecCtxCount();
     }
@@ -189,23 +206,18 @@ class GRPC_DLL ExecCtx {
   Timestamp Now() { return Timestamp::Now(); }
 
   void InvalidateNow() {
-#if !TARGET_OS_IPHONE
-    time_cache_.InvalidateCache();
-#endif
+    if (time_cache_.has_value()) time_cache_->InvalidateCache();
   }
 
   void SetNowIomgrShutdown() {
-#if !TARGET_OS_IPHONE
     // We get to do a test only set now on this path just because iomgr
     // is getting removed and no point adding more interfaces for it.
-    time_cache_.TestOnlySetNow(Timestamp::InfFuture());
-#endif
+    TestOnlySetNow(Timestamp::InfFuture());
   }
 
   void TestOnlySetNow(Timestamp now) {
-#if !TARGET_OS_IPHONE
-    time_cache_.TestOnlySetNow(now);
-#endif
+    if (!time_cache_.has_value()) time_cache_.emplace();
+    time_cache_->TestOnlySetNow(now);
   }
 
   /// Gets pointer to current exec_ctx.
@@ -231,9 +243,7 @@ class GRPC_DLL ExecCtx {
   CombinerData combiner_data_ = {nullptr, nullptr};
   uintptr_t flags_;
 
-#if !TARGET_OS_IPHONE
-  ScopedTimeCache time_cache_;
-#endif
+  absl::optional<ScopedTimeCache> time_cache_;
 
 #if !defined(_WIN32) || !defined(_DLL)
   static thread_local ExecCtx* exec_ctx_;

data/src/core/lib/iomgr/executor.cc

@@ -26,7 +26,6 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/cpu.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
@@ -39,13 +38,6 @@
 
 #define MAX_DEPTH 2
 
-#define EXECUTOR_TRACE(format, ...)                                     \
-  do {                                                                  \
-    if (GRPC_TRACE_FLAG_ENABLED(executor)) {                            \
-      LOG(INFO) << "EXECUTOR " << absl::StrFormat(format, __VA_ARGS__); \
-    }                                                                   \
-  } while (0)
-
 namespace grpc_core {
 namespace {
 
@@ -110,11 +102,13 @@ size_t Executor::RunClosures(const char* executor_name,
   while (c != nullptr) {
     grpc_closure* next = c->next_data.next;
 #ifndef NDEBUG
-    EXECUTOR_TRACE("(%s) run %p [created by %s:%d]", executor_name, c,
-                   c->file_created, c->line_created);
+    GRPC_TRACE_LOG(executor, INFO)
+        << "EXECUTOR (" << executor_name << ") run " << c << " [created by "
+        << c->file_created << ":" << c->line_created << "]";
     c->scheduled = false;
 #else
-    EXECUTOR_TRACE("(%s) run %p", executor_name, c);
+    GRPC_TRACE_LOG(executor, INFO)
+        << "EXECUTOR (" << executor_name << ") run " << c;
 #endif
     grpc_error_handle error =
         internal::StatusMoveFromHeapPtr(c->error_data.error);
@@ -134,11 +128,14 @@ bool Executor::IsThreaded() const {
 
 void Executor::SetThreading(bool threading) {
   gpr_atm curr_num_threads = gpr_atm_acq_load(&num_threads_);
-  EXECUTOR_TRACE("(%s) SetThreading(%d) begin", name_, threading);
+  GRPC_TRACE_LOG(executor, INFO)
+      << "EXECUTOR (" << name_ << ") SetThreading(" << threading << ") begin";
 
   if (threading) {
     if (curr_num_threads > 0) {
-      EXECUTOR_TRACE("(%s) SetThreading(true). curr_num_threads > 0", name_);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_
+          << ") SetThreading(true). curr_num_threads > 0";
       return;
     }
 
@@ -160,7 +157,9 @@ void Executor::SetThreading(bool threading) {
     thd_state_[0].thd.Start();
   } else {  // !threading
     if (curr_num_threads == 0) {
-      EXECUTOR_TRACE("(%s) SetThreading(false). curr_num_threads == 0", name_);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_
+          << ") SetThreading(false). curr_num_threads == 0";
       return;
     }
 
@@ -179,8 +178,9 @@ void Executor::SetThreading(bool threading) {
     curr_num_threads = gpr_atm_no_barrier_load(&num_threads_);
     for (gpr_atm i = 0; i < curr_num_threads; i++) {
       thd_state_[i].thd.Join();
-      EXECUTOR_TRACE("(%s) Thread %" PRIdPTR " of %" PRIdPTR " joined", name_,
-                     i + 1, curr_num_threads);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_ << ") Thread " << i + 1 << " of "
+          << curr_num_threads << " joined";
     }
 
     gpr_atm_rel_store(&num_threads_, 0);
@@ -201,7 +201,8 @@ void Executor::SetThreading(bool threading) {
     grpc_iomgr_platform_shutdown_background_closure();
   }
 
-  EXECUTOR_TRACE("(%s) SetThreading(%d) done", name_, threading);
+  GRPC_TRACE_LOG(executor, INFO)
+      << "EXECUTOR (" << name_ << ") SetThreading(" << threading << ") done";
 }
 
 void Executor::Shutdown() { SetThreading(false); }
@@ -214,8 +215,9 @@ void Executor::ThreadMain(void* arg) {
 
   size_t subtract_depth = 0;
   for (;;) {
-    EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: step (sub_depth=%" PRIdPTR ")",
-                   ts->name, ts->id, subtract_depth);
+    GRPC_TRACE_LOG(executor, INFO)
+        << "EXECUTOR (" << ts->name << ") [" << ts->id
+        << "]: step (sub_depth=" << subtract_depth << ")";
 
     gpr_mu_lock(&ts->mu);
     ts->depth -= subtract_depth;
@@ -226,7 +228,8 @@ void Executor::ThreadMain(void* arg) {
     }
 
     if (ts->shutdown) {
-      EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: shutdown", ts->name, ts->id);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << ts->name << ") [" << ts->id << "]: shutdown";
       gpr_mu_unlock(&ts->mu);
       break;
     }
@@ -235,7 +238,8 @@ void Executor::ThreadMain(void* arg) {
     ts->elems = GRPC_CLOSURE_LIST_INIT;
     gpr_mu_unlock(&ts->mu);
 
-    EXECUTOR_TRACE("(%s) [%" PRIdPTR "]: execute", ts->name, ts->id);
+    GRPC_TRACE_LOG(executor, INFO)
+        << "EXECUTOR (" << ts->name << ") [" << ts->id << "]: execute";
 
     ExecCtx::Get()->InvalidateNow();
     subtract_depth = RunClosures(ts->name, closures);
@@ -257,10 +261,13 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error,
     // or already shutdown), then queue the closure on the exec context itself
     if (cur_thread_count == 0) {
 #ifndef NDEBUG
-      EXECUTOR_TRACE("(%s) schedule %p (created %s:%d) inline", name_, closure,
-                     closure->file_created, closure->line_created);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_ << ") schedule " << closure << " (created "
+          << closure->file_created << ":" << closure->line_created
+          << ") inline";
 #else
-      EXECUTOR_TRACE("(%s) schedule %p inline", name_, closure);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_ << ") schedule " << closure << " inline";
 #endif
       grpc_closure_list_append(ExecCtx::Get()->closure_list(), closure, error);
       return;
@@ -280,14 +287,15 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error,
 
     for (;;) {
 #ifndef NDEBUG
-      EXECUTOR_TRACE(
-          "(%s) try to schedule %p (%s) (created %s:%d) to thread "
-          "%" PRIdPTR,
-          name_, closure, is_short ? "short" : "long", closure->file_created,
-          closure->line_created, ts->id);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_ << ") try to schedule " << closure << " ("
+          << (is_short ? "short" : "long") << ") (created "
+          << closure->file_created << ":" << closure->line_created
+          << ") to thread " << ts->id;
 #else
-      EXECUTOR_TRACE("(%s) try to schedule %p (%s) to thread %" PRIdPTR, name_,
-                     closure, is_short ? "short" : "long", ts->id);
+      GRPC_TRACE_LOG(executor, INFO)
+          << "EXECUTOR (" << name_ << ") try to schedule " << closure << " ("
+          << (is_short ? "short" : "long") << ") to thread " << ts->id;
 #endif
 
       gpr_mu_lock(&ts->mu);
@@ -429,7 +437,8 @@ bool Executor::IsThreadedDefault() {
 }
 
 void Executor::SetThreadingAll(bool enable) {
-  EXECUTOR_TRACE("Executor::SetThreadingAll(%d) called", enable);
+  GRPC_TRACE_LOG(executor, INFO)
+      << "EXECUTOR Executor::SetThreadingAll(" << enable << ") called";
   for (size_t i = 0; i < static_cast<size_t>(ExecutorType::NUM_EXECUTORS);
        i++) {
     executors[i]->SetThreading(enable);
@@ -437,7 +446,8 @@ void Executor::SetThreadingAll(bool enable) {
 }
 
 void Executor::SetThreadingDefault(bool enable) {
-  EXECUTOR_TRACE("Executor::SetThreadingDefault(%d) called", enable);
+  GRPC_TRACE_LOG(executor, INFO)
+      << "EXECUTOR Executor::SetThreadingDefault(" << enable << ") called";
   executors[static_cast<size_t>(ExecutorType::DEFAULT)]->SetThreading(enable);
 }
 

data/src/core/lib/iomgr/fork_windows.cc

@@ -25,7 +25,6 @@
 #include "absl/log/log.h"
 
 #include <grpc/fork.h>
-#include <grpc/support/log.h>
 
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK

data/src/core/lib/iomgr/internal_errqueue.cc

@@ -16,7 +16,6 @@
 
 #include "absl/log/log.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"

data/src/core/lib/iomgr/iocp_windows.cc

@@ -30,7 +30,6 @@
 #include "absl/log/log.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/log_windows.h>
 
 #include "src/core/lib/gprpp/crash.h"

data/src/core/lib/iomgr/iomgr_windows.cc

@@ -24,8 +24,6 @@
 
 #include "absl/log/check.h"
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/iocp_windows.h"

data/src/core/lib/iomgr/lockfree_event.cc

@@ -95,10 +95,8 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) {
     // sure that the shutdown error has been initialized properly before us
     // referencing it.
     gpr_atm curr = gpr_atm_acq_load(&state_);
-    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
-      VLOG(2) << "LockfreeEvent::NotifyOn: " << this << " curr=" << curr
-              << " closure=" << closure;
-    }
+    GRPC_TRACE_VLOG(polling, 2) << "LockfreeEvent::NotifyOn: " << this
+                                << " curr=" << curr << " closure=" << closure;
     switch (curr) {
       case kClosureNotReady: {
         // kClosureNotReady -> <closure>.
@@ -163,10 +161,9 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) {
 
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
-    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
-      VLOG(2) << "LockfreeEvent::SetShutdown: " << &state_ << " curr=" << curr
-              << " err=" << StatusToString(shutdown_error);
-    }
+    GRPC_TRACE_VLOG(polling, 2)
+        << "LockfreeEvent::SetShutdown: " << &state_ << " curr=" << curr
+        << " err=" << StatusToString(shutdown_error);
     switch (curr) {
       case kClosureReady:
       case kClosureNotReady:
@@ -212,9 +209,8 @@ void LockfreeEvent::SetReady() {
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
 
-    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
-      VLOG(2) << "LockfreeEvent::SetReady: " << &state_ << " curr=" << curr;
-    }
+    GRPC_TRACE_VLOG(polling, 2)
+        << "LockfreeEvent::SetReady: " << &state_ << " curr=" << curr;
 
     switch (curr) {
       case kClosureReady: {

data/src/core/lib/iomgr/polling_entity.cc

@@ -22,7 +22,6 @@
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/crash.h"
@@ -30,8 +29,12 @@
 grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
     grpc_pollset_set* pollset_set) {
   grpc_polling_entity pollent;
-  pollent.pollent.pollset_set = pollset_set;
-  pollent.tag = GRPC_POLLS_POLLSET_SET;
+  if (pollset_set == nullptr) {
+    pollent.tag = GRPC_POLLS_NONE;
+  } else {
+    pollent.pollent.pollset_set = pollset_set;
+    pollent.tag = GRPC_POLLS_POLLSET_SET;
+  }
   return pollent;
 }
 
@@ -73,6 +76,8 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent,
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
     CHECK_NE(pollent->pollent.pollset_set, nullptr);
     grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set);
+  } else if (pollent->tag == GRPC_POLLS_NONE) {
+    // Do nothing.
   } else {
     grpc_core::Crash(
         absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag));
@@ -93,6 +98,8 @@ void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent,
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
     CHECK_NE(pollent->pollent.pollset_set, nullptr);
     grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set);
+  } else if (pollent->tag == GRPC_POLLS_NONE) {
+    // Do nothing.
   } else {
     grpc_core::Crash(
         absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag));

data/src/core/lib/iomgr/pollset_windows.cc

@@ -22,8 +22,6 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/iocp_windows.h"

data/src/core/lib/iomgr/resolve_address.cc

@@ -21,7 +21,6 @@
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/crash.h"

data/src/core/lib/iomgr/resolve_address_posix.cc

@@ -25,7 +25,6 @@
 #include <sys/types.h>
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 

data/src/core/lib/iomgr/resolve_address_windows.cc

@@ -28,7 +28,6 @@
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>

data/src/core/lib/iomgr/sockaddr_utils_posix.cc

@@ -40,7 +40,6 @@
 #include "absl/log/check.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/crash.h"

data/src/core/lib/iomgr/socket_mutator.cc

@@ -19,7 +19,6 @@
 #include "src/core/lib/iomgr/socket_mutator.h"
 
 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 

data/src/core/lib/iomgr/socket_utils_linux.cc

@@ -25,8 +25,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"

data/src/core/lib/iomgr/socket_utils_posix.cc

@@ -28,7 +28,6 @@
 #include <unistd.h>
 
 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/sockaddr.h"

data/src/core/lib/iomgr/socket_utils_windows.cc

@@ -22,8 +22,6 @@
 
 #ifdef GRPC_WINDOWS_SOCKETUTILS
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"

data/src/core/lib/iomgr/tcp_client_cfstream.cc

@@ -78,10 +78,8 @@ static void CFStreamConnectCleanup(CFStreamConnect* connect) {
 
 static void OnAlarm(void* arg, grpc_error_handle error) {
   CFStreamConnect* connect = static_cast<CFStreamConnect*>(arg);
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    VLOG(2) << "CLIENT_CONNECT :" << connect
-            << " OnAlarm, error:" << grpc_core::StatusToString(error);
-  }
+  GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT :" << connect << " OnAlarm, error:"
+                          << grpc_core::StatusToString(error);
   gpr_mu_lock(&connect->mu);
   grpc_closure* closure = connect->closure;
   connect->closure = nil;
@@ -99,10 +97,8 @@ static void OnAlarm(void* arg, grpc_error_handle error) {
 
 static void OnOpen(void* arg, grpc_error_handle error) {
   CFStreamConnect* connect = static_cast<CFStreamConnect*>(arg);
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    VLOG(2) << "CLIENT_CONNECT :" << connect
-            << " OnOpen, error:" << grpc_core::StatusToString(error);
-  }
+  GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT :" << connect << " OnOpen, error:"
+                          << grpc_core::StatusToString(error);
   gpr_mu_lock(&connect->mu);
   grpc_timer_cancel(&connect->alarm);
   grpc_closure* closure = connect->closure;
@@ -173,10 +169,9 @@ static int64_t CFStreamClientConnect(
   gpr_ref_init(&connect->refcount, 1);
   gpr_mu_init(&connect->mu);
 
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    VLOG(2) << "CLIENT_CONNECT: " << connect << ", " << connect->addr_name
-            << ": asynchronously connecting";
-  }
+  GRPC_TRACE_VLOG(tcp, 2) << "CLIENT_CONNECT: " << connect << ", "
+                          << connect->addr_name
+                          << ": asynchronously connecting";
 
   CFReadStreamRef read_stream;
   CFWriteStreamRef write_stream;

data/src/core/lib/iomgr/tcp_client_posix.cc

@@ -141,10 +141,9 @@ done:
 static void tc_on_alarm(void* acp, grpc_error_handle error) {
   int done;
   async_connect* ac = static_cast<async_connect*>(acp);
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str
-              << ": on_alarm: error=" << grpc_core::StatusToString(error);
-  }
+  GRPC_TRACE_LOG(tcp, INFO)
+      << "CLIENT_CONNECT: " << ac->addr_str
+      << ": on_alarm: error=" << grpc_core::StatusToString(error);
   gpr_mu_lock(&ac->mu);
   if (ac->fd != nullptr) {
     grpc_fd_shutdown(ac->fd, GRPC_ERROR_CREATE("connect() timed out"));
@@ -180,10 +179,9 @@ static void on_writable(void* acp, grpc_error_handle error) {
   std::string addr_str = ac->addr_str;
   grpc_fd* fd;
 
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str
-              << ": on_writable: error=" << grpc_core::StatusToString(error);
-  }
+  GRPC_TRACE_LOG(tcp, INFO)
+      << "CLIENT_CONNECT: " << ac->addr_str
+      << ": on_writable: error=" << grpc_core::StatusToString(error);
 
   gpr_mu_lock(&ac->mu);
   CHECK(ac->fd);
@@ -381,10 +379,8 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
                     grpc_schedule_on_exec_ctx);
   ac->options = options;
 
-  if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
-    LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str
-              << ": asynchronously connecting fd " << fdobj;
-  }
+  GRPC_TRACE_LOG(tcp, INFO) << "CLIENT_CONNECT: " << ac->addr_str
+                            << ": asynchronously connecting fd " << fdobj;
 
   int shard_number = connection_id % (*g_connection_shards).size();
   struct ConnectionShard* shard = &(*g_connection_shards)[shard_number];

data/src/core/lib/iomgr/tcp_client_windows.cc

@@ -29,7 +29,6 @@
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/log_windows.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"