grpc 1.64.0 → 1.65.0.pre2

data/src/core/lib/iomgr/event_engine_shims/endpoint.cc

@@ -19,6 +19,7 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
@@ -37,7 +38,6 @@
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/trace.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -49,8 +49,7 @@
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/transport/error_utils.h"
-
-extern grpc_core::TraceFlag grpc_tcp_trace;
+#include "src/core/util/string.h"
 
 namespace grpc_event_engine {
 namespace experimental {
@@ -120,15 +119,15 @@ class EventEngineEndpointWrapper {
     grpc_slice_buffer_move_into(read_buffer->c_slice_buffer(),
                                 pending_read_buffer_);
     read_buffer->~SliceBuffer();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
       size_t i;
       gpr_log(GPR_INFO, "TCP: %p READ error=%s", eeep_->wrapper,
               status.ToString().c_str());
-      if (gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+      if (ABSL_VLOG_IS_ON(2)) {
         for (i = 0; i < pending_read_buffer_->count; i++) {
           char* dump = grpc_dump_slice(pending_read_buffer_->slices[i],
                                        GPR_DUMP_HEX | GPR_DUMP_ASCII);
-          gpr_log(GPR_DEBUG, "READ DATA: %s", dump);
+          VLOG(2) << "READ DATA: " << dump;
           gpr_free(dump);
         }
       }
@@ -151,15 +150,15 @@ class EventEngineEndpointWrapper {
   bool Write(grpc_closure* write_cb, grpc_slice_buffer* slices,
              const EventEngine::Endpoint::WriteArgs* args) {
     Ref();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
       size_t i;
       gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s)", this,
               std::string(PeerAddress()).c_str());
-      if (gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+      if (ABSL_VLOG_IS_ON(2)) {
         for (i = 0; i < slices->count; i++) {
           char* dump =
               grpc_dump_slice(slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII);
-          gpr_log(GPR_DEBUG, "WRITE DATA: %s", dump);
+          VLOG(2) << "WRITE DATA: " << dump;
           gpr_free(dump);
         }
       }
@@ -178,7 +177,7 @@ class EventEngineEndpointWrapper {
   void FinishPendingWrite(absl::Status status) {
     auto* write_buffer = reinterpret_cast<SliceBuffer*>(&eeep_->write_buffer);
     write_buffer->~SliceBuffer();
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(tcp)) {
       gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s) error=%s", this,
               std::string(PeerAddress()).c_str(), status.ToString().c_str());
     }
@@ -345,29 +344,17 @@ void EndpointAddToPollsetSet(grpc_endpoint* /* ep */,
                              grpc_pollset_set* /* pollset */) {}
 void EndpointDeleteFromPollsetSet(grpc_endpoint* /* ep */,
                                   grpc_pollset_set* /* pollset */) {}
-/// After shutdown, all endpoint operations except destroy are no-op,
-/// and will return some kind of sane default (empty strings, nullptrs, etc).
-/// It is the caller's responsibility to ensure that calls to EndpointShutdown
-/// are synchronized.
-void EndpointShutdown(grpc_endpoint* ep, grpc_error_handle why) {
-  auto* eeep =
-      reinterpret_cast<EventEngineEndpointWrapper::grpc_event_engine_endpoint*>(
-          ep);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) {
-    gpr_log(GPR_INFO, "TCP Endpoint %p shutdown why=%s", eeep->wrapper,
-            why.ToString().c_str());
-  }
-  GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Shutdown:%s", eeep->wrapper,
-                          why.ToString().c_str());
-  eeep->wrapper->TriggerShutdown(nullptr);
-}
 
-// Attempts to free the underlying data structures.
+/// Attempts to free the underlying data structures.
+/// After destruction, no new endpoint operations may be started.
+/// It is the caller's responsibility to ensure that calls to EndpointDestroy
+/// are synchronized.
 void EndpointDestroy(grpc_endpoint* ep) {
   auto* eeep =
       reinterpret_cast<EventEngineEndpointWrapper::grpc_event_engine_endpoint*>(
           ep);
   GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Destroy", eeep->wrapper);
+  eeep->wrapper->TriggerShutdown(nullptr);
   eeep->wrapper->Unref();
 }
 
@@ -405,7 +392,6 @@ grpc_endpoint_vtable grpc_event_engine_endpoint_vtable = {
     EndpointAddToPollset,
     EndpointAddToPollsetSet,
     EndpointDeleteFromPollsetSet,
-    EndpointShutdown,
     EndpointDestroy,
     EndpointGetPeerAddress,
     EndpointGetLocalAddress,

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

@@ -32,7 +32,7 @@
 static void exec_ctx_run(grpc_closure* closure) {
 #ifndef NDEBUG
   closure->scheduled = false;
-  if (grpc_trace_closure.enabled()) {
+  if (GRPC_TRACE_FLAG_ENABLED(closure)) {
     gpr_log(GPR_DEBUG, "running closure %p: created [%s:%d]: %s [%s:%d]",
             closure, closure->file_created, closure->line_created,
             closure->run ? "run" : "scheduled", closure->file_initiated,
@@ -44,7 +44,7 @@ static void exec_ctx_run(grpc_closure* closure) {
   closure->error_data.error = 0;
   closure->cb(closure->cb_arg, std::move(error));
 #ifndef NDEBUG
-  if (grpc_trace_closure.enabled()) {
+  if (GRPC_TRACE_FLAG_ENABLED(closure)) {
     gpr_log(GPR_DEBUG, "closure %p finished", closure);
   }
 #endif

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

@@ -36,12 +36,12 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/time_precise.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/time_precise.h"
 
 #if !defined(_WIN32) || !defined(_DLL)
 #define EXEC_CTX exec_ctx_

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

@@ -28,28 +28,21 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
+#include "src/core/util/useful.h"
 
 #define MAX_DEPTH 2
 
 #define EXECUTOR_TRACE(format, ...)                       \
   do {                                                    \
-    if (GRPC_TRACE_FLAG_ENABLED(executor_trace)) {        \
+    if (GRPC_TRACE_FLAG_ENABLED(executor)) {              \
       gpr_log(GPR_INFO, "EXECUTOR " format, __VA_ARGS__); \
     }                                                     \
   } while (0)
 
-#define EXECUTOR_TRACE0(str)                       \
-  do {                                             \
-    if (GRPC_TRACE_FLAG_ENABLED(executor_trace)) { \
-      gpr_log(GPR_INFO, "EXECUTOR " str);          \
-    }                                              \
-  } while (0)
-
 namespace grpc_core {
 namespace {
 
@@ -87,8 +80,6 @@ const EnqueueFunc
 
 }  // namespace
 
-TraceFlag executor_trace(false, "executor");
-
 Executor::Executor(const char* name) : name_(name) {
   adding_thread_lock_ = GPR_SPINLOCK_STATIC_INITIALIZER;
   gpr_atm_rel_store(&num_threads_, 0);
@@ -368,7 +359,7 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error,
 // the grpc_init() and grpc_shutdown() code paths which are protected by a
 // global mutex. So it is okay to assume that these functions are thread-safe
 void Executor::InitAll() {
-  EXECUTOR_TRACE0("Executor::InitAll() enter");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::InitAll() enter";
 
   // Return if Executor::InitAll() is already called earlier
   if (executors[static_cast<size_t>(ExecutorType::DEFAULT)] != nullptr) {
@@ -384,7 +375,7 @@ void Executor::InitAll() {
   executors[static_cast<size_t>(ExecutorType::DEFAULT)]->Init();
   executors[static_cast<size_t>(ExecutorType::RESOLVER)]->Init();
 
-  EXECUTOR_TRACE0("Executor::InitAll() done");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::InitAll() done";
 }
 
 void Executor::Run(grpc_closure* closure, grpc_error_handle error,
@@ -394,7 +385,7 @@ void Executor::Run(grpc_closure* closure, grpc_error_handle error,
 }
 
 void Executor::ShutdownAll() {
-  EXECUTOR_TRACE0("Executor::ShutdownAll() enter");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::ShutdownAll() enter";
 
   // Return if Executor:SshutdownAll() is already called earlier
   if (executors[static_cast<size_t>(ExecutorType::DEFAULT)] == nullptr) {
@@ -422,7 +413,7 @@ void Executor::ShutdownAll() {
   executors[static_cast<size_t>(ExecutorType::DEFAULT)] = nullptr;
   executors[static_cast<size_t>(ExecutorType::RESOLVER)] = nullptr;
 
-  EXECUTOR_TRACE0("Executor::ShutdownAll() done");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::ShutdownAll() done";
 }
 
 bool Executor::IsThreaded(ExecutorType executor_type) {

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

@@ -21,9 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/spinlock.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/closure.h"
+#include "src/core/util/spinlock.h"
 
 namespace grpc_core {
 

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

@@ -28,9 +28,10 @@
 
 #include <string.h>
 
+#include "absl/log/log.h"
+
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/fork.h"
@@ -60,24 +61,21 @@ void grpc_prefork() {
   }
   grpc_core::ExecCtx exec_ctx;
   if (!grpc_core::Fork::Enabled()) {
-    gpr_log(GPR_ERROR,
-            "Fork support not enabled; try running with the "
-            "environment variable GRPC_ENABLE_FORK_SUPPORT=1");
+    LOG(ERROR) << "Fork support not enabled; try running with the "
+                  "environment variable GRPC_ENABLE_FORK_SUPPORT=1";
     return;
   }
   const char* poll_strategy_name = grpc_get_poll_strategy_name();
   if (poll_strategy_name == nullptr ||
       (strcmp(poll_strategy_name, "epoll1") != 0 &&
        strcmp(poll_strategy_name, "poll") != 0)) {
-    gpr_log(GPR_INFO,
-            "Fork support is only compatible with the epoll1 and poll polling "
-            "strategies");
+    LOG(INFO) << "Fork support is only compatible with the epoll1 and poll "
+                 "polling strategies";
     return;
   }
   if (!grpc_core::Fork::BlockExecCtx()) {
-    gpr_log(GPR_INFO,
-            "Other threads are currently calling into gRPC, skipping fork() "
-            "handlers");
+    LOG(INFO) << "Other threads are currently calling into gRPC, skipping "
+                 "fork() handlers";
     return;
   }
   grpc_timer_manager_set_threading(false);

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

@@ -22,6 +22,8 @@
 
 #ifndef GRPC_POSIX_FORK
 
+#include "absl/log/log.h"
+
 #include <grpc/fork.h>
 #include <grpc/support/log.h>
 
@@ -30,7 +32,7 @@
 //       AROUND VERY SPECIFIC USE CASES.
 //
 
-void grpc_prefork() { gpr_log(GPR_ERROR, "Forking not supported on Windows"); }
+void grpc_prefork() { LOG(ERROR) << "Forking not supported on Windows"; }
 
 void grpc_postfork_parent() {}
 

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

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <net/if.h>
 
-#include <grpc/support/log.h>
+#include "absl/log/log.h"
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
@@ -33,8 +33,7 @@
 uint32_t grpc_if_nametoindex(char* name) {
   uint32_t out = if_nametoindex(name);
   if (out == 0) {
-    gpr_log(GPR_DEBUG, "if_nametoindex failed for name %s. errno %d", name,
-            errno);
+    VLOG(2) << "if_nametoindex failed for name " << name << ". errno " << errno;
   }
   return out;
 }

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

@@ -22,16 +22,14 @@
 
 #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX)
 
-#include <grpc/support/log.h>
+#include "absl/log/log.h"
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
 
 uint32_t grpc_if_nametoindex(char* name) {
-  gpr_log(GPR_DEBUG,
-          "Not attempting to convert interface name %s to index for current "
-          "platform.",
-          name);
+  VLOG(2) << "Not attempting to convert interface name " << name
+          << " to index for current platform.";
   return 0;
 }
 

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

@@ -14,6 +14,8 @@
 
 #include "src/core/lib/iomgr/internal_errqueue.h"
 
+#include "absl/log/log.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
@@ -37,7 +39,7 @@ bool KernelSupportsErrqueue() {
     // least 4.0.0
     struct utsname buffer;
     if (uname(&buffer) != 0) {
-      gpr_log(GPR_ERROR, "uname: %s", StrError(errno).c_str());
+      LOG(ERROR) << "uname: " << StrError(errno);
       return false;
     }
     char* release = buffer.release;
@@ -48,7 +50,7 @@ bool KernelSupportsErrqueue() {
     if (strtol(release, nullptr, 10) >= 4) {
       return true;
     } else {
-      gpr_log(GPR_DEBUG, "ERRQUEUE support not enabled");
+      VLOG(2) << "ERRQUEUE support not enabled";
     }
 #endif  // GRPC_LINUX_ERRQUEUE
     return false;

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

@@ -27,19 +27,20 @@
 #include <limits>
 
 #include "absl/log/check.h"
+#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/debug/stats.h"
-#include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/socket_windows.h"
 #include "src/core/lib/iomgr/timer.h"
+#include "src/core/telemetry/stats.h"
+#include "src/core/telemetry/stats_data.h"
 
 static ULONG g_iocp_kick_token;
 static OVERLAPPED g_iocp_custom_overlap;
@@ -157,7 +158,7 @@ void grpc_iocp_add_socket(grpc_winsocket* socket) {
                                (uintptr_t)socket, 0);
   if (!ret) {
     char* utf8_message = gpr_format_message(WSAGetLastError());
-    gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message);
+    LOG(ERROR) << "Unable to add socket to iocp: " << utf8_message;
     gpr_free(utf8_message);
     __debugbreak();
     abort();

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

@@ -22,15 +22,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "absl/log/log.h"
+
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/config/config_vars.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/buffer_list.h"
@@ -40,6 +39,8 @@
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 static gpr_mu g_mu;
 static gpr_cv g_rcv;
@@ -82,7 +83,7 @@ size_t grpc_iomgr_count_objects_for_testing(void) {
 static void dump_objects(const char* kind) {
   grpc_iomgr_object* obj;
   for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) {
-    gpr_log(GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj);
+    VLOG(2) << kind << " OBJECT: " << obj->name << " " << obj;
   }
 }
 
@@ -102,9 +103,8 @@ void grpc_iomgr_shutdown() {
               gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time),
               gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) {
         if (g_root_object.next != &g_root_object) {
-          gpr_log(GPR_DEBUG,
-                  "Waiting for %" PRIuPTR " iomgr objects to be destroyed",
-                  count_objects());
+          VLOG(2) << "Waiting for " << count_objects()
+                  << " iomgr objects to be destroyed";
         }
         last_warning_time = gpr_now(GPR_CLOCK_REALTIME);
       }
@@ -118,11 +118,9 @@ void grpc_iomgr_shutdown() {
       }
       if (g_root_object.next != &g_root_object) {
         if (grpc_iomgr_abort_on_leaks()) {
-          gpr_log(GPR_DEBUG,
-                  "Failed to free %" PRIuPTR
-                  " iomgr objects before shutdown deadline: "
-                  "memory leaks are likely",
-                  count_objects());
+          VLOG(2) << "Failed to free " << count_objects()
+                  << " iomgr objects before shutdown deadline: "
+                  << "memory leaks are likely";
           dump_objects("LEAKED");
           abort();
         }
@@ -133,11 +131,9 @@ void grpc_iomgr_shutdown() {
           if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) >
               0) {
             if (g_root_object.next != &g_root_object) {
-              gpr_log(GPR_DEBUG,
-                      "Failed to free %" PRIuPTR
-                      " iomgr objects before shutdown deadline: "
-                      "memory leaks are likely",
-                      count_objects());
+              VLOG(2) << "Failed to free " << count_objects()
+                      << " iomgr objects before shutdown deadline: "
+                      << "memory leaks are likely";
               dump_objects("LEAKED");
             }
             break;

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

@@ -27,8 +27,6 @@
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 
-extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace;
-
 // 'state' holds the to call when the fd is readable or writable respectively.
 // It can contain one of the following values:
 //   kClosureReady     : The fd has an I/O event of interest but there is no
@@ -97,7 +95,7 @@ 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(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG,
               "LockfreeEvent::NotifyOn: %p curr=%" PRIxPTR " closure=%p", this,
               curr, closure);
@@ -166,7 +164,7 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) {
 
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG,
               "LockfreeEvent::SetShutdown: %p curr=%" PRIxPTR " err=%s",
               &state_, curr, StatusToString(shutdown_error).c_str());
@@ -216,7 +214,7 @@ void LockfreeEvent::SetReady() {
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
 
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG, "LockfreeEvent::SetReady: %p curr=%" PRIxPTR, &state_,
               curr);
     }

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

@@ -26,8 +26,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 
-extern grpc_core::DebugOnlyTraceFlag grpc_trace_fd_refcount;
-
 // A grpc_pollset is a set of file descriptors that a higher level item is
 // interested in. For example:
 //  - a server will typically keep a pollset containing all connected channels,

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

@@ -33,8 +33,6 @@
 
 #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1)
 
-grpc_core::DebugOnlyTraceFlag grpc_trace_fd_refcount(false, "fd_refcount");
-
 gpr_mu grpc_polling_mu;
 static grpc_pollset_worker* g_active_poller;
 static grpc_pollset_worker g_global_root_worker;

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

@@ -30,8 +30,6 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/thd.h"
@@ -44,6 +42,8 @@
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 namespace {
@@ -106,14 +106,13 @@ NativeDNSResolver::LookupHostnameBlocking(absl::string_view name,
   // parse name, splitting it into host and port parts
   SplitHostPort(name, &host, &port);
   if (host.empty()) {
-    err = grpc_error_set_str(GRPC_ERROR_CREATE("unparseable host:port"),
-                             StatusStrProperty::kTargetAddress, name);
+    err =
+        GRPC_ERROR_CREATE(absl::StrCat("unparseable host:port \"", name, "\""));
     goto done;
   }
   if (port.empty()) {
     if (default_port.empty()) {
-      err = grpc_error_set_str(GRPC_ERROR_CREATE("no port in name"),
-                               StatusStrProperty::kTargetAddress, name);
+      err = GRPC_ERROR_CREATE(absl::StrCat("no port in name \"", name, "\""));
       goto done;
     }
     port = std::string(default_port);
@@ -139,14 +138,8 @@ NativeDNSResolver::LookupHostnameBlocking(absl::string_view name,
     }
   }
   if (s != 0) {
-    err = grpc_error_set_str(
-        grpc_error_set_str(
-            grpc_error_set_str(
-                grpc_error_set_int(GRPC_ERROR_CREATE(gai_strerror(s)),
-                                   StatusIntProperty::kErrorNo, s),
-                StatusStrProperty::kOsError, gai_strerror(s)),
-            StatusStrProperty::kSyscall, "getaddrinfo"),
-        StatusStrProperty::kTargetAddress, name);
+    err = absl::UnknownError(absl::StrCat(
+        "getaddrinfo(\"", name, "\"): ", gai_strerror(s), " (", s, ")"));
     goto done;
   }
   // Success path: fill in addrs

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

@@ -35,7 +35,6 @@
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/thd.h"
@@ -47,6 +46,7 @@
 #include "src/core/lib/iomgr/resolve_address_windows.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 namespace {

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

@@ -26,8 +26,8 @@
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/socket_factory_posix.h"
+#include "src/core/util/useful.h"
 
 void grpc_socket_factory_init(grpc_socket_factory* factory,
                               const grpc_socket_factory_vtable* vtable) {

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

@@ -24,8 +24,8 @@
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/util/useful.h"
 
 void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
                               const grpc_socket_mutator_vtable* vtable) {