Merge branch 'master' into regex_test_core_misc

BUILD

@@ -734,31 +734,6 @@ grpc_cc_library(
 grpc_cc_library(
     name = "gpr",
     srcs = [
-        "//src/core:lib/gpr/alloc.cc",
-        "//src/core:lib/gpr/android/log.cc",
-        "//src/core:lib/gpr/iphone/cpu.cc",
-        "//src/core:lib/gpr/linux/cpu.cc",
-        "//src/core:lib/gpr/linux/log.cc",
-        "//src/core:lib/gpr/log.cc",
-        "//src/core:lib/gpr/msys/tmpfile.cc",
-        "//src/core:lib/gpr/posix/cpu.cc",
-        "//src/core:lib/gpr/posix/log.cc",
-        "//src/core:lib/gpr/posix/string.cc",
-        "//src/core:lib/gpr/posix/sync.cc",
-        "//src/core:lib/gpr/posix/time.cc",
-        "//src/core:lib/gpr/posix/tmpfile.cc",
-        "//src/core:lib/gpr/string.cc",
-        "//src/core:lib/gpr/sync.cc",
-        "//src/core:lib/gpr/sync_abseil.cc",
-        "//src/core:lib/gpr/time.cc",
-        "//src/core:lib/gpr/time_precise.cc",
-        "//src/core:lib/gpr/windows/cpu.cc",
-        "//src/core:lib/gpr/windows/log.cc",
-        "//src/core:lib/gpr/windows/string.cc",
-        "//src/core:lib/gpr/windows/string_util.cc",
-        "//src/core:lib/gpr/windows/sync.cc",
-        "//src/core:lib/gpr/windows/time.cc",
-        "//src/core:lib/gpr/windows/tmpfile.cc",
         "//src/core:lib/gprpp/crash.cc",
         "//src/core:lib/gprpp/fork.cc",
         "//src/core:lib/gprpp/host_port.cc",
@@ -768,12 +743,33 @@ grpc_cc_library(
         "//src/core:lib/gprpp/time_util.cc",
         "//src/core:lib/gprpp/windows/stat.cc",
         "//src/core:lib/gprpp/windows/thd.cc",
+        "//src/core:util/alloc.cc",
+        "//src/core:util/android/log.cc",
+        "//src/core:util/iphone/cpu.cc",
+        "//src/core:util/linux/cpu.cc",
+        "//src/core:util/linux/log.cc",
+        "//src/core:util/log.cc",
+        "//src/core:util/msys/tmpfile.cc",
+        "//src/core:util/posix/cpu.cc",
+        "//src/core:util/posix/log.cc",
+        "//src/core:util/posix/string.cc",
+        "//src/core:util/posix/sync.cc",
+        "//src/core:util/posix/time.cc",
+        "//src/core:util/posix/tmpfile.cc",
+        "//src/core:util/string.cc",
+        "//src/core:util/sync.cc",
+        "//src/core:util/sync_abseil.cc",
+        "//src/core:util/time.cc",
+        "//src/core:util/time_precise.cc",
+        "//src/core:util/windows/cpu.cc",
+        "//src/core:util/windows/log.cc",
+        "//src/core:util/windows/string.cc",
+        "//src/core:util/windows/string_util.cc",
+        "//src/core:util/windows/sync.cc",
+        "//src/core:util/windows/time.cc",
+        "//src/core:util/windows/tmpfile.cc",
     ],
     hdrs = [
-        "//src/core:lib/gpr/alloc.h",
-        "//src/core:lib/gpr/string.h",
-        "//src/core:lib/gpr/time_precise.h",
-        "//src/core:lib/gpr/tmpfile.h",
         "//src/core:lib/gprpp/crash.h",
         "//src/core:lib/gprpp/fork.h",
         "//src/core:lib/gprpp/host_port.h",
@@ -783,6 +779,10 @@ grpc_cc_library(
         "//src/core:lib/gprpp/sync.h",
         "//src/core:lib/gprpp/thd.h",
         "//src/core:lib/gprpp/time_util.h",
+        "//src/core:util/alloc.h",
+        "//src/core:util/string.h",
+        "//src/core:util/time_precise.h",
+        "//src/core:util/tmpfile.h",
     ],
     external_deps = [
         "absl/base",
@@ -2083,6 +2083,7 @@ grpc_cc_library(
         "//src/core:call_final_info",
         "//src/core:call_finalization",
         "//src/core:call_spine",
+        "//src/core:cancel_callback",
         "//src/core:channel_args",
         "//src/core:channel_args_preconditioning",
         "//src/core:channel_fwd",
@@ -4905,11 +4906,11 @@ grpc_cc_library(
 grpc_cc_library(
     name = "subprocess",
     srcs = [
-        "//src/core:lib/gpr/subprocess_posix.cc",
+        "//src/core:util/subprocess_posix.cc",
-        "//src/core:lib/gpr/subprocess_windows.cc",
+        "//src/core:util/subprocess_windows.cc",
     ],
     hdrs = [
-        "//src/core:lib/gpr/subprocess.h",
+        "//src/core:util/subprocess.h",
     ],
     external_deps = [
         "absl/log:check",

CMakeLists.txt

@@ -1661,32 +1661,6 @@ add_library(gpr
   src/core/lib/config/config_vars_non_generated.cc
   src/core/lib/config/load_config.cc
   src/core/lib/event_engine/thread_local.cc
-  src/core/lib/gpr/alloc.cc
-  src/core/lib/gpr/android/log.cc
-  src/core/lib/gpr/atm.cc
-  src/core/lib/gpr/iphone/cpu.cc
-  src/core/lib/gpr/linux/cpu.cc
-  src/core/lib/gpr/linux/log.cc
-  src/core/lib/gpr/log.cc
-  src/core/lib/gpr/msys/tmpfile.cc
-  src/core/lib/gpr/posix/cpu.cc
-  src/core/lib/gpr/posix/log.cc
-  src/core/lib/gpr/posix/string.cc
-  src/core/lib/gpr/posix/sync.cc
-  src/core/lib/gpr/posix/time.cc
-  src/core/lib/gpr/posix/tmpfile.cc
-  src/core/lib/gpr/string.cc
-  src/core/lib/gpr/sync.cc
-  src/core/lib/gpr/sync_abseil.cc
-  src/core/lib/gpr/time.cc
-  src/core/lib/gpr/time_precise.cc
-  src/core/lib/gpr/windows/cpu.cc
-  src/core/lib/gpr/windows/log.cc
-  src/core/lib/gpr/windows/string.cc
-  src/core/lib/gpr/windows/string_util.cc
-  src/core/lib/gpr/windows/sync.cc
-  src/core/lib/gpr/windows/time.cc
-  src/core/lib/gpr/windows/tmpfile.cc
   src/core/lib/gprpp/crash.cc
   src/core/lib/gprpp/examine_stack.cc
   src/core/lib/gprpp/fork.cc
@@ -1702,6 +1676,32 @@ add_library(gpr
   src/core/lib/gprpp/windows/env.cc
   src/core/lib/gprpp/windows/stat.cc
   src/core/lib/gprpp/windows/thd.cc
+  src/core/util/alloc.cc
+  src/core/util/android/log.cc
+  src/core/util/atm.cc
+  src/core/util/iphone/cpu.cc
+  src/core/util/linux/cpu.cc
+  src/core/util/linux/log.cc
+  src/core/util/log.cc
+  src/core/util/msys/tmpfile.cc
+  src/core/util/posix/cpu.cc
+  src/core/util/posix/log.cc
+  src/core/util/posix/string.cc
+  src/core/util/posix/sync.cc
+  src/core/util/posix/time.cc
+  src/core/util/posix/tmpfile.cc
+  src/core/util/string.cc
+  src/core/util/sync.cc
+  src/core/util/sync_abseil.cc
+  src/core/util/time.cc
+  src/core/util/time_precise.cc
+  src/core/util/windows/cpu.cc
+  src/core/util/windows/log.cc
+  src/core/util/windows/string.cc
+  src/core/util/windows/string_util.cc
+  src/core/util/windows/sync.cc
+  src/core/util/windows/time.cc
+  src/core/util/windows/tmpfile.cc
 )
 
 target_compile_features(gpr PUBLIC cxx_std_14)
@@ -4737,8 +4737,8 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_library(grpc++_test_util
-  src/core/lib/gpr/subprocess_posix.cc
+  src/core/util/subprocess_posix.cc
-  src/core/lib/gpr/subprocess_windows.cc
+  src/core/util/subprocess_windows.cc
   test/core/end2end/data/client_certs.cc
   test/core/end2end/data/server1_cert.cc
   test/core/end2end/data/server1_key.cc
@@ -6089,8 +6089,8 @@ if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 
   add_executable(address_sorting_test_unsecure
-    src/core/lib/gpr/subprocess_posix.cc
+    src/core/util/subprocess_posix.cc
-    src/core/lib/gpr/subprocess_windows.cc
+    src/core/util/subprocess_windows.cc
     test/core/test_util/cmdline.cc
     test/core/test_util/fuzzer_util.cc
     test/core/test_util/grpc_profiler.cc
@@ -7624,8 +7624,8 @@ if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 
   add_executable(bad_ssl_alpn_test
-    src/core/lib/gpr/subprocess_posix.cc
+    src/core/util/subprocess_posix.cc
-    src/core/lib/gpr/subprocess_windows.cc
+    src/core/util/subprocess_windows.cc
     test/core/bad_ssl/bad_ssl_test.cc
     test/core/end2end/cq_verifier.cc
     test/core/test_util/cmdline.cc
@@ -7680,8 +7680,8 @@ if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 
   add_executable(bad_ssl_cert_test
-    src/core/lib/gpr/subprocess_posix.cc
+    src/core/util/subprocess_posix.cc
-    src/core/lib/gpr/subprocess_windows.cc
+    src/core/util/subprocess_windows.cc
     test/core/bad_ssl/bad_ssl_test.cc
     test/core/end2end/cq_verifier.cc
     test/core/test_util/cmdline.cc

MAINTAINERS.md

@@ -40,6 +40,7 @@ for general contribution guidelines.
 - [vishalpowar](https://github.com/vishalpowar), Google LLC
 - [wenbozhu](https://github.com/wenbozhu), Google LLC
 - [yashykt](https://github.com/yashykt), Google LLC
+- [yijiem](https://github.com/yijiem), Google LLC
 - [ZhouyihaiDing](https://github.com/ZhouyihaiDing), Google LLC
 <!-- go/keep-sorted end -->
 

Makefile

@@ -1141,32 +1141,6 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/work_queue/basic_work_queue.cc \
     src/core/lib/experiments/config.cc \
     src/core/lib/experiments/experiments.cc \
-    src/core/lib/gpr/alloc.cc \
-    src/core/lib/gpr/android/log.cc \
-    src/core/lib/gpr/atm.cc \
-    src/core/lib/gpr/iphone/cpu.cc \
-    src/core/lib/gpr/linux/cpu.cc \
-    src/core/lib/gpr/linux/log.cc \
-    src/core/lib/gpr/log.cc \
-    src/core/lib/gpr/msys/tmpfile.cc \
-    src/core/lib/gpr/posix/cpu.cc \
-    src/core/lib/gpr/posix/log.cc \
-    src/core/lib/gpr/posix/string.cc \
-    src/core/lib/gpr/posix/sync.cc \
-    src/core/lib/gpr/posix/time.cc \
-    src/core/lib/gpr/posix/tmpfile.cc \
-    src/core/lib/gpr/string.cc \
-    src/core/lib/gpr/sync.cc \
-    src/core/lib/gpr/sync_abseil.cc \
-    src/core/lib/gpr/time.cc \
-    src/core/lib/gpr/time_precise.cc \
-    src/core/lib/gpr/windows/cpu.cc \
-    src/core/lib/gpr/windows/log.cc \
-    src/core/lib/gpr/windows/string.cc \
-    src/core/lib/gpr/windows/string_util.cc \
-    src/core/lib/gpr/windows/sync.cc \
-    src/core/lib/gpr/windows/time.cc \
-    src/core/lib/gpr/windows/tmpfile.cc \
     src/core/lib/gprpp/crash.cc \
     src/core/lib/gprpp/examine_stack.cc \
     src/core/lib/gprpp/fork.cc \
@@ -1485,6 +1459,32 @@ LIBGRPC_SRC = \
     src/core/tsi/ssl_transport_security_utils.cc \
     src/core/tsi/transport_security.cc \
     src/core/tsi/transport_security_grpc.cc \
+    src/core/util/alloc.cc \
+    src/core/util/android/log.cc \
+    src/core/util/atm.cc \
+    src/core/util/iphone/cpu.cc \
+    src/core/util/linux/cpu.cc \
+    src/core/util/linux/log.cc \
+    src/core/util/log.cc \
+    src/core/util/msys/tmpfile.cc \
+    src/core/util/posix/cpu.cc \
+    src/core/util/posix/log.cc \
+    src/core/util/posix/string.cc \
+    src/core/util/posix/sync.cc \
+    src/core/util/posix/time.cc \
+    src/core/util/posix/tmpfile.cc \
+    src/core/util/string.cc \
+    src/core/util/sync.cc \
+    src/core/util/sync_abseil.cc \
+    src/core/util/time.cc \
+    src/core/util/time_precise.cc \
+    src/core/util/windows/cpu.cc \
+    src/core/util/windows/log.cc \
+    src/core/util/windows/string.cc \
+    src/core/util/windows/string_util.cc \
+    src/core/util/windows/sync.cc \
+    src/core/util/windows/time.cc \
+    src/core/util/windows/tmpfile.cc \
     src/core/xds/grpc/certificate_provider_store.cc \
     src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
     src/core/xds/grpc/xds_audit_logger_registry.cc \

Package.swift

@@ -1255,38 +1255,6 @@ let package = Package(
         "src/core/lib/experiments/config.h",
         "src/core/lib/experiments/experiments.cc",
         "src/core/lib/experiments/experiments.h",
-        "src/core/lib/gpr/alloc.cc",
-        "src/core/lib/gpr/alloc.h",
-        "src/core/lib/gpr/android/log.cc",
-        "src/core/lib/gpr/atm.cc",
-        "src/core/lib/gpr/iphone/cpu.cc",
-        "src/core/lib/gpr/linux/cpu.cc",
-        "src/core/lib/gpr/linux/log.cc",
-        "src/core/lib/gpr/log.cc",
-        "src/core/lib/gpr/msys/tmpfile.cc",
-        "src/core/lib/gpr/posix/cpu.cc",
-        "src/core/lib/gpr/posix/log.cc",
-        "src/core/lib/gpr/posix/string.cc",
-        "src/core/lib/gpr/posix/sync.cc",
-        "src/core/lib/gpr/posix/time.cc",
-        "src/core/lib/gpr/posix/tmpfile.cc",
-        "src/core/lib/gpr/spinlock.h",
-        "src/core/lib/gpr/string.cc",
-        "src/core/lib/gpr/string.h",
-        "src/core/lib/gpr/sync.cc",
-        "src/core/lib/gpr/sync_abseil.cc",
-        "src/core/lib/gpr/time.cc",
-        "src/core/lib/gpr/time_precise.cc",
-        "src/core/lib/gpr/time_precise.h",
-        "src/core/lib/gpr/tmpfile.h",
-        "src/core/lib/gpr/useful.h",
-        "src/core/lib/gpr/windows/cpu.cc",
-        "src/core/lib/gpr/windows/log.cc",
-        "src/core/lib/gpr/windows/string.cc",
-        "src/core/lib/gpr/windows/string_util.cc",
-        "src/core/lib/gpr/windows/sync.cc",
-        "src/core/lib/gpr/windows/time.cc",
-        "src/core/lib/gpr/windows/tmpfile.cc",
         "src/core/lib/gprpp/atomic_utils.h",
         "src/core/lib/gprpp/bitset.h",
         "src/core/lib/gprpp/chunked_vector.h",
@@ -1956,6 +1924,38 @@ let package = Package(
         "src/core/tsi/transport_security_grpc.cc",
         "src/core/tsi/transport_security_grpc.h",
         "src/core/tsi/transport_security_interface.h",
+        "src/core/util/alloc.cc",
+        "src/core/util/alloc.h",
+        "src/core/util/android/log.cc",
+        "src/core/util/atm.cc",
+        "src/core/util/iphone/cpu.cc",
+        "src/core/util/linux/cpu.cc",
+        "src/core/util/linux/log.cc",
+        "src/core/util/log.cc",
+        "src/core/util/msys/tmpfile.cc",
+        "src/core/util/posix/cpu.cc",
+        "src/core/util/posix/log.cc",
+        "src/core/util/posix/string.cc",
+        "src/core/util/posix/sync.cc",
+        "src/core/util/posix/time.cc",
+        "src/core/util/posix/tmpfile.cc",
+        "src/core/util/spinlock.h",
+        "src/core/util/string.cc",
+        "src/core/util/string.h",
+        "src/core/util/sync.cc",
+        "src/core/util/sync_abseil.cc",
+        "src/core/util/time.cc",
+        "src/core/util/time_precise.cc",
+        "src/core/util/time_precise.h",
+        "src/core/util/tmpfile.h",
+        "src/core/util/useful.h",
+        "src/core/util/windows/cpu.cc",
+        "src/core/util/windows/log.cc",
+        "src/core/util/windows/string.cc",
+        "src/core/util/windows/string_util.cc",
+        "src/core/util/windows/sync.cc",
+        "src/core/util/windows/time.cc",
+        "src/core/util/windows/tmpfile.cc",
         "src/core/xds/grpc/certificate_provider_store.cc",
         "src/core/xds/grpc/certificate_provider_store.h",
         "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc",

bazel/experiments.bzl

@@ -31,7 +31,6 @@ EXPERIMENT_ENABLES = {
     "monitoring_experiment": "monitoring_experiment",
     "multiping": "multiping",
     "peer_state_based_framing": "peer_state_based_framing",
-    "pending_queue_cap": "pending_queue_cap",
     "pick_first_new": "pick_first_new",
     "promise_based_client_call": "event_engine_client,event_engine_listener,promise_based_client_call",
     "chaotic_good": "chaotic_good,event_engine_client,event_engine_listener,promise_based_client_call",

build_autogenerated.yaml

@@ -55,11 +55,6 @@ libs:
   - src/core/lib/config/config_vars.h
   - src/core/lib/config/load_config.h
   - src/core/lib/event_engine/thread_local.h
-  - src/core/lib/gpr/alloc.h
-  - src/core/lib/gpr/string.h
-  - src/core/lib/gpr/time_precise.h
-  - src/core/lib/gpr/tmpfile.h
-  - src/core/lib/gpr/useful.h
   - src/core/lib/gprpp/construct_destruct.h
   - src/core/lib/gprpp/crash.h
   - src/core/lib/gprpp/debug_location.h
@@ -76,37 +71,16 @@ libs:
   - src/core/lib/gprpp/tchar.h
   - src/core/lib/gprpp/thd.h
   - src/core/lib/gprpp/time_util.h
+  - src/core/util/alloc.h
+  - src/core/util/string.h
+  - src/core/util/time_precise.h
+  - src/core/util/tmpfile.h
+  - src/core/util/useful.h
   src:
   - src/core/lib/config/config_vars.cc
   - src/core/lib/config/config_vars_non_generated.cc
   - src/core/lib/config/load_config.cc
   - src/core/lib/event_engine/thread_local.cc
-  - src/core/lib/gpr/alloc.cc
-  - src/core/lib/gpr/android/log.cc
-  - src/core/lib/gpr/atm.cc
-  - src/core/lib/gpr/iphone/cpu.cc
-  - src/core/lib/gpr/linux/cpu.cc
-  - src/core/lib/gpr/linux/log.cc
-  - src/core/lib/gpr/log.cc
-  - src/core/lib/gpr/msys/tmpfile.cc
-  - src/core/lib/gpr/posix/cpu.cc
-  - src/core/lib/gpr/posix/log.cc
-  - src/core/lib/gpr/posix/string.cc
-  - src/core/lib/gpr/posix/sync.cc
-  - src/core/lib/gpr/posix/time.cc
-  - src/core/lib/gpr/posix/tmpfile.cc
-  - src/core/lib/gpr/string.cc
-  - src/core/lib/gpr/sync.cc
-  - src/core/lib/gpr/sync_abseil.cc
-  - src/core/lib/gpr/time.cc
-  - src/core/lib/gpr/time_precise.cc
-  - src/core/lib/gpr/windows/cpu.cc
-  - src/core/lib/gpr/windows/log.cc
-  - src/core/lib/gpr/windows/string.cc
-  - src/core/lib/gpr/windows/string_util.cc
-  - src/core/lib/gpr/windows/sync.cc
-  - src/core/lib/gpr/windows/time.cc
-  - src/core/lib/gpr/windows/tmpfile.cc
   - src/core/lib/gprpp/crash.cc
   - src/core/lib/gprpp/examine_stack.cc
   - src/core/lib/gprpp/fork.cc
@@ -122,6 +96,32 @@ libs:
   - src/core/lib/gprpp/windows/env.cc
   - src/core/lib/gprpp/windows/stat.cc
   - src/core/lib/gprpp/windows/thd.cc
+  - src/core/util/alloc.cc
+  - src/core/util/android/log.cc
+  - src/core/util/atm.cc
+  - src/core/util/iphone/cpu.cc
+  - src/core/util/linux/cpu.cc
+  - src/core/util/linux/log.cc
+  - src/core/util/log.cc
+  - src/core/util/msys/tmpfile.cc
+  - src/core/util/posix/cpu.cc
+  - src/core/util/posix/log.cc
+  - src/core/util/posix/string.cc
+  - src/core/util/posix/sync.cc
+  - src/core/util/posix/time.cc
+  - src/core/util/posix/tmpfile.cc
+  - src/core/util/string.cc
+  - src/core/util/sync.cc
+  - src/core/util/sync_abseil.cc
+  - src/core/util/time.cc
+  - src/core/util/time_precise.cc
+  - src/core/util/windows/cpu.cc
+  - src/core/util/windows/log.cc
+  - src/core/util/windows/string.cc
+  - src/core/util/windows/string_util.cc
+  - src/core/util/windows/sync.cc
+  - src/core/util/windows/time.cc
+  - src/core/util/windows/tmpfile.cc
   deps:
   - absl/base:base
   - absl/base:core_headers
@@ -882,7 +882,6 @@ libs:
   - src/core/lib/event_engine/work_queue/work_queue.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -1214,6 +1213,7 @@ libs:
   - src/core/tsi/transport_security.h
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
+  - src/core/util/spinlock.h
   - src/core/xds/grpc/certificate_provider_store.h
   - src/core/xds/grpc/file_watcher_certificate_provider_factory.h
   - src/core/xds/grpc/upb_utils.h
@@ -2420,7 +2420,6 @@ libs:
   - src/core/lib/event_engine/work_queue/work_queue.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -2684,6 +2683,7 @@ libs:
   - src/core/tsi/transport_security.h
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -4015,7 +4015,7 @@ libs:
   language: c++
   public_headers: []
   headers:
-  - src/core/lib/gpr/subprocess.h
+  - src/core/util/subprocess.h
   - test/core/end2end/data/ssl_test_data.h
   - test/core/test_util/cmdline.h
   - test/core/test_util/evaluate_args_test_util.h
@@ -4034,8 +4034,8 @@ libs:
   - test/cpp/util/subprocess.h
   - test/cpp/util/test_credentials_provider.h
   src:
-  - src/core/lib/gpr/subprocess_posix.cc
+  - src/core/util/subprocess_posix.cc
-  - src/core/lib/gpr/subprocess_windows.cc
+  - src/core/util/subprocess_windows.cc
   - test/core/end2end/data/client_certs.cc
   - test/core/end2end/data/server1_cert.cc
   - test/core/end2end/data/server1_key.cc
@@ -4510,7 +4510,6 @@ libs:
   - src/core/lib/event_engine/work_queue/work_queue.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -4611,6 +4610,7 @@ libs:
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
   - src/core/lib/promise/arena_promise.h
+  - src/core/lib/promise/cancel_callback.h
   - src/core/lib/promise/context.h
   - src/core/lib/promise/detail/basic_seq.h
   - src/core/lib/promise/detail/join_state.h
@@ -4730,6 +4730,7 @@ libs:
   - src/core/tsi/transport_security.h
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -5281,7 +5282,7 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/subprocess.h
+  - src/core/util/subprocess.h
   - test/core/test_util/cmdline.h
   - test/core/test_util/evaluate_args_test_util.h
   - test/core/test_util/fuzzer_util.h
@@ -5297,8 +5298,8 @@ targets:
   - test/cpp/util/string_ref_helper.h
   - test/cpp/util/subprocess.h
   src:
-  - src/core/lib/gpr/subprocess_posix.cc
+  - src/core/util/subprocess_posix.cc
-  - src/core/lib/gpr/subprocess_windows.cc
+  - src/core/util/subprocess_windows.cc
   - test/core/test_util/cmdline.cc
   - test/core/test_util/fuzzer_util.cc
   - test/core/test_util/grpc_profiler.cc
@@ -5884,7 +5885,7 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/subprocess.h
+  - src/core/util/subprocess.h
   - test/core/end2end/cq_verifier.h
   - test/core/test_util/cmdline.h
   - test/core/test_util/evaluate_args_test_util.h
@@ -5897,8 +5898,8 @@ targets:
   - test/core/test_util/slice_splitter.h
   - test/core/test_util/tracer_util.h
   src:
-  - src/core/lib/gpr/subprocess_posix.cc
+  - src/core/util/subprocess_posix.cc
-  - src/core/lib/gpr/subprocess_windows.cc
+  - src/core/util/subprocess_windows.cc
   - test/core/bad_ssl/bad_ssl_test.cc
   - test/core/end2end/cq_verifier.cc
   - test/core/test_util/cmdline.cc
@@ -5922,7 +5923,7 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/subprocess.h
+  - src/core/util/subprocess.h
   - test/core/end2end/cq_verifier.h
   - test/core/test_util/cmdline.h
   - test/core/test_util/evaluate_args_test_util.h
@@ -5935,8 +5936,8 @@ targets:
   - test/core/test_util/slice_splitter.h
   - test/core/test_util/tracer_util.h
   src:
-  - src/core/lib/gpr/subprocess_posix.cc
+  - src/core/util/subprocess_posix.cc
-  - src/core/lib/gpr/subprocess_windows.cc
+  - src/core/util/subprocess_windows.cc
   - test/core/bad_ssl/bad_ssl_test.cc
   - test/core/end2end/cq_verifier.cc
   - test/core/test_util/cmdline.cc
@@ -6235,8 +6236,8 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/useful.h
   - src/core/lib/gprpp/bitset.h
+  - src/core/util/useful.h
   src:
   - test/core/gprpp/bitset_test.cc
   deps:
@@ -6372,7 +6373,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -6438,6 +6438,7 @@ targets:
   - src/core/lib/transport/simple_slice_based_metadata.h
   - src/core/lib/transport/status_conversion.h
   - src/core/lib/transport/timeout_encoding.h
+  - src/core/util/spinlock.h
   - test/core/promise/poll_matcher.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -7660,7 +7661,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -7704,6 +7704,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -9173,7 +9174,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/down_cast.h
@@ -9201,6 +9201,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -9784,7 +9785,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/cpp_impl_of.h
@@ -9829,6 +9829,7 @@ targets:
   - src/core/lib/slice/slice_string_helpers.h
   - src/core/lib/transport/bdp_estimator.h
   - src/core/lib/transport/http2_errors.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -9915,7 +9916,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/cpp_impl_of.h
@@ -9967,6 +9967,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - test/core/promise/test_wakeup_schedulers.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -11668,7 +11669,6 @@ targets:
   - src/core/lib/event_engine/work_queue/work_queue.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
@@ -11767,6 +11767,7 @@ targets:
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
   - src/core/lib/promise/arena_promise.h
+  - src/core/lib/promise/cancel_callback.h
   - src/core/lib/promise/context.h
   - src/core/lib/promise/detail/basic_seq.h
   - src/core/lib/promise/detail/join_state.h
@@ -11861,6 +11862,7 @@ targets:
   - src/core/service_config/service_config_call_data.h
   - src/core/service_config/service_config_parser.h
   - src/core/tsi/alts/handshaker/transport_security_common_api.h
+  - src/core/util/spinlock.h
   - test/core/promise/poll_matcher.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -12160,7 +12162,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/cpp_impl_of.h
@@ -12204,6 +12205,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - test/core/promise/test_context.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -12833,7 +12835,6 @@ targets:
   - src/core/lib/event_engine/event_engine_context.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/atomic_utils.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/cpp_impl_of.h
@@ -12885,6 +12886,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - test/core/promise/test_wakeup_schedulers.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -14074,7 +14076,6 @@ targets:
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/manual_constructor.h
   - src/core/lib/gprpp/status_helper.h
@@ -14091,6 +14092,7 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
@@ -19054,9 +19056,9 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/useful.h
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/table.h
+  - src/core/util/useful.h
   src:
   - test/core/gprpp/table_test.cc
   deps:
@@ -20225,8 +20227,8 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/useful.h
   - src/core/lib/gprpp/unique_type_name.h
+  - src/core/util/useful.h
   src:
   - test/core/gprpp/unique_type_name_test.cc
   deps:
@@ -20262,7 +20264,7 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/gpr/useful.h
+  - src/core/util/useful.h
   src:
   - test/core/gpr/useful_test.cc
   deps:

config.m4

@@ -516,32 +516,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/event_engine/work_queue/basic_work_queue.cc \
     src/core/lib/experiments/config.cc \
     src/core/lib/experiments/experiments.cc \
-    src/core/lib/gpr/alloc.cc \
-    src/core/lib/gpr/android/log.cc \
-    src/core/lib/gpr/atm.cc \
-    src/core/lib/gpr/iphone/cpu.cc \
-    src/core/lib/gpr/linux/cpu.cc \
-    src/core/lib/gpr/linux/log.cc \
-    src/core/lib/gpr/log.cc \
-    src/core/lib/gpr/msys/tmpfile.cc \
-    src/core/lib/gpr/posix/cpu.cc \
-    src/core/lib/gpr/posix/log.cc \
-    src/core/lib/gpr/posix/string.cc \
-    src/core/lib/gpr/posix/sync.cc \
-    src/core/lib/gpr/posix/time.cc \
-    src/core/lib/gpr/posix/tmpfile.cc \
-    src/core/lib/gpr/string.cc \
-    src/core/lib/gpr/sync.cc \
-    src/core/lib/gpr/sync_abseil.cc \
-    src/core/lib/gpr/time.cc \
-    src/core/lib/gpr/time_precise.cc \
-    src/core/lib/gpr/windows/cpu.cc \
-    src/core/lib/gpr/windows/log.cc \
-    src/core/lib/gpr/windows/string.cc \
-    src/core/lib/gpr/windows/string_util.cc \
-    src/core/lib/gpr/windows/sync.cc \
-    src/core/lib/gpr/windows/time.cc \
-    src/core/lib/gpr/windows/tmpfile.cc \
     src/core/lib/gprpp/crash.cc \
     src/core/lib/gprpp/examine_stack.cc \
     src/core/lib/gprpp/fork.cc \
@@ -860,6 +834,32 @@ if test "$PHP_GRPC" != "no"; then
     src/core/tsi/ssl_transport_security_utils.cc \
     src/core/tsi/transport_security.cc \
     src/core/tsi/transport_security_grpc.cc \
+    src/core/util/alloc.cc \
+    src/core/util/android/log.cc \
+    src/core/util/atm.cc \
+    src/core/util/iphone/cpu.cc \
+    src/core/util/linux/cpu.cc \
+    src/core/util/linux/log.cc \
+    src/core/util/log.cc \
+    src/core/util/msys/tmpfile.cc \
+    src/core/util/posix/cpu.cc \
+    src/core/util/posix/log.cc \
+    src/core/util/posix/string.cc \
+    src/core/util/posix/sync.cc \
+    src/core/util/posix/time.cc \
+    src/core/util/posix/tmpfile.cc \
+    src/core/util/string.cc \
+    src/core/util/sync.cc \
+    src/core/util/sync_abseil.cc \
+    src/core/util/time.cc \
+    src/core/util/time_precise.cc \
+    src/core/util/windows/cpu.cc \
+    src/core/util/windows/log.cc \
+    src/core/util/windows/string.cc \
+    src/core/util/windows/string_util.cc \
+    src/core/util/windows/sync.cc \
+    src/core/util/windows/time.cc \
+    src/core/util/windows/tmpfile.cc \
     src/core/xds/grpc/certificate_provider_store.cc \
     src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
     src/core/xds/grpc/xds_audit_logger_registry.cc \
@@ -1526,13 +1526,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/windows)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/work_queue)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/experiments)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/android)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/iphone)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/linux)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/msys)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/posix)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/windows)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix)
@@ -1606,6 +1599,13 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/zero_copy_frame_protector)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/key_logging)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/session_cache)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/android)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/iphone)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/linux)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/msys)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/posix)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/windows)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/grpc)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/xds_client)
   PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)

config.w32

@@ -481,32 +481,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\event_engine\\work_queue\\basic_work_queue.cc " +
     "src\\core\\lib\\experiments\\config.cc " +
     "src\\core\\lib\\experiments\\experiments.cc " +
-    "src\\core\\lib\\gpr\\alloc.cc " +
-    "src\\core\\lib\\gpr\\android\\log.cc " +
-    "src\\core\\lib\\gpr\\atm.cc " +
-    "src\\core\\lib\\gpr\\iphone\\cpu.cc " +
-    "src\\core\\lib\\gpr\\linux\\cpu.cc " +
-    "src\\core\\lib\\gpr\\linux\\log.cc " +
-    "src\\core\\lib\\gpr\\log.cc " +
-    "src\\core\\lib\\gpr\\msys\\tmpfile.cc " +
-    "src\\core\\lib\\gpr\\posix\\cpu.cc " +
-    "src\\core\\lib\\gpr\\posix\\log.cc " +
-    "src\\core\\lib\\gpr\\posix\\string.cc " +
-    "src\\core\\lib\\gpr\\posix\\sync.cc " +
-    "src\\core\\lib\\gpr\\posix\\time.cc " +
-    "src\\core\\lib\\gpr\\posix\\tmpfile.cc " +
-    "src\\core\\lib\\gpr\\string.cc " +
-    "src\\core\\lib\\gpr\\sync.cc " +
-    "src\\core\\lib\\gpr\\sync_abseil.cc " +
-    "src\\core\\lib\\gpr\\time.cc " +
-    "src\\core\\lib\\gpr\\time_precise.cc " +
-    "src\\core\\lib\\gpr\\windows\\cpu.cc " +
-    "src\\core\\lib\\gpr\\windows\\log.cc " +
-    "src\\core\\lib\\gpr\\windows\\string.cc " +
-    "src\\core\\lib\\gpr\\windows\\string_util.cc " +
-    "src\\core\\lib\\gpr\\windows\\sync.cc " +
-    "src\\core\\lib\\gpr\\windows\\time.cc " +
-    "src\\core\\lib\\gpr\\windows\\tmpfile.cc " +
     "src\\core\\lib\\gprpp\\crash.cc " +
     "src\\core\\lib\\gprpp\\examine_stack.cc " +
     "src\\core\\lib\\gprpp\\fork.cc " +
@@ -825,6 +799,32 @@ if (PHP_GRPC != "no") {
     "src\\core\\tsi\\ssl_transport_security_utils.cc " +
     "src\\core\\tsi\\transport_security.cc " +
     "src\\core\\tsi\\transport_security_grpc.cc " +
+    "src\\core\\util\\alloc.cc " +
+    "src\\core\\util\\android\\log.cc " +
+    "src\\core\\util\\atm.cc " +
+    "src\\core\\util\\iphone\\cpu.cc " +
+    "src\\core\\util\\linux\\cpu.cc " +
+    "src\\core\\util\\linux\\log.cc " +
+    "src\\core\\util\\log.cc " +
+    "src\\core\\util\\msys\\tmpfile.cc " +
+    "src\\core\\util\\posix\\cpu.cc " +
+    "src\\core\\util\\posix\\log.cc " +
+    "src\\core\\util\\posix\\string.cc " +
+    "src\\core\\util\\posix\\sync.cc " +
+    "src\\core\\util\\posix\\time.cc " +
+    "src\\core\\util\\posix\\tmpfile.cc " +
+    "src\\core\\util\\string.cc " +
+    "src\\core\\util\\sync.cc " +
+    "src\\core\\util\\sync_abseil.cc " +
+    "src\\core\\util\\time.cc " +
+    "src\\core\\util\\time_precise.cc " +
+    "src\\core\\util\\windows\\cpu.cc " +
+    "src\\core\\util\\windows\\log.cc " +
+    "src\\core\\util\\windows\\string.cc " +
+    "src\\core\\util\\windows\\string_util.cc " +
+    "src\\core\\util\\windows\\sync.cc " +
+    "src\\core\\util\\windows\\time.cc " +
+    "src\\core\\util\\windows\\tmpfile.cc " +
     "src\\core\\xds\\grpc\\certificate_provider_store.cc " +
     "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " +
     "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " +
@@ -1663,13 +1663,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\windows");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\work_queue");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\experiments");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\android");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\iphone");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\linux");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\msys");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\posix");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\windows");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix");
@@ -1746,6 +1739,13 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\key_logging");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\session_cache");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\android");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\iphone");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\linux");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\msys");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\posix");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\windows");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\grpc");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\xds_client");

gRPC-C++.podspec

@@ -964,12 +964,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/work_queue/work_queue.h',
                       'src/core/lib/experiments/config.h',
                       'src/core/lib/experiments/experiments.h',
-                      'src/core/lib/gpr/alloc.h',
-                      'src/core/lib/gpr/spinlock.h',
-                      'src/core/lib/gpr/string.h',
-                      'src/core/lib/gpr/time_precise.h',
-                      'src/core/lib/gpr/tmpfile.h',
-                      'src/core/lib/gpr/useful.h',
                       'src/core/lib/gprpp/atomic_utils.h',
                       'src/core/lib/gprpp/bitset.h',
                       'src/core/lib/gprpp/chunked_vector.h',
@@ -1317,6 +1311,12 @@ Pod::Spec.new do |s|
                       'src/core/tsi/transport_security.h',
                       'src/core/tsi/transport_security_grpc.h',
                       'src/core/tsi/transport_security_interface.h',
+                      'src/core/util/alloc.h',
+                      'src/core/util/spinlock.h',
+                      'src/core/util/string.h',
+                      'src/core/util/time_precise.h',
+                      'src/core/util/tmpfile.h',
+                      'src/core/util/useful.h',
                       'src/core/xds/grpc/certificate_provider_store.h',
                       'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
                       'src/core/xds/grpc/upb_utils.h',
@@ -2235,12 +2235,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/work_queue/work_queue.h',
                               'src/core/lib/experiments/config.h',
                               'src/core/lib/experiments/experiments.h',
-                              'src/core/lib/gpr/alloc.h',
-                              'src/core/lib/gpr/spinlock.h',
-                              'src/core/lib/gpr/string.h',
-                              'src/core/lib/gpr/time_precise.h',
-                              'src/core/lib/gpr/tmpfile.h',
-                              'src/core/lib/gpr/useful.h',
                               'src/core/lib/gprpp/atomic_utils.h',
                               'src/core/lib/gprpp/bitset.h',
                               'src/core/lib/gprpp/chunked_vector.h',
@@ -2588,6 +2582,12 @@ Pod::Spec.new do |s|
                               'src/core/tsi/transport_security.h',
                               'src/core/tsi/transport_security_grpc.h',
                               'src/core/tsi/transport_security_interface.h',
+                              'src/core/util/alloc.h',
+                              'src/core/util/spinlock.h',
+                              'src/core/util/string.h',
+                              'src/core/util/time_precise.h',
+                              'src/core/util/tmpfile.h',
+                              'src/core/util/useful.h',
                               'src/core/xds/grpc/certificate_provider_store.h',
                               'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
                               'src/core/xds/grpc/upb_utils.h',

gRPC-Core.podspec

@@ -82,7 +82,7 @@ Pod::Spec.new do |s|
         ' "$(PODS_TARGET_SRCROOT)/third_party/utf8_range"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/xxhash"',
     # If we don't set these two settings, `include/grpc/support/time.h` and
-    # `src/core/lib/gpr/string.h` shadow the system `<time.h>` and `<string.h>`, breaking the
+    # `src/core/util/string.h` shadow the system `<time.h>` and `<string.h>`, breaking the
     # build.
     'USE_HEADERMAP' => 'NO',
     'ALWAYS_SEARCH_USER_PATHS' => 'NO',
@@ -1374,38 +1374,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/experiments/config.h',
                       'src/core/lib/experiments/experiments.cc',
                       'src/core/lib/experiments/experiments.h',
-                      'src/core/lib/gpr/alloc.cc',
-                      'src/core/lib/gpr/alloc.h',
-                      'src/core/lib/gpr/android/log.cc',
-                      'src/core/lib/gpr/atm.cc',
-                      'src/core/lib/gpr/iphone/cpu.cc',
-                      'src/core/lib/gpr/linux/cpu.cc',
-                      'src/core/lib/gpr/linux/log.cc',
-                      'src/core/lib/gpr/log.cc',
-                      'src/core/lib/gpr/msys/tmpfile.cc',
-                      'src/core/lib/gpr/posix/cpu.cc',
-                      'src/core/lib/gpr/posix/log.cc',
-                      'src/core/lib/gpr/posix/string.cc',
-                      'src/core/lib/gpr/posix/sync.cc',
-                      'src/core/lib/gpr/posix/time.cc',
-                      'src/core/lib/gpr/posix/tmpfile.cc',
-                      'src/core/lib/gpr/spinlock.h',
-                      'src/core/lib/gpr/string.cc',
-                      'src/core/lib/gpr/string.h',
-                      'src/core/lib/gpr/sync.cc',
-                      'src/core/lib/gpr/sync_abseil.cc',
-                      'src/core/lib/gpr/time.cc',
-                      'src/core/lib/gpr/time_precise.cc',
-                      'src/core/lib/gpr/time_precise.h',
-                      'src/core/lib/gpr/tmpfile.h',
-                      'src/core/lib/gpr/useful.h',
-                      'src/core/lib/gpr/windows/cpu.cc',
-                      'src/core/lib/gpr/windows/log.cc',
-                      'src/core/lib/gpr/windows/string.cc',
-                      'src/core/lib/gpr/windows/string_util.cc',
-                      'src/core/lib/gpr/windows/sync.cc',
-                      'src/core/lib/gpr/windows/time.cc',
-                      'src/core/lib/gpr/windows/tmpfile.cc',
                       'src/core/lib/gprpp/atomic_utils.h',
                       'src/core/lib/gprpp/bitset.h',
                       'src/core/lib/gprpp/chunked_vector.h',
@@ -2071,6 +2039,38 @@ Pod::Spec.new do |s|
                       'src/core/tsi/transport_security_grpc.cc',
                       'src/core/tsi/transport_security_grpc.h',
                       'src/core/tsi/transport_security_interface.h',
+                      'src/core/util/alloc.cc',
+                      'src/core/util/alloc.h',
+                      'src/core/util/android/log.cc',
+                      'src/core/util/atm.cc',
+                      'src/core/util/iphone/cpu.cc',
+                      'src/core/util/linux/cpu.cc',
+                      'src/core/util/linux/log.cc',
+                      'src/core/util/log.cc',
+                      'src/core/util/msys/tmpfile.cc',
+                      'src/core/util/posix/cpu.cc',
+                      'src/core/util/posix/log.cc',
+                      'src/core/util/posix/string.cc',
+                      'src/core/util/posix/sync.cc',
+                      'src/core/util/posix/time.cc',
+                      'src/core/util/posix/tmpfile.cc',
+                      'src/core/util/spinlock.h',
+                      'src/core/util/string.cc',
+                      'src/core/util/string.h',
+                      'src/core/util/sync.cc',
+                      'src/core/util/sync_abseil.cc',
+                      'src/core/util/time.cc',
+                      'src/core/util/time_precise.cc',
+                      'src/core/util/time_precise.h',
+                      'src/core/util/tmpfile.h',
+                      'src/core/util/useful.h',
+                      'src/core/util/windows/cpu.cc',
+                      'src/core/util/windows/log.cc',
+                      'src/core/util/windows/string.cc',
+                      'src/core/util/windows/string_util.cc',
+                      'src/core/util/windows/sync.cc',
+                      'src/core/util/windows/time.cc',
+                      'src/core/util/windows/tmpfile.cc',
                       'src/core/xds/grpc/certificate_provider_store.cc',
                       'src/core/xds/grpc/certificate_provider_store.h',
                       'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc',
@@ -3015,12 +3015,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/work_queue/work_queue.h',
                               'src/core/lib/experiments/config.h',
                               'src/core/lib/experiments/experiments.h',
-                              'src/core/lib/gpr/alloc.h',
-                              'src/core/lib/gpr/spinlock.h',
-                              'src/core/lib/gpr/string.h',
-                              'src/core/lib/gpr/time_precise.h',
-                              'src/core/lib/gpr/tmpfile.h',
-                              'src/core/lib/gpr/useful.h',
                               'src/core/lib/gprpp/atomic_utils.h',
                               'src/core/lib/gprpp/bitset.h',
                               'src/core/lib/gprpp/chunked_vector.h',
@@ -3368,6 +3362,12 @@ Pod::Spec.new do |s|
                               'src/core/tsi/transport_security.h',
                               'src/core/tsi/transport_security_grpc.h',
                               'src/core/tsi/transport_security_interface.h',
+                              'src/core/util/alloc.h',
+                              'src/core/util/spinlock.h',
+                              'src/core/util/string.h',
+                              'src/core/util/time_precise.h',
+                              'src/core/util/tmpfile.h',
+                              'src/core/util/useful.h',
                               'src/core/xds/grpc/certificate_provider_store.h',
                               'src/core/xds/grpc/file_watcher_certificate_provider_factory.h',
                               'src/core/xds/grpc/upb_utils.h',

grpc.gemspec

@@ -1261,38 +1261,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/experiments/config.h )
   s.files += %w( src/core/lib/experiments/experiments.cc )
   s.files += %w( src/core/lib/experiments/experiments.h )
-  s.files += %w( src/core/lib/gpr/alloc.cc )
-  s.files += %w( src/core/lib/gpr/alloc.h )
-  s.files += %w( src/core/lib/gpr/android/log.cc )
-  s.files += %w( src/core/lib/gpr/atm.cc )
-  s.files += %w( src/core/lib/gpr/iphone/cpu.cc )
-  s.files += %w( src/core/lib/gpr/linux/cpu.cc )
-  s.files += %w( src/core/lib/gpr/linux/log.cc )
-  s.files += %w( src/core/lib/gpr/log.cc )
-  s.files += %w( src/core/lib/gpr/msys/tmpfile.cc )
-  s.files += %w( src/core/lib/gpr/posix/cpu.cc )
-  s.files += %w( src/core/lib/gpr/posix/log.cc )
-  s.files += %w( src/core/lib/gpr/posix/string.cc )
-  s.files += %w( src/core/lib/gpr/posix/sync.cc )
-  s.files += %w( src/core/lib/gpr/posix/time.cc )
-  s.files += %w( src/core/lib/gpr/posix/tmpfile.cc )
-  s.files += %w( src/core/lib/gpr/spinlock.h )
-  s.files += %w( src/core/lib/gpr/string.cc )
-  s.files += %w( src/core/lib/gpr/string.h )
-  s.files += %w( src/core/lib/gpr/sync.cc )
-  s.files += %w( src/core/lib/gpr/sync_abseil.cc )
-  s.files += %w( src/core/lib/gpr/time.cc )
-  s.files += %w( src/core/lib/gpr/time_precise.cc )
-  s.files += %w( src/core/lib/gpr/time_precise.h )
-  s.files += %w( src/core/lib/gpr/tmpfile.h )
-  s.files += %w( src/core/lib/gpr/useful.h )
-  s.files += %w( src/core/lib/gpr/windows/cpu.cc )
-  s.files += %w( src/core/lib/gpr/windows/log.cc )
-  s.files += %w( src/core/lib/gpr/windows/string.cc )
-  s.files += %w( src/core/lib/gpr/windows/string_util.cc )
-  s.files += %w( src/core/lib/gpr/windows/sync.cc )
-  s.files += %w( src/core/lib/gpr/windows/time.cc )
-  s.files += %w( src/core/lib/gpr/windows/tmpfile.cc )
   s.files += %w( src/core/lib/gprpp/atomic_utils.h )
   s.files += %w( src/core/lib/gprpp/bitset.h )
   s.files += %w( src/core/lib/gprpp/chunked_vector.h )
@@ -1958,6 +1926,38 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/tsi/transport_security_grpc.cc )
   s.files += %w( src/core/tsi/transport_security_grpc.h )
   s.files += %w( src/core/tsi/transport_security_interface.h )
+  s.files += %w( src/core/util/alloc.cc )
+  s.files += %w( src/core/util/alloc.h )
+  s.files += %w( src/core/util/android/log.cc )
+  s.files += %w( src/core/util/atm.cc )
+  s.files += %w( src/core/util/iphone/cpu.cc )
+  s.files += %w( src/core/util/linux/cpu.cc )
+  s.files += %w( src/core/util/linux/log.cc )
+  s.files += %w( src/core/util/log.cc )
+  s.files += %w( src/core/util/msys/tmpfile.cc )
+  s.files += %w( src/core/util/posix/cpu.cc )
+  s.files += %w( src/core/util/posix/log.cc )
+  s.files += %w( src/core/util/posix/string.cc )
+  s.files += %w( src/core/util/posix/sync.cc )
+  s.files += %w( src/core/util/posix/time.cc )
+  s.files += %w( src/core/util/posix/tmpfile.cc )
+  s.files += %w( src/core/util/spinlock.h )
+  s.files += %w( src/core/util/string.cc )
+  s.files += %w( src/core/util/string.h )
+  s.files += %w( src/core/util/sync.cc )
+  s.files += %w( src/core/util/sync_abseil.cc )
+  s.files += %w( src/core/util/time.cc )
+  s.files += %w( src/core/util/time_precise.cc )
+  s.files += %w( src/core/util/time_precise.h )
+  s.files += %w( src/core/util/tmpfile.h )
+  s.files += %w( src/core/util/useful.h )
+  s.files += %w( src/core/util/windows/cpu.cc )
+  s.files += %w( src/core/util/windows/log.cc )
+  s.files += %w( src/core/util/windows/string.cc )
+  s.files += %w( src/core/util/windows/string_util.cc )
+  s.files += %w( src/core/util/windows/sync.cc )
+  s.files += %w( src/core/util/windows/time.cc )
+  s.files += %w( src/core/util/windows/tmpfile.cc )
   s.files += %w( src/core/xds/grpc/certificate_provider_store.cc )
   s.files += %w( src/core/xds/grpc/certificate_provider_store.h )
   s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc )

package.xml

@@ -1243,38 +1243,6 @@
     <file baseinstalldir="/" name="src/core/lib/experiments/config.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/experiments/experiments.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/experiments/experiments.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/alloc.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/alloc.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/android/log.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/atm.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/iphone/cpu.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/linux/cpu.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/linux/log.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/log.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/msys/tmpfile.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/cpu.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/log.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/string.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/sync.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/time.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/posix/tmpfile.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/spinlock.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/string.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/string.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/sync.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/sync_abseil.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/time.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/time_precise.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/time_precise.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/tmpfile.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/useful.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/cpu.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/log.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/string.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/string_util.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/sync.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/time.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/gpr/windows/tmpfile.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/atomic_utils.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/bitset.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/chunked_vector.h" role="src" />
@@ -1940,6 +1908,38 @@
     <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.cc" role="src" />
     <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.h" role="src" />
     <file baseinstalldir="/" name="src/core/tsi/transport_security_interface.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/alloc.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/alloc.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/android/log.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/atm.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/iphone/cpu.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/linux/cpu.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/linux/log.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/log.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/msys/tmpfile.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/cpu.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/log.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/string.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/sync.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/time.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/posix/tmpfile.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/spinlock.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/string.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/string.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/sync.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/sync_abseil.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/time.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/time_precise.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/time_precise.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/tmpfile.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/useful.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/cpu.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/log.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/string.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/string_util.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/sync.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/time.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/windows/tmpfile.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/grpc/certificate_provider_store.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/grpc/certificate_provider_store.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/grpc/file_watcher_certificate_provider_factory.cc" role="src" />

src/core/BUILD

@@ -238,7 +238,7 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "useful",
-    hdrs = ["lib/gpr/useful.h"],
+    hdrs = ["util/useful.h"],
     external_deps = [
         "absl/strings",
         "absl/types:variant",
@@ -263,7 +263,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "gpr_atm",
     srcs = [
-        "lib/gpr/atm.cc",
+        "util/atm.cc",
     ],
     language = "c++",
     public_hdrs = [
@@ -299,7 +299,7 @@ grpc_cc_library(
     name = "gpr_spinlock",
     srcs = [],
     hdrs = [
-        "lib/gpr/spinlock.h",
+        "util/spinlock.h",
     ],
     language = "c++",
     deps = [

src/core/channelz/channel_trace.cc

@@ -28,10 +28,10 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/channelz/channelz.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 namespace channelz {

src/core/channelz/channelz.cc

@@ -37,12 +37,12 @@
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 namespace channelz {

src/core/channelz/channelz.h

@@ -38,13 +38,13 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/channelz/channel_trace.h"
-#include "src/core/lib/gpr/time_precise.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/per_cpu.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/util/time_precise.h"
+#include "src/core/util/useful.h"
 
 // Channel arg key for channelz node.
 #define GRPC_ARG_CHANNELZ_CHANNEL_NODE "grpc.internal.channelz_channel_node"

src/core/client_channel/client_channel_filter.cc

@@ -68,7 +68,6 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
@@ -104,6 +103,7 @@
 #include "src/core/resolver/resolver_registry.h"
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/service_config/service_config_impl.h"
+#include "src/core/util/useful.h"
 
 //
 // Client channel filter

src/core/client_channel/client_channel_filter.h

@@ -48,7 +48,6 @@
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -71,6 +70,7 @@
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/service_config/service_config.h"
+#include "src/core/util/time_precise.h"
 
 //
 // Client channel filter

src/core/client_channel/config_selector.cc

@@ -19,7 +19,7 @@
 #include "src/core/client_channel/config_selector.h"
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/client_channel/config_selector.h

@@ -33,13 +33,13 @@
 
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/service_config/service_config.h"
+#include "src/core/util/useful.h"
 
 // Channel arg key for ConfigSelector.
 #define GRPC_ARG_CONFIG_SELECTOR "grpc.internal.config_selector"

src/core/client_channel/dynamic_filters.cc

@@ -32,10 +32,10 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/lame_client.h"
+#include "src/core/util/alloc.h"
 
 // Conversion between call and call stack.
 #define CALL_TO_CALL_STACK(call)                                     \

src/core/client_channel/dynamic_filters.h

@@ -28,7 +28,6 @@
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -39,6 +38,7 @@
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/time_precise.h"
 
 namespace grpc_core {
 

src/core/client_channel/retry_filter.h

@@ -40,10 +40,10 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/useful.h"
 
 extern grpc_core::TraceFlag grpc_retry_trace;
 

src/core/client_channel/retry_filter_legacy_call_data.cc

@@ -35,7 +35,6 @@
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
@@ -54,6 +53,7 @@
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/client_channel/subchannel.cc

@@ -51,8 +51,6 @@
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/alloc.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/status_helper.h"
@@ -68,6 +66,8 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/alloc.h"
+#include "src/core/util/useful.h"
 
 // Backoff parameters.
 #define GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS 1

src/core/client_channel/subchannel.h

@@ -37,7 +37,6 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/context.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/orphanable.h"
@@ -59,6 +58,7 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/time_precise.h"
 
 namespace grpc_core {
 

src/core/client_channel/subchannel_pool_interface.h

@@ -27,10 +27,10 @@
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/client_channel/subchannel_stream_client.cc

@@ -29,7 +29,6 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -37,6 +36,7 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/time_precise.h"
 
 #define SUBCHANNEL_STREAM_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define SUBCHANNEL_STREAM_RECONNECT_BACKOFF_MULTIPLIER 1.6

src/core/ext/filters/backend_metrics/backend_metric_filter.cc

@@ -52,6 +52,7 @@ TraceFlag grpc_backend_metric_filter_trace(false, "backend_metric_filter");
 const NoInterceptor BackendMetricFilter::Call::OnClientInitialMetadata;
 const NoInterceptor BackendMetricFilter::Call::OnServerInitialMetadata;
 const NoInterceptor BackendMetricFilter::Call::OnClientToServerMessage;
+const NoInterceptor BackendMetricFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor BackendMetricFilter::Call::OnServerToClientMessage;
 const NoInterceptor BackendMetricFilter::Call::OnFinalize;
 

src/core/ext/filters/backend_metrics/backend_metric_filter.h

@@ -44,6 +44,7 @@ class BackendMetricFilter : public ImplementChannelFilter<BackendMetricFilter> {
     static const NoInterceptor OnServerInitialMetadata;
     void OnServerTrailingMetadata(ServerMetadata& md);
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/fault_injection/fault_injection_filter.cc

@@ -58,6 +58,7 @@ TraceFlag grpc_fault_injection_filter_trace(false, "fault_injection_filter");
 const NoInterceptor FaultInjectionFilter::Call::OnServerInitialMetadata;
 const NoInterceptor FaultInjectionFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor FaultInjectionFilter::Call::OnClientToServerMessage;
+const NoInterceptor FaultInjectionFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor FaultInjectionFilter::Call::OnServerToClientMessage;
 const NoInterceptor FaultInjectionFilter::Call::OnFinalize;
 

src/core/ext/filters/fault_injection/fault_injection_filter.h

@@ -58,6 +58,7 @@ class FaultInjectionFilter
     static const NoInterceptor OnServerInitialMetadata;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/http/client/http_client_filter.cc

@@ -54,6 +54,7 @@ namespace grpc_core {
 
 const NoInterceptor HttpClientFilter::Call::OnServerToClientMessage;
 const NoInterceptor HttpClientFilter::Call::OnClientToServerMessage;
+const NoInterceptor HttpClientFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor HttpClientFilter::Call::OnFinalize;
 
 const grpc_channel_filter HttpClientFilter::kFilter =

src/core/ext/filters/http/client/http_client_filter.h

@@ -47,6 +47,7 @@ class HttpClientFilter : public ImplementChannelFilter<HttpClientFilter> {
     absl::Status OnServerInitialMetadata(ServerMetadata& md);
     absl::Status OnServerTrailingMetadata(ServerMetadata& md);
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/http/client_authority_filter.cc

@@ -40,6 +40,7 @@ namespace grpc_core {
 const NoInterceptor ClientAuthorityFilter::Call::OnServerInitialMetadata;
 const NoInterceptor ClientAuthorityFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor ClientAuthorityFilter::Call::OnClientToServerMessage;
+const NoInterceptor ClientAuthorityFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ClientAuthorityFilter::Call::OnServerToClientMessage;
 const NoInterceptor ClientAuthorityFilter::Call::OnFinalize;
 

src/core/ext/filters/http/client_authority_filter.h

@@ -52,6 +52,7 @@ class ClientAuthorityFilter final
     static const NoInterceptor OnServerInitialMetadata;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/http/message_compress/compression_filter.cc

@@ -57,8 +57,10 @@
 
 namespace grpc_core {
 
+const NoInterceptor ServerCompressionFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ServerCompressionFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor ServerCompressionFilter::Call::OnFinalize;
+const NoInterceptor ClientCompressionFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ClientCompressionFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor ClientCompressionFilter::Call::OnFinalize;
 

src/core/ext/filters/http/message_compress/compression_filter.h

@@ -129,6 +129,7 @@ class ClientCompressionFilter final
     absl::StatusOr<MessageHandle> OnServerToClientMessage(
         MessageHandle message, ClientCompressionFilter* filter);
 
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnFinalize;
 
@@ -165,6 +166,7 @@ class ServerCompressionFilter final
     MessageHandle OnServerToClientMessage(MessageHandle message,
                                           ServerCompressionFilter* filter);
 
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnFinalize;
 

src/core/ext/filters/http/server/http_server_filter.cc

@@ -50,6 +50,7 @@
 namespace grpc_core {
 
 const NoInterceptor HttpServerFilter::Call::OnClientToServerMessage;
+const NoInterceptor HttpServerFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor HttpServerFilter::Call::OnServerToClientMessage;
 const NoInterceptor HttpServerFilter::Call::OnFinalize;
 

src/core/ext/filters/http/server/http_server_filter.h

@@ -50,6 +50,7 @@ class HttpServerFilter : public ImplementChannelFilter<HttpServerFilter> {
     void OnServerInitialMetadata(ServerMetadata& md);
     void OnServerTrailingMetadata(ServerMetadata& md);
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/load_reporting/server_load_reporting_filter.cc

@@ -74,6 +74,7 @@ constexpr char kEmptyAddressLengthString[] = "00";
 
 const NoInterceptor ServerLoadReportingFilter::Call::OnServerInitialMetadata;
 const NoInterceptor ServerLoadReportingFilter::Call::OnClientToServerMessage;
+const NoInterceptor ServerLoadReportingFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ServerLoadReportingFilter::Call::OnServerToClientMessage;
 
 absl::StatusOr<std::unique_ptr<ServerLoadReportingFilter>>

src/core/ext/filters/load_reporting/server_load_reporting_filter.h

@@ -54,6 +54,7 @@ class ServerLoadReportingFilter
     void OnServerTrailingMetadata(ServerMetadata& md,
                                   ServerLoadReportingFilter* filter);
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     void OnFinalize(const grpc_call_final_info* final_info,
                     ServerLoadReportingFilter* filter);

src/core/ext/filters/logging/logging_filter.cc

@@ -73,6 +73,9 @@
 
 namespace grpc_core {
 
+const NoInterceptor ClientLoggingFilter::Call::OnFinalize;
+const NoInterceptor ServerLoggingFilter::Call::OnFinalize;
+
 namespace {
 
 LoggingSink* g_logging_sink = nullptr;
@@ -195,152 +198,148 @@ void EncodeMessageToPayload(const SliceBuffer* message, uint32_t log_len,
   }
 }
 
-class CallData {
+}  // namespace
- public:
+
-  CallData(bool is_client, const CallArgs& call_args,
+namespace logging_filter_detail {
-           const std::string& authority)
+
-      : call_id_(GetCallId()) {
+CallData::CallData(bool is_client,
-    absl::string_view path;
+                   const ClientMetadata& client_initial_metadata,
-    if (auto* value = call_args.client_initial_metadata->get_pointer(
+                   const std::string& authority)
-            HttpPathMetadata())) {
+    : call_id_(GetCallId()) {
-      path = value->as_string_view();
+  absl::string_view path;
-    }
+  if (auto* value = client_initial_metadata.get_pointer(HttpPathMetadata())) {
-    std::vector<std::string> parts =
+    path = value->as_string_view();
-        absl::StrSplit(path, '/', absl::SkipEmpty());
+  }
-    if (parts.size() == 2) {
+  std::vector<std::string> parts = absl::StrSplit(path, '/', absl::SkipEmpty());
-      service_name_ = std::move(parts[0]);
+  if (parts.size() == 2) {
-      method_name_ = std::move(parts[1]);
+    service_name_ = std::move(parts[0]);
+    method_name_ = std::move(parts[1]);
+  }
+  config_ = g_logging_sink->FindMatch(is_client, service_name_, method_name_);
+  if (config_.ShouldLog()) {
+    if (auto* value =
+            client_initial_metadata.get_pointer(HttpAuthorityMetadata())) {
+      authority_ = std::string(value->as_string_view());
+    } else {
+      authority_ = authority;
     }
-    config_ = g_logging_sink->FindMatch(is_client, service_name_, method_name_);
+  }
-    if (config_.ShouldLog()) {
+}
-      if (auto* value = call_args.client_initial_metadata->get_pointer(
+
-              HttpAuthorityMetadata())) {
+void CallData::LogClientHeader(bool is_client,
-        authority_ = std::string(value->as_string_view());
+                               CallTracerAnnotationInterface* tracer,
-      } else {
+                               const ClientMetadata& metadata) {
-        authority_ = authority;
+  LoggingSink::Entry entry;
-      }
+  if (!is_client) {
+    if (auto* value = metadata.get_pointer(PeerString())) {
+      peer_ = PeerStringToAddress(*value);
     }
   }
+  SetCommonEntryFields(&entry, is_client, tracer,
+                       LoggingSink::Entry::EventType::kClientHeader);
+  MetadataEncoder encoder(&entry.payload, nullptr,
+                          config_.max_metadata_bytes());
+  metadata.Encode(&encoder);
+  entry.payload_truncated = encoder.truncated();
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  bool ShouldLog() { return config_.ShouldLog(); }
+void CallData::LogClientHalfClose(bool is_client,
+                                  CallTracerAnnotationInterface* tracer) {
+  LoggingSink::Entry entry;
+  SetCommonEntryFields(&entry, is_client, tracer,
+                       LoggingSink::Entry::EventType::kClientHalfClose);
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  void LogClientHeader(bool is_client, CallTracerAnnotationInterface* tracer,
+void CallData::LogServerHeader(bool is_client,
-                       const ClientMetadataHandle& metadata) {
+                               CallTracerAnnotationInterface* tracer,
-    LoggingSink::Entry entry;
+                               const ServerMetadata* metadata) {
-    if (!is_client) {
+  LoggingSink::Entry entry;
+  if (metadata != nullptr) {
+    entry.is_trailer_only = metadata->get(GrpcTrailersOnly()).value_or(false);
+    if (is_client) {
       if (auto* value = metadata->get_pointer(PeerString())) {
         peer_ = PeerStringToAddress(*value);
       }
     }
-    SetCommonEntryFields(&entry, is_client, tracer,
+  }
-                         LoggingSink::Entry::EventType::kClientHeader);
+  SetCommonEntryFields(&entry, is_client, tracer,
+                       LoggingSink::Entry::EventType::kServerHeader);
+  if (metadata != nullptr) {
     MetadataEncoder encoder(&entry.payload, nullptr,
                             config_.max_metadata_bytes());
     metadata->Encode(&encoder);
     entry.payload_truncated = encoder.truncated();
-    g_logging_sink->LogEntry(std::move(entry));
-  }
-
-  void LogClientHalfClose(bool is_client,
-                          CallTracerAnnotationInterface* tracer) {
-    LoggingSink::Entry entry;
-    SetCommonEntryFields(&entry, is_client, tracer,
-                         LoggingSink::Entry::EventType::kClientHalfClose);
-    g_logging_sink->LogEntry(std::move(entry));
-  }
-
-  void LogServerHeader(bool is_client, CallTracerAnnotationInterface* tracer,
-                       const ServerMetadata* metadata) {
-    LoggingSink::Entry entry;
-    if (metadata != nullptr) {
-      entry.is_trailer_only = metadata->get(GrpcTrailersOnly()).value_or(false);
-      if (is_client) {
-        if (auto* value = metadata->get_pointer(PeerString())) {
-          peer_ = PeerStringToAddress(*value);
-        }
-      }
-    }
-    SetCommonEntryFields(&entry, is_client, tracer,
-                         LoggingSink::Entry::EventType::kServerHeader);
-    if (metadata != nullptr) {
-      MetadataEncoder encoder(&entry.payload, nullptr,
-                              config_.max_metadata_bytes());
-      metadata->Encode(&encoder);
-      entry.payload_truncated = encoder.truncated();
-    }
-    g_logging_sink->LogEntry(std::move(entry));
   }
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  void LogServerTrailer(bool is_client, CallTracerAnnotationInterface* tracer,
+void CallData::LogServerTrailer(bool is_client,
-                        const ServerMetadata* metadata) {
+                                CallTracerAnnotationInterface* tracer,
-    LoggingSink::Entry entry;
+                                const ServerMetadata* metadata) {
-    SetCommonEntryFields(&entry, is_client, tracer,
+  LoggingSink::Entry entry;
-                         LoggingSink::Entry::EventType::kServerTrailer);
+  SetCommonEntryFields(&entry, is_client, tracer,
-    if (metadata != nullptr) {
+                       LoggingSink::Entry::EventType::kServerTrailer);
-      entry.is_trailer_only = metadata->get(GrpcTrailersOnly()).value_or(false);
+  if (metadata != nullptr) {
-      MetadataEncoder encoder(&entry.payload, &entry.payload.status_details,
+    entry.is_trailer_only = metadata->get(GrpcTrailersOnly()).value_or(false);
-                              config_.max_metadata_bytes());
+    MetadataEncoder encoder(&entry.payload, &entry.payload.status_details,
-      metadata->Encode(&encoder);
+                            config_.max_metadata_bytes());
-      entry.payload_truncated = encoder.truncated();
+    metadata->Encode(&encoder);
-    }
+    entry.payload_truncated = encoder.truncated();
-    g_logging_sink->LogEntry(std::move(entry));
   }
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  void LogClientMessage(bool is_client, CallTracerAnnotationInterface* tracer,
+void CallData::LogClientMessage(bool is_client,
-                        const SliceBuffer* message) {
+                                CallTracerAnnotationInterface* tracer,
-    LoggingSink::Entry entry;
+                                const SliceBuffer* message) {
-    SetCommonEntryFields(&entry, is_client, tracer,
+  LoggingSink::Entry entry;
-                         LoggingSink::Entry::EventType::kClientMessage);
+  SetCommonEntryFields(&entry, is_client, tracer,
-    EncodeMessageToPayload(message, config_.max_message_bytes(), &entry);
+                       LoggingSink::Entry::EventType::kClientMessage);
-    g_logging_sink->LogEntry(std::move(entry));
+  EncodeMessageToPayload(message, config_.max_message_bytes(), &entry);
-  }
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  void LogServerMessage(bool is_client, CallTracerAnnotationInterface* tracer,
+void CallData::LogServerMessage(bool is_client,
-                        const SliceBuffer* message) {
+                                CallTracerAnnotationInterface* tracer,
-    LoggingSink::Entry entry;
+                                const SliceBuffer* message) {
-    SetCommonEntryFields(&entry, is_client, tracer,
+  LoggingSink::Entry entry;
-                         LoggingSink::Entry::EventType::kServerMessage);
+  SetCommonEntryFields(&entry, is_client, tracer,
-    EncodeMessageToPayload(message, config_.max_message_bytes(), &entry);
+                       LoggingSink::Entry::EventType::kServerMessage);
-    g_logging_sink->LogEntry(std::move(entry));
+  EncodeMessageToPayload(message, config_.max_message_bytes(), &entry);
-  }
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
-  void LogCancel(bool is_client, CallTracerAnnotationInterface* tracer) {
+void CallData::LogCancel(bool is_client,
-    LoggingSink::Entry entry;
+                         CallTracerAnnotationInterface* tracer) {
-    SetCommonEntryFields(&entry, is_client, tracer,
+  LoggingSink::Entry entry;
-                         LoggingSink::Entry::EventType::kCancel);
+  SetCommonEntryFields(&entry, is_client, tracer,
-    g_logging_sink->LogEntry(std::move(entry));
+                       LoggingSink::Entry::EventType::kCancel);
-  }
+  g_logging_sink->LogEntry(std::move(entry));
+}
 
- private:
+void CallData::SetCommonEntryFields(LoggingSink::Entry* entry, bool is_client,
-  void SetCommonEntryFields(LoggingSink::Entry* entry, bool is_client,
+                                    CallTracerAnnotationInterface* tracer,
-                            CallTracerAnnotationInterface* tracer,
+                                    LoggingSink::Entry::EventType event_type) {
-                            LoggingSink::Entry::EventType event_type) {
+  entry->call_id = call_id_;
-    entry->call_id = call_id_;
+  entry->sequence_id = sequence_id_++;
-    entry->sequence_id = sequence_id_++;
+  entry->type = event_type;
-    entry->type = event_type;
+  entry->logger = is_client ? LoggingSink::Entry::Logger::kClient
-    entry->logger = is_client ? LoggingSink::Entry::Logger::kClient
+                            : LoggingSink::Entry::Logger::kServer;
-                              : LoggingSink::Entry::Logger::kServer;
+  entry->authority = authority_;
-    entry->authority = authority_;
+  entry->peer = peer_;
-    entry->peer = peer_;
+  entry->service_name = service_name_;
-    entry->service_name = service_name_;
+  entry->method_name = method_name_;
-    entry->method_name = method_name_;
+  entry->timestamp = Timestamp::Now();
-    entry->timestamp = Timestamp::Now();
+  if (tracer != nullptr) {
-    if (tracer != nullptr) {
+    entry->trace_id = tracer->TraceId();
-      entry->trace_id = tracer->TraceId();
+    entry->span_id = tracer->SpanId();
-      entry->span_id = tracer->SpanId();
+    entry->is_sampled = tracer->IsSampled();
-      entry->is_sampled = tracer->IsSampled();
-    }
   }
-  absl::uint128 call_id_;
+}
-  uint32_t sequence_id_ = 0;
-  std::string service_name_;
-  std::string method_name_;
-  std::string authority_;
-  LoggingSink::Entry::Address peer_;
-  LoggingSink::Config config_;
-};
 
-}  // namespace
+}  // namespace logging_filter_detail
 
 absl::StatusOr<std::unique_ptr<ClientLoggingFilter>>
 ClientLoggingFilter::Create(const ChannelArgs& args,
@@ -361,84 +360,55 @@ ClientLoggingFilter::Create(const ChannelArgs& args,
   return std::make_unique<ClientLoggingFilter>("");
 }
 
-// Construct a promise for one call.
+void ClientLoggingFilter::Call::OnClientInitialMetadata(
-ArenaPromise<ServerMetadataHandle> ClientLoggingFilter::MakeCallPromise(
+    ClientMetadata& md, ClientLoggingFilter* filter) {
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  call_data_.emplace(true, md, filter->default_authority_);
-  CallData* calld = GetContext<Arena>()->ManagedNew<CallData>(
+  if (!call_data_->ShouldLog()) {
-      true, call_args, default_authority_);
+    call_data_.reset();
-  if (!calld->ShouldLog()) {
+    return;
-    return next_promise_factory(std::move(call_args));
+  }
+  call_data_->LogClientHeader(
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>(), md);
+}
+
+void ClientLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  if (!call_data_.has_value()) return;
+  call_data_->LogServerHeader(
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>(), &md);
+}
+
+void ClientLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  if (!call_data_.has_value()) return;
+  if (md.get(GrpcCallWasCancelled()).value_or(false) &&
+      md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) {
+    call_data_->LogCancel(
+        /*is_client=*/true, GetContext<CallTracerAnnotationInterface>());
+    return;
   }
-  calld->LogClientHeader(
+  call_data_->LogServerTrailer(
-      /*is_client=*/true,
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>(), &md);
-      static_cast<CallTracerAnnotationInterface*>(
+}
-          GetContext<grpc_call_context_element>()
+
-              [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+void ClientLoggingFilter::Call::OnClientToServerMessage(
-                  .value),
+    const Message& message) {
-      call_args.client_initial_metadata);
+  if (!call_data_.has_value()) return;
-  call_args.server_initial_metadata->InterceptAndMap(
+  call_data_->LogClientMessage(
-      [calld](ServerMetadataHandle metadata) {
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>(),
-        calld->LogServerHeader(
+      message.payload());
-            /*is_client=*/true,
+}
-            static_cast<CallTracerAnnotationInterface*>(
+
-                GetContext<grpc_call_context_element>()
+void ClientLoggingFilter::Call::OnClientToServerHalfClose() {
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+  if (!call_data_.has_value()) return;
-                        .value),
+  call_data_->LogClientHalfClose(
-            metadata.get());
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>());
-        return metadata;
+}
-      });
+
-  call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
+void ClientLoggingFilter::Call::OnServerToClientMessage(
-      [calld](MessageHandle message) {
+    const Message& message) {
-        calld->LogClientMessage(
+  if (!call_data_.has_value()) return;
-            /*is_client=*/true,
+  call_data_->LogServerMessage(
-            static_cast<CallTracerAnnotationInterface*>(
+      /*is_client=*/true, GetContext<CallTracerAnnotationInterface>(),
-                GetContext<grpc_call_context_element>()
+      message.payload());
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                        .value),
-            message->payload());
-        return message;
-      },
-      [calld] {
-        calld->LogClientHalfClose(
-            /*is_client=*/true,
-            static_cast<CallTracerAnnotationInterface*>(
-                GetContext<grpc_call_context_element>()
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                        .value));
-      });
-  call_args.server_to_client_messages->InterceptAndMap(
-      [calld](MessageHandle message) {
-        calld->LogServerMessage(
-            /*is_client=*/true,
-            static_cast<CallTracerAnnotationInterface*>(
-                GetContext<grpc_call_context_element>()
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                        .value),
-            message->payload());
-        return message;
-      });
-  return OnCancel(
-      Map(next_promise_factory(std::move(call_args)),
-          [calld](ServerMetadataHandle md) {
-            calld->LogServerTrailer(
-                /*is_client=*/true,
-                static_cast<CallTracerAnnotationInterface*>(
-                    GetContext<grpc_call_context_element>()
-                        [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                            .value),
-                md.get());
-            return md;
-          }),
-      // TODO(yashykt/ctiller): GetContext<grpc_call_context_element> is not
-      // valid for the cancellation function requiring us to capture it here.
-      // This ought to be easy to fix once client side promises are completely
-      // rolled out.
-      [calld, ctx = GetContext<grpc_call_context_element>()]() {
-        calld->LogCancel(
-            /*is_client=*/true,
-            static_cast<CallTracerAnnotationInterface*>(
-                ctx[GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE].value));
-      });
 }
 
 const grpc_channel_filter ClientLoggingFilter::kFilter =
@@ -454,79 +424,54 @@ ServerLoggingFilter::Create(const ChannelArgs& /*args*/,
 }
 
 // Construct a promise for one call.
-ArenaPromise<ServerMetadataHandle> ServerLoggingFilter::MakeCallPromise(
+void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) {
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  call_data_.emplace(false, md, "");
-  CallData* calld = GetContext<Arena>()->ManagedNew<CallData>(
+  if (!call_data_->ShouldLog()) {
-      false, call_args, /*default_authority=*/"");
+    call_data_.reset();
-  if (!calld->ShouldLog()) {
+    return;
-    return next_promise_factory(std::move(call_args));
   }
-  auto* call_tracer = static_cast<CallTracerAnnotationInterface*>(
+  call_data_->LogClientHeader(
-      GetContext<grpc_call_context_element>()
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>(), md);
-          [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+}
-              .value);
+
-  calld->LogClientHeader(
+void ServerLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
-      /*is_client=*/false, call_tracer, call_args.client_initial_metadata);
+  if (!call_data_.has_value()) return;
-  call_args.server_initial_metadata->InterceptAndMap(
+  call_data_->LogServerHeader(
-      [calld](ServerMetadataHandle metadata) {
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>(), &md);
-        calld->LogServerHeader(
+}
-            /*is_client=*/false,
+
-            static_cast<CallTracerAnnotationInterface*>(
+void ServerLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
-                GetContext<grpc_call_context_element>()
+  if (!call_data_.has_value()) return;
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+  if (md.get(GrpcCallWasCancelled()).value_or(false) &&
-                        .value),
+      md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) {
-            metadata.get());
+    call_data_->LogCancel(
-        return metadata;
+        /*is_client=*/false, GetContext<CallTracerAnnotationInterface>());
-      });
+    return;
-  call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
+  }
-      [calld](MessageHandle message) {
+  call_data_->LogServerTrailer(
-        calld->LogClientMessage(
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>(), &md);
-            /*is_client=*/false,
+}
-            static_cast<CallTracerAnnotationInterface*>(
+
-                GetContext<grpc_call_context_element>()
+void ServerLoggingFilter::Call::OnClientToServerMessage(
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+    const Message& message) {
-                        .value),
+  if (!call_data_.has_value()) return;
-            message->payload());
+  call_data_->LogClientMessage(
-        return message;
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>(),
-      },
+      message.payload());
-      [calld] {
+}
-        calld->LogClientHalfClose(
+
-            /*is_client=*/false,
+void ServerLoggingFilter::Call::OnClientToServerHalfClose() {
-            static_cast<CallTracerAnnotationInterface*>(
+  if (!call_data_.has_value()) return;
-                GetContext<grpc_call_context_element>()
+  call_data_->LogClientHalfClose(
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>());
-                        .value));
+}
-      });
+
-  call_args.server_to_client_messages->InterceptAndMap(
+void ServerLoggingFilter::Call::OnServerToClientMessage(
-      [calld](MessageHandle message) {
+    const Message& message) {
-        calld->LogServerMessage(
+  if (!call_data_.has_value()) return;
-            /*is_client=*/false,
+  call_data_->LogServerMessage(
-            static_cast<CallTracerAnnotationInterface*>(
+      /*is_client=*/false, GetContext<CallTracerAnnotationInterface>(),
-                GetContext<grpc_call_context_element>()
+      message.payload());
-                    [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                        .value),
-            message->payload());
-        return message;
-      });
-  return OnCancel(
-      Map(next_promise_factory(std::move(call_args)),
-          [calld](ServerMetadataHandle md) {
-            calld->LogServerTrailer(
-                /*is_client=*/false,
-                static_cast<CallTracerAnnotationInterface*>(
-                    GetContext<grpc_call_context_element>()
-                        [GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
-                            .value),
-                md.get());
-            return md;
-          }),
-      // TODO(yashykt/ctiller): GetContext<grpc_call_context_element> is not
-      // valid for the cancellation function requiring us to capture
-      // call_tracer.
-      [calld, call_tracer]() {
-        calld->LogCancel(
-            /*is_client=*/false, call_tracer);
-      });
 }
 
 const grpc_channel_filter ServerLoggingFilter::kFilter =

src/core/ext/filters/logging/logging_filter.h

@@ -35,7 +35,46 @@
 
 namespace grpc_core {
 
-class ClientLoggingFilter final : public ChannelFilter {
+namespace logging_filter_detail {
+
+class CallData {
+ public:
+  CallData(bool is_client, const ClientMetadata& client_initial_metadata,
+           const std::string& authority);
+
+  bool ShouldLog() { return config_.ShouldLog(); }
+
+  void LogClientHeader(bool is_client, CallTracerAnnotationInterface* tracer,
+                       const ClientMetadata& metadata);
+  void LogClientHalfClose(bool is_client,
+                          CallTracerAnnotationInterface* tracer);
+  void LogServerHeader(bool is_client, CallTracerAnnotationInterface* tracer,
+                       const ServerMetadata* metadata);
+  void LogServerTrailer(bool is_client, CallTracerAnnotationInterface* tracer,
+                        const ServerMetadata* metadata);
+  void LogClientMessage(bool is_client, CallTracerAnnotationInterface* tracer,
+                        const SliceBuffer* message);
+  void LogServerMessage(bool is_client, CallTracerAnnotationInterface* tracer,
+                        const SliceBuffer* message);
+  void LogCancel(bool is_client, CallTracerAnnotationInterface* tracer);
+
+ private:
+  void SetCommonEntryFields(LoggingSink::Entry* entry, bool is_client,
+                            CallTracerAnnotationInterface* tracer,
+                            LoggingSink::Entry::EventType event_type);
+  absl::uint128 call_id_;
+  uint32_t sequence_id_ = 0;
+  std::string service_name_;
+  std::string method_name_;
+  std::string authority_;
+  LoggingSink::Entry::Address peer_;
+  LoggingSink::Config config_;
+};
+
+}  // namespace logging_filter_detail
+
+class ClientLoggingFilter final
+    : public ImplementChannelFilter<ClientLoggingFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
@@ -45,24 +84,46 @@ class ClientLoggingFilter final : public ChannelFilter {
   explicit ClientLoggingFilter(std::string default_authority)
       : default_authority_(std::move(default_authority)) {}
 
-  // Construct a promise for one call.
+  class Call {
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+   public:
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+    void OnClientInitialMetadata(ClientMetadata& md,
+                                 ClientLoggingFilter* filter);
+    void OnServerInitialMetadata(ServerMetadata& md);
+    void OnServerTrailingMetadata(ServerMetadata& md);
+    void OnClientToServerMessage(const Message& message);
+    void OnClientToServerHalfClose();
+    void OnServerToClientMessage(const Message& message);
+    static const NoInterceptor OnFinalize;
+
+   private:
+    absl::optional<logging_filter_detail::CallData> call_data_;
+  };
 
  private:
   const std::string default_authority_;
 };
 
-class ServerLoggingFilter final : public ChannelFilter {
+class ServerLoggingFilter final
+    : public ImplementChannelFilter<ServerLoggingFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<std::unique_ptr<ServerLoggingFilter>> Create(
       const ChannelArgs& args, ChannelFilter::Args /*filter_args*/);
 
-  // Construct a promise for one call.
+  class Call {
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+   public:
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+    void OnClientInitialMetadata(ClientMetadata& md);
+    void OnServerInitialMetadata(ServerMetadata& md);
+    void OnServerTrailingMetadata(ServerMetadata& md);
+    void OnClientToServerMessage(const Message& message);
+    void OnClientToServerHalfClose();
+    void OnServerToClientMessage(const Message& message);
+    static const NoInterceptor OnFinalize;
+
+   private:
+    absl::optional<logging_filter_detail::CallData> call_data_;
+  };
 };
 
 void RegisterLoggingFilter(LoggingSink* sink);

src/core/ext/filters/logging/logging_sink.h

@@ -27,6 +27,7 @@
 #include <string>
 
 #include "absl/numeric/int128.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
 #include "src/core/lib/gprpp/time.h"
@@ -73,8 +74,42 @@ class LoggingSink {
       kCancel
     };
 
+    static std::string EventTypeString(EventType type) {
+      switch (type) {
+        case EventType::kUnknown:
+          return "UNKNOWN";
+        case EventType::kClientHeader:
+          return "CLIENT_HEADER";
+        case EventType::kServerHeader:
+          return "SERVER_HEADER";
+        case EventType::kClientMessage:
+          return "CLIENT_MESSAGE";
+        case EventType::kServerMessage:
+          return "SERVER_MESSAGE";
+        case EventType::kClientHalfClose:
+          return "CLIENT_HALF_CLOSE";
+        case EventType::kServerTrailer:
+          return "SERVER_TRAILER";
+        case EventType::kCancel:
+          return "CANCEL";
+      }
+      return absl::StrCat("INVALID(", static_cast<int>(type), ")");
+    }
+
     enum class Logger { kUnknown = 0, kClient, kServer };
 
+    static std::string LoggerString(Logger logger) {
+      switch (logger) {
+        case Logger::kUnknown:
+          return "UNKNOWN";
+        case Logger::kClient:
+          return "CLIENT";
+        case Logger::kServer:
+          return "SERVER";
+      }
+      return absl::StrCat("INVALID(", static_cast<int>(logger), ")");
+    }
+
     struct Payload {
       std::map<std::string, std::string> metadata;
       Duration timeout;
@@ -118,6 +153,16 @@ class LoggingSink {
   virtual void LogEntry(Entry entry) = 0;
 };
 
+inline std::ostream& operator<<(std::ostream& out,
+                                const LoggingSink::Entry::EventType& type) {
+  return out << LoggingSink::Entry::EventTypeString(type);
+}
+
+inline std::ostream& operator<<(std::ostream& out,
+                                const LoggingSink::Entry::Logger& logger) {
+  return out << LoggingSink::Entry::LoggerString(logger);
+}
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_FILTERS_LOGGING_LOGGING_SINK_H

src/core/ext/filters/message_size/message_size_filter.cc

@@ -51,10 +51,12 @@ namespace grpc_core {
 const NoInterceptor ClientMessageSizeFilter::Call::OnClientInitialMetadata;
 const NoInterceptor ClientMessageSizeFilter::Call::OnServerInitialMetadata;
 const NoInterceptor ClientMessageSizeFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ClientMessageSizeFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ClientMessageSizeFilter::Call::OnFinalize;
 const NoInterceptor ServerMessageSizeFilter::Call::OnClientInitialMetadata;
 const NoInterceptor ServerMessageSizeFilter::Call::OnServerInitialMetadata;
 const NoInterceptor ServerMessageSizeFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ServerMessageSizeFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor ServerMessageSizeFilter::Call::OnFinalize;
 
 //

src/core/ext/filters/message_size/message_size_filter.h

@@ -105,6 +105,7 @@ class ServerMessageSizeFilter final
     static const NoInterceptor OnFinalize;
     ServerMetadataHandle OnClientToServerMessage(
         const Message& message, ServerMessageSizeFilter* filter);
+    static const NoInterceptor OnClientToServerHalfClose;
     ServerMetadataHandle OnServerToClientMessage(
         const Message& message, ServerMessageSizeFilter* filter);
   };
@@ -133,6 +134,7 @@ class ClientMessageSizeFilter final
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnFinalize;
     ServerMetadataHandle OnClientToServerMessage(const Message& message);
+    static const NoInterceptor OnClientToServerHalfClose;
     ServerMetadataHandle OnServerToClientMessage(const Message& message);
 
    private:

src/core/ext/filters/rbac/rbac_filter.cc

@@ -46,6 +46,7 @@ namespace grpc_core {
 const NoInterceptor RbacFilter::Call::OnServerInitialMetadata;
 const NoInterceptor RbacFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor RbacFilter::Call::OnClientToServerMessage;
+const NoInterceptor RbacFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor RbacFilter::Call::OnServerToClientMessage;
 const NoInterceptor RbacFilter::Call::OnFinalize;
 

src/core/ext/filters/rbac/rbac_filter.h

@@ -55,6 +55,7 @@ class RbacFilter : public ImplementChannelFilter<RbacFilter> {
     static const NoInterceptor OnServerInitialMetadata;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

src/core/ext/filters/stateful_session/stateful_session_filter.cc

@@ -60,6 +60,7 @@ namespace grpc_core {
 
 TraceFlag grpc_stateful_session_filter_trace(false, "stateful_session_filter");
 const NoInterceptor StatefulSessionFilter::Call::OnClientToServerMessage;
+const NoInterceptor StatefulSessionFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor StatefulSessionFilter::Call::OnServerToClientMessage;
 const NoInterceptor StatefulSessionFilter::Call::OnFinalize;
 

src/core/ext/filters/stateful_session/stateful_session_filter.h

@@ -86,6 +86,7 @@ class StatefulSessionFilter
     void OnServerInitialMetadata(ServerMetadata& md);
     void OnServerTrailingMetadata(ServerMetadata& md);
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
 

src/core/ext/transport/chttp2/alpn/alpn.cc

@@ -23,7 +23,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 // in order of preference
 static const char* const supported_versions[] = {"h2"};

src/core/ext/transport/chttp2/transport/chttp2_transport.cc

@@ -80,8 +80,6 @@
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/debug_location.h"
@@ -110,6 +108,8 @@
 #include "src/core/lib/transport/metadata_info.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 #include "src/core/lib/iomgr/ev_posix.h"

src/core/ext/transport/chttp2/transport/flow_control.cc

@@ -37,8 +37,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/util/useful.h"
 
 grpc_core::TraceFlag grpc_flowctl_trace(false, "flowctl");
 

src/core/ext/transport/chttp2/transport/frame_settings.cc

@@ -37,10 +37,10 @@
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
+#include "src/core/util/useful.h"
 
 static uint8_t* fill_header(uint8_t* out, uint32_t length, uint8_t flags) {
   *out++ = static_cast<uint8_t>(length >> 16);

src/core/ext/transport/chttp2/transport/http2_settings.cc

@@ -25,8 +25,8 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/transport/http2_errors.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/ext/transport/chttp2/transport/http2_settings.h

@@ -28,8 +28,8 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/transport/http2_errors.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/ext/transport/chttp2/transport/writing.cc

@@ -59,7 +59,6 @@
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -73,6 +72,7 @@
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/useful.h"
 
 // IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h"
 

src/core/handshaker/http_connect/http_connect_handshaker.cc

@@ -41,7 +41,6 @@
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -53,6 +52,7 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/tcp_server.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 

src/core/handshaker/http_connect/http_proxy_mapper.cc

@@ -47,12 +47,12 @@
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 namespace {

src/core/handshaker/security/secure_endpoint.cc

@@ -42,7 +42,6 @@
 
 #include "src/core/handshaker/security/tsi_error.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -58,6 +57,7 @@
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
+#include "src/core/util/string.h"
 
 #define STAGING_BUFFER_SIZE 8192
 

src/core/lib/address_utils/parse_address.cc

@@ -49,12 +49,12 @@
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
+#include "src/core/util/string.h"
 
 // IWYU pragma: no_include <arpa/inet.h>
 

src/core/lib/avl/avl.h

@@ -23,9 +23,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/lib/channel/channel_args.cc

@@ -40,7 +40,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/lib/channel/channel_args.h

@@ -38,7 +38,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/avl/avl.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted.h"
@@ -46,6 +45,7 @@
 #include "src/core/lib/gprpp/ref_counted_string.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/util/useful.h"
 
 // TODO(hork): When we're ready to allow setting via a channel arg from the
 // application, replace this with a macro in

src/core/lib/channel/channel_stack.cc

@@ -31,8 +31,8 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_trace.h"
-#include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/surface/channel_init.h"
+#include "src/core/util/alloc.h"
 
 using grpc_event_engine::experimental::EventEngine;
 

src/core/lib/channel/channel_stack.h

@@ -62,7 +62,6 @@
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/channel/metrics.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
@@ -74,6 +73,7 @@
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_final_info.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/time_precise.h"
 
 struct grpc_channel_element_args {
   grpc_channel_stack* channel_stack;

src/core/lib/channel/connected_channel.cc

@@ -44,7 +44,6 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -79,6 +78,7 @@
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/alloc.h"
 
 typedef struct connected_channel_channel_data {
   grpc_core::Transport* transport;

src/core/lib/channel/context.h

@@ -72,6 +72,7 @@ struct grpc_call_context_element {
 
 namespace grpc_core {
 class Call;
+class CallTracerAnnotationInterface;
 
 // Bind the legacy context array into the new style structure
 // TODO(ctiller): remove as we migrate these contexts to the new system.
@@ -89,6 +90,12 @@ struct OldStyleContext<Call> {
   static constexpr grpc_context_index kIndex = GRPC_CONTEXT_CALL;
 };
 
+template <>
+struct OldStyleContext<CallTracerAnnotationInterface> {
+  static constexpr grpc_context_index kIndex =
+      GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE;
+};
+
 template <typename T>
 class Context<T, absl::void_t<decltype(OldStyleContext<T>::kIndex)>> {
  public:

src/core/lib/channel/promise_based_filter.h

@@ -59,6 +59,7 @@
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/poll.h"
@@ -354,31 +355,72 @@ template <typename Promise, typename Derived>
 auto MapResult(absl::Status (Derived::Call::*fn)(ServerMetadata&), Promise x,
                FilterCallData<Derived>* call_data) {
   DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
-  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+  return OnCancel(
-    auto status = call_data->call.OnServerTrailingMetadata(*md);
+      Map(std::move(x),
-    if (!status.ok()) return ServerMetadataFromStatus(status);
+          [call_data](ServerMetadataHandle md) {
-    return md;
+            auto status = call_data->call.OnServerTrailingMetadata(*md);
-  });
+            if (!status.ok()) {
+              return ServerMetadataFromStatus(status);
+            }
+            return md;
+          }),
+      // TODO(yashykt/ctiller): GetContext<grpc_call_context_element> is not
+      // valid for the cancellation function requiring us to capture it here.
+      // This ought to be easy to fix once client side promises are completely
+      // rolled out.
+      [call_data, ctx = GetContext<grpc_call_context_element>()]() {
+        grpc_metadata_batch b;
+        b.Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
+        b.Set(GrpcCallWasCancelled(), true);
+        promise_detail::Context<grpc_call_context_element> context(ctx);
+        call_data->call.OnServerTrailingMetadata(b).IgnoreError();
+      });
 }
 
 template <typename Promise, typename Derived>
 auto MapResult(void (Derived::Call::*fn)(ServerMetadata&), Promise x,
                FilterCallData<Derived>* call_data) {
   DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
-  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+  return OnCancel(
-    call_data->call.OnServerTrailingMetadata(*md);
+      Map(std::move(x),
-    return md;
+          [call_data](ServerMetadataHandle md) {
-  });
+            call_data->call.OnServerTrailingMetadata(*md);
+            return md;
+          }),
+      // TODO(yashykt/ctiller): GetContext<grpc_call_context_element> is not
+      // valid for the cancellation function requiring us to capture it here.
+      // This ought to be easy to fix once client side promises are completely
+      // rolled out.
+      [call_data, ctx = GetContext<grpc_call_context_element>()]() {
+        grpc_metadata_batch b;
+        b.Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
+        b.Set(GrpcCallWasCancelled(), true);
+        promise_detail::Context<grpc_call_context_element> context(ctx);
+        call_data->call.OnServerTrailingMetadata(b);
+      });
 }
 
 template <typename Promise, typename Derived>
 auto MapResult(void (Derived::Call::*fn)(ServerMetadata&, Derived*), Promise x,
                FilterCallData<Derived>* call_data) {
   DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
-  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+  return OnCancel(
-    call_data->call.OnServerTrailingMetadata(*md, call_data->channel);
+      Map(std::move(x),
-    return md;
+          [call_data](ServerMetadataHandle md) {
-  });
+            call_data->call.OnServerTrailingMetadata(*md, call_data->channel);
+            return md;
+          }),
+      // TODO(yashykt/ctiller): GetContext<grpc_call_context_element> is not
+      // valid for the cancellation function requiring us to capture it here.
+      // This ought to be easy to fix once client side promises are completely
+      // rolled out.
+      [call_data, ctx = GetContext<grpc_call_context_element>()]() {
+        grpc_metadata_batch b;
+        b.Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
+        b.Set(GrpcCallWasCancelled(), true);
+        promise_detail::Context<grpc_call_context_element> context(ctx);
+        call_data->call.OnServerTrailingMetadata(b, call_data->channel);
+      });
 }
 
 template <typename Interceptor, typename Derived, typename SfinaeVoid = void>
@@ -492,130 +534,193 @@ auto RunCall(Interceptor interceptor, CallArgs call_args,
       std::move(call_args), std::move(next_promise_factory), call_data);
 }
 
-inline void InterceptClientToServerMessage(const NoInterceptor*, void*,
+template <typename Derived>
-                                           const CallArgs&) {}
+inline auto InterceptClientToServerMessageHandler(
+    void (Derived::Call::*fn)(const Message&),
+    FilterCallData<Derived>* call_data, const CallArgs&) {
+  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
+  return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+    call_data->call.OnClientToServerMessage(*msg);
+    return std::move(msg);
+  };
+}
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+    FilterCallData<Derived>* call_data, const CallArgs&) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_args.client_to_server_messages->InterceptAndMap(
+  return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
-      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+    auto return_md = call_data->call.OnClientToServerMessage(*msg);
-        auto return_md = call_data->call.OnClientToServerMessage(*msg);
+    if (return_md == nullptr) return std::move(msg);
-        if (return_md == nullptr) return std::move(msg);
+    if (call_data->error_latch.is_set()) return absl::nullopt;
-        if (call_data->error_latch.is_set()) return absl::nullopt;
+    call_data->error_latch.Set(std::move(return_md));
-        call_data->error_latch.Set(std::move(return_md));
+    return absl::nullopt;
-        return absl::nullopt;
+  };
-      });
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+    FilterCallData<Derived>* call_data, const CallArgs&) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_args.client_to_server_messages->InterceptAndMap(
+  return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
-      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+    auto return_md =
-        auto return_md =
+        call_data->call.OnClientToServerMessage(*msg, call_data->channel);
-            call_data->call.OnClientToServerMessage(*msg, call_data->channel);
+    if (return_md == nullptr) return std::move(msg);
-        if (return_md == nullptr) return std::move(msg);
+    if (call_data->error_latch.is_set()) return absl::nullopt;
-        if (call_data->error_latch.is_set()) return absl::nullopt;
+    call_data->error_latch.Set(std::move(return_md));
-        call_data->error_latch.Set(std::move(return_md));
+    return absl::nullopt;
-        return absl::nullopt;
+  };
-      });
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+    FilterCallData<Derived>* call_data, const CallArgs&) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_args.client_to_server_messages->InterceptAndMap(
+  return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
-      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+    return call_data->call.OnClientToServerMessage(std::move(msg),
-        return call_data->call.OnClientToServerMessage(std::move(msg),
+                                                   call_data->channel);
-                                                       call_data->channel);
+  };
-      });
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     absl::StatusOr<MessageHandle> (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+    FilterCallData<Derived>* call_data, const CallArgs&) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
+  return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+    auto r = call_data->call.OnClientToServerMessage(std::move(msg),
+                                                     call_data->channel);
+    if (r.ok()) return std::move(*r);
+    if (call_data->error_latch.is_set()) return absl::nullopt;
+    call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
+    return absl::nullopt;
+  };
+}
+
+template <typename Derived, typename HookFunction>
+inline void InterceptClientToServerMessage(HookFunction hook,
+                                           const NoInterceptor*,
+                                           FilterCallData<Derived>* call_data,
+                                           const CallArgs& call_args) {
   call_args.client_to_server_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+      InterceptClientToServerMessageHandler(hook, call_data, call_args));
-        auto r = call_data->call.OnClientToServerMessage(std::move(msg),
-                                                         call_data->channel);
-        if (r.ok()) return std::move(*r);
-        if (call_data->error_latch.is_set()) return absl::nullopt;
-        call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
-        return absl::nullopt;
-      });
 }
 
-inline void InterceptClientToServerMessage(const NoInterceptor*, void*, void*,
+template <typename Derived, typename HookFunction>
-                                           CallSpineInterface*) {}
+inline void InterceptClientToServerMessage(HookFunction hook,
+                                           void (Derived::Call::*)(),
+                                           FilterCallData<Derived>* call_data,
+                                           const CallArgs& call_args) {
+  call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
+      InterceptClientToServerMessageHandler(hook, call_data, call_args),
+      [call_data]() { call_data->call.OnClientToServerHalfClose(); });
+}
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline void InterceptClientToServerMessage(const NoInterceptor*,
+                                           const NoInterceptor*,
+                                           FilterCallData<Derived>*,
+                                           const CallArgs&) {}
+
+template <typename Derived>
+inline auto InterceptClientToServerMessageHandler(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&),
     typename Derived::Call* call, Derived*, PipeBasedCallSpine* call_spine) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_spine->client_to_server_messages().receiver.InterceptAndMap(
+  return
       [call, call_spine](MessageHandle msg) -> absl::optional<MessageHandle> {
         auto return_md = call->OnClientToServerMessage(*msg);
         if (return_md == nullptr) return std::move(msg);
         call_spine->PushServerTrailingMetadata(std::move(return_md));
         return absl::nullopt;
-      });
+      };
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
+    void (Derived::Call::*fn)(const Message&), typename Derived::Call* call,
+    Derived*, PipeBasedCallSpine*) {
+  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
+  return [call](MessageHandle msg) -> absl::optional<MessageHandle> {
+    call->OnClientToServerMessage(*msg);
+    return std::move(msg);
+  };
+}
+
+template <typename Derived>
+inline auto InterceptClientToServerMessageHandler(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
     typename Derived::Call* call, Derived* channel,
     PipeBasedCallSpine* call_spine) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_spine->client_to_server_messages().receiver.InterceptAndMap(
+  return [call, call_spine,
-      [call, call_spine,
+          channel](MessageHandle msg) -> absl::optional<MessageHandle> {
-       channel](MessageHandle msg) -> absl::optional<MessageHandle> {
+    auto return_md = call->OnClientToServerMessage(*msg, channel);
-        auto return_md = call->OnClientToServerMessage(*msg, channel);
+    if (return_md == nullptr) return std::move(msg);
-        if (return_md == nullptr) return std::move(msg);
+    call_spine->PushServerTrailingMetadata(std::move(return_md));
-        call_spine->PushServerTrailingMetadata(std::move(return_md));
+    return absl::nullopt;
-        return absl::nullopt;
+  };
-      });
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
-    typename Derived::Call* call, Derived* channel,
+    typename Derived::Call* call, Derived* channel, PipeBasedCallSpine*) {
-    PipeBasedCallSpine* call_spine) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  call_spine->client_to_server_messages().receiver.InterceptAndMap(
+  return [call, channel](MessageHandle msg) {
-      [call, channel](MessageHandle msg) {
+    return call->OnClientToServerMessage(std::move(msg), channel);
-        return call->OnClientToServerMessage(std::move(msg), channel);
+  };
-      });
 }
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(
+inline auto InterceptClientToServerMessageHandler(
     absl::StatusOr<MessageHandle> (Derived::Call::*fn)(MessageHandle, Derived*),
     typename Derived::Call* call, Derived* channel,
     PipeBasedCallSpine* call_spine) {
   DCHECK(fn == &Derived::Call::OnClientToServerMessage);
+  return [call, call_spine,
+          channel](MessageHandle msg) -> absl::optional<MessageHandle> {
+    auto r = call->OnClientToServerMessage(std::move(msg), channel);
+    if (r.ok()) return std::move(*r);
+    call_spine->PushServerTrailingMetadata(
+        ServerMetadataFromStatus(r.status()));
+    return absl::nullopt;
+  };
+}
+
+template <typename Derived, typename HookFunction>
+inline void InterceptClientToServerMessage(HookFunction fn,
+                                           const NoInterceptor*,
+                                           typename Derived::Call* call,
+                                           Derived* channel,
+                                           PipeBasedCallSpine* call_spine) {
+  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
   call_spine->client_to_server_messages().receiver.InterceptAndMap(
-      [call, call_spine,
+      InterceptClientToServerMessageHandler(fn, call, channel, call_spine));
-       channel](MessageHandle msg) -> absl::optional<MessageHandle> {
-        auto r = call->OnClientToServerMessage(std::move(msg), channel);
-        if (r.ok()) return std::move(*r);
-        call_spine->PushServerTrailingMetadata(
-            ServerMetadataFromStatus(r.status()));
-        return absl::nullopt;
-      });
 }
 
+template <typename Derived, typename HookFunction>
+inline void InterceptClientToServerMessage(HookFunction fn,
+                                           void (Derived::Call::*half_close)(),
+                                           typename Derived::Call* call,
+                                           Derived* channel,
+                                           PipeBasedCallSpine* call_spine) {
+  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
+  DCHECK(half_close == &Derived::Call::OnClientToServerHalfClose);
+  call_spine->client_to_server_messages().receiver.InterceptAndMapWithHalfClose(
+      InterceptClientToServerMessageHandler(fn, call, channel, call_spine),
+      [call]() { call->OnClientToServerHalfClose(); });
+}
+
+template <typename Derived>
+inline void InterceptClientToServerMessage(const NoInterceptor*,
+                                           const NoInterceptor*,
+                                           typename Derived::Call*, Derived*,
+                                           PipeBasedCallSpine*) {}
+
 inline void InterceptClientInitialMetadata(const NoInterceptor*, void*, void*,
                                            PipeBasedCallSpine*) {}
 
@@ -861,6 +966,18 @@ inline void InterceptServerInitialMetadata(
 inline void InterceptServerToClientMessage(const NoInterceptor*, void*,
                                            const CallArgs&) {}
 
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    void (Derived::Call::*fn)(const Message&),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
+  call_args.server_to_client_messages->InterceptAndMap(
+      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+        call_data->call.OnServerToClientMessage(*msg);
+        return std::move(msg);
+      });
+}
+
 template <typename Derived>
 inline void InterceptServerToClientMessage(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&),
@@ -923,6 +1040,18 @@ inline void InterceptServerToClientMessage(
 inline void InterceptServerToClientMessage(const NoInterceptor*, void*, void*,
                                            CallSpineInterface*) {}
 
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    void (Derived::Call::*fn)(const Message&), typename Derived::Call* call,
+    Derived*, PipeBasedCallSpine* call_spine) {
+  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
+  call_spine->server_to_client_messages().sender.InterceptAndMap(
+      [call](MessageHandle msg) -> absl::optional<MessageHandle> {
+        call->OnServerToClientMessage(*msg);
+        return std::move(msg);
+      });
+}
+
 template <typename Derived>
 inline void InterceptServerToClientMessage(
     ServerMetadataHandle (Derived::Call::*fn)(const Message&),
@@ -1120,7 +1249,8 @@ class ImplementChannelFilter : public ChannelFilter,
     promise_filter_detail::InterceptClientInitialMetadata(
         &Derived::Call::OnClientInitialMetadata, call, d, c);
     promise_filter_detail::InterceptClientToServerMessage(
-        &Derived::Call::OnClientToServerMessage, call, d, c);
+        &Derived::Call::OnClientToServerMessage,
+        &Derived::Call::OnClientToServerHalfClose, call, d, c);
     promise_filter_detail::InterceptServerInitialMetadata(
         &Derived::Call::OnServerInitialMetadata, call, d, c);
     promise_filter_detail::InterceptServerToClientMessage(
@@ -1139,7 +1269,8 @@ class ImplementChannelFilter : public ChannelFilter,
     auto* call = promise_filter_detail::MakeFilterCall<Derived>(
         static_cast<Derived*>(this));
     promise_filter_detail::InterceptClientToServerMessage(
-        &Derived::Call::OnClientToServerMessage, call, call_args);
+        &Derived::Call::OnClientToServerMessage,
+        &Derived::Call::OnClientToServerHalfClose, call, call_args);
     promise_filter_detail::InterceptServerInitialMetadata(
         &Derived::Call::OnServerInitialMetadata, call, call_args);
     promise_filter_detail::InterceptServerToClientMessage(

src/core/lib/channel/status_util.cc

@@ -27,7 +27,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 struct status_string_entry {
   const char* str;

src/core/lib/compression/compression.cc

@@ -28,9 +28,9 @@
 
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/api_trace.h"
+#include "src/core/util/useful.h"
 
 int grpc_compression_algorithm_is_message(grpc_compression_algorithm) {
   return 1;

src/core/lib/debug/event_log.h

@@ -27,9 +27,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/per_cpu.h"
 #include "src/core/lib/gprpp/sync.h"
+#include "src/core/util/time_precise.h"
 
 namespace grpc_core {
 

src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc

@@ -34,8 +34,8 @@
 #include "absl/strings/str_format.h"
 
 #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/event_engine/posix_engine/posix_engine.cc

@@ -51,10 +51,10 @@
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/trace.h"
 #include "src/core/lib/event_engine/utils.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/sync.h"
+#include "src/core/util/useful.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 #include <errno.h>       // IWYU pragma: keep

src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc

@@ -27,10 +27,10 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"  // IWYU pragma: keep
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/port.h"
+#include "src/core/util/useful.h"
 
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 #include <arpa/inet.h>  // IWYU pragma: keep

src/core/lib/event_engine/posix_engine/timer.cc

@@ -27,8 +27,8 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/event_engine/thread_pool/thread_count.h

@@ -26,9 +26,9 @@
 #include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/experiments/experiments.cc

@@ -70,14 +70,6 @@ const char* const description_peer_state_based_framing =
     "on the peer's memory pressure which is reflected in its max http2 frame "
     "size.";
 const char* const additional_constraints_peer_state_based_framing = "{}";
-const char* const description_pending_queue_cap =
-    "In the sync & async apis (but not the callback api), cap the number of "
-    "received but unrequested requests in the server for each call type. A "
-    "received message is one that was read from the wire on the server. A "
-    "requested message is one explicitly requested by the application using "
-    "grpc_server_request_call or grpc_server_request_registered_call (or their "
-    "wrappers in the C++ API).";
-const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_new =
     "New pick_first impl with memory reduction.";
 const char* const additional_constraints_pick_first_new = "{}";
@@ -171,8 +163,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      nullptr, 0, false, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
-    {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_new", description_pick_first_new,
      additional_constraints_pick_first_new, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
@@ -262,14 +252,6 @@ const char* const description_peer_state_based_framing =
     "on the peer's memory pressure which is reflected in its max http2 frame "
     "size.";
 const char* const additional_constraints_peer_state_based_framing = "{}";
-const char* const description_pending_queue_cap =
-    "In the sync & async apis (but not the callback api), cap the number of "
-    "received but unrequested requests in the server for each call type. A "
-    "received message is one that was read from the wire on the server. A "
-    "requested message is one explicitly requested by the application using "
-    "grpc_server_request_call or grpc_server_request_registered_call (or their "
-    "wrappers in the C++ API).";
-const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_new =
     "New pick_first impl with memory reduction.";
 const char* const additional_constraints_pick_first_new = "{}";
@@ -363,8 +345,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      nullptr, 0, false, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
-    {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_new", description_pick_first_new,
      additional_constraints_pick_first_new, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
@@ -454,14 +434,6 @@ const char* const description_peer_state_based_framing =
     "on the peer's memory pressure which is reflected in its max http2 frame "
     "size.";
 const char* const additional_constraints_peer_state_based_framing = "{}";
-const char* const description_pending_queue_cap =
-    "In the sync & async apis (but not the callback api), cap the number of "
-    "received but unrequested requests in the server for each call type. A "
-    "received message is one that was read from the wire on the server. A "
-    "requested message is one explicitly requested by the application using "
-    "grpc_server_request_call or grpc_server_request_registered_call (or their "
-    "wrappers in the C++ API).";
-const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_new =
     "New pick_first impl with memory reduction.";
 const char* const additional_constraints_pick_first_new = "{}";
@@ -555,8 +527,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      nullptr, 0, false, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
-    {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_new", description_pick_first_new,
      additional_constraints_pick_first_new, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,

src/core/lib/experiments/experiments.h

@@ -74,8 +74,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
-inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
@@ -113,8 +111,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
-inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
@@ -152,8 +148,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
-inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
@@ -189,7 +183,6 @@ enum ExperimentIds {
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
   kExperimentIdPeerStateBasedFraming,
-  kExperimentIdPendingQueueCap,
   kExperimentIdPickFirstNew,
   kExperimentIdPromiseBasedClientCall,
   kExperimentIdChaoticGood,
@@ -261,10 +254,6 @@ inline bool IsMultipingEnabled() {
 inline bool IsPeerStateBasedFramingEnabled() {
   return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
-inline bool IsPendingQueueCapEnabled() {
-  return IsExperimentEnabled(kExperimentIdPendingQueueCap);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() {
   return IsExperimentEnabled(kExperimentIdPickFirstNew);

src/core/lib/experiments/experiments.yaml

@@ -139,17 +139,6 @@
   expiry: 2024/08/01
   owner: vigneshbabu@google.com
   test_tags: ["flow_control_test"]
-- name: pending_queue_cap
-  description:
-    In the sync & async apis (but not the callback api), cap the number of
-    received but unrequested requests in the server for each call type.
-    A received message is one that was read from the wire on the server.
-    A requested message is one explicitly requested by the application using
-    grpc_server_request_call or grpc_server_request_registered_call (or their
-    wrappers in the C++ API).
-  expiry: 2024/05/05
-  owner: ctiller@google.com
-  test_tags: []
 - name: pick_first_new
   description: New pick_first impl with memory reduction.
   expiry: 2024/07/30

src/core/lib/gprpp/bitset.h

@@ -22,7 +22,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/lib/gprpp/per_cpu.cc

@@ -17,7 +17,7 @@
 #include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

src/core/lib/gprpp/posix/thd.cc

@@ -39,11 +39,11 @@
 #include <grpc/support/thd_id.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/fork.h"
 #include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/gprpp/thd.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 namespace {

src/core/lib/gprpp/time.h

@@ -27,8 +27,8 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/time_precise.h"
+#include "src/core/util/time_precise.h"
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 #define GRPC_LOG_EVERY_N_SEC(n, severity, format, ...)          \
   do {                                                          \

src/core/lib/gprpp/unique_type_name.h

@@ -23,7 +23,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 // Provides a type name that is unique by instance rather than by
 // string content.  This is useful in cases where there are different

src/core/lib/iomgr/endpoint_cfstream.cc

@@ -31,7 +31,6 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
@@ -41,6 +40,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
+#include "src/core/util/string.h"
 
 extern grpc_core::TraceFlag grpc_tcp_trace;
 

src/core/lib/iomgr/endpoint_pair_posix.cc

@@ -37,13 +37,13 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/iomgr/tcp_posix.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
 #include "src/core/lib/resource_quota/api.h"
+#include "src/core/util/string.h"
 
 static void create_sockets(int sv[2]) {
   int flags;

src/core/lib/iomgr/error.cc

@@ -36,9 +36,9 @@
 #endif
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/useful.h"
 
 grpc_core::DebugOnlyTraceFlag grpc_trace_error_refcount(false,
                                                         "error_refcount");

src/core/lib/iomgr/error.h

@@ -32,10 +32,10 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/spinlock.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/spinlock.h"
 
 /// Opaque representation of an error.
 

src/core/lib/iomgr/ev_epoll1_linux.cc

@@ -51,8 +51,6 @@
 
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/iomgr/block_annotate.h"
@@ -61,6 +59,8 @@
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/lockfree_event.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 static grpc_wakeup_fd global_wakeup_fd;
 static bool g_is_shutdown = true;

src/core/lib/iomgr/ev_poll_posix.cc

@@ -42,13 +42,13 @@
 
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.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/block_annotate.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
+#include "src/core/util/useful.h"
 
 #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1)
 

src/core/lib/iomgr/ev_posix.cc

@@ -34,12 +34,12 @@
 
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
+#include "src/core/util/useful.h"
 
 grpc_core::DebugOnlyTraceFlag grpc_polling_trace(
     false, "polling");  // Disabled by default

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

@@ -37,7 +37,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,6 +48,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"
+#include "src/core/util/string.h"
 
 extern grpc_core::TraceFlag grpc_tcp_trace;
 

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_

src/core/lib/iomgr/executor.cc

@@ -28,11 +28,11 @@
 #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
 

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 {
 

src/core/lib/iomgr/iomgr.cc

@@ -29,8 +29,6 @@
 #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 +38,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;

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 {