Merge remote-tracking branch 'upstream/master' into reorg_httpcli

CMakeLists.txt

@@ -2380,10 +2380,6 @@ add_library(grpc
   src/core/lib/iomgr/wakeup_fd_nospecial.cc
   src/core/lib/iomgr/wakeup_fd_pipe.cc
   src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json_object_loader.cc
-  src/core/lib/json/json_reader.cc
-  src/core/lib/json/json_util.cc
-  src/core/lib/json/json_writer.cc
   src/core/lib/matchers/matchers.cc
   src/core/lib/promise/activity.cc
   src/core/lib/promise/party.cc
@@ -2600,6 +2596,10 @@ add_library(grpc
   src/core/util/http_client/httpcli.cc
   src/core/util/http_client/httpcli_security_connector.cc
   src/core/util/http_client/parser.cc
+  src/core/util/json/json_object_loader.cc
+  src/core/util/json/json_reader.cc
+  src/core/util/json/json_util.cc
+  src/core/util/json/json_writer.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
@@ -3171,9 +3171,6 @@ add_library(grpc_unsecure
   src/core/lib/iomgr/wakeup_fd_nospecial.cc
   src/core/lib/iomgr/wakeup_fd_pipe.cc
   src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json_object_loader.cc
-  src/core/lib/json/json_reader.cc
-  src/core/lib/json/json_writer.cc
   src/core/lib/promise/activity.cc
   src/core/lib/promise/party.cc
   src/core/lib/promise/sleep.cc
@@ -3317,6 +3314,9 @@ add_library(grpc_unsecure
   src/core/util/http_client/format_request.cc
   src/core/util/http_client/httpcli.cc
   src/core/util/http_client/parser.cc
+  src/core/util/json/json_object_loader.cc
+  src/core/util/json/json_reader.cc
+  src/core/util/json/json_writer.cc
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
@@ -5288,8 +5288,6 @@ add_library(grpc_authorization_provider
   src/core/lib/iomgr/wakeup_fd_nospecial.cc
   src/core/lib/iomgr/wakeup_fd_pipe.cc
   src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json_reader.cc
-  src/core/lib/json/json_writer.cc
   src/core/lib/matchers/matchers.cc
   src/core/lib/promise/activity.cc
   src/core/lib/promise/party.cc
@@ -5387,6 +5385,8 @@ add_library(grpc_authorization_provider
   src/core/tsi/alts/handshaker/transport_security_common_api.cc
   src/core/tsi/transport_security.cc
   src/core/tsi/transport_security_grpc.cc
+  src/core/util/json/json_reader.cc
+  src/core/util/json/json_writer.cc
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
@@ -17917,7 +17917,6 @@ add_executable(interception_chain_test
   src/core/lib/iomgr/wakeup_fd_nospecial.cc
   src/core/lib/iomgr/wakeup_fd_pipe.cc
   src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json_writer.cc
   src/core/lib/promise/activity.cc
   src/core/lib/promise/party.cc
   src/core/lib/promise/trace.cc
@@ -17989,6 +17988,7 @@ add_executable(interception_chain_test
   src/core/telemetry/stats.cc
   src/core/telemetry/stats_data.cc
   src/core/tsi/alts/handshaker/transport_security_common_api.cc
+  src/core/util/json/json_writer.cc
   test/core/transport/interception_chain_test.cc
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c

Makefile

@@ -1239,10 +1239,6 @@ LIBGRPC_SRC = \
     src/core/lib/iomgr/wakeup_fd_nospecial.cc \
     src/core/lib/iomgr/wakeup_fd_pipe.cc \
     src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json_object_loader.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_util.cc \
-    src/core/lib/json/json_writer.cc \
     src/core/lib/matchers/matchers.cc \
     src/core/lib/promise/activity.cc \
     src/core/lib/promise/party.cc \
@@ -1463,6 +1459,10 @@ LIBGRPC_SRC = \
     src/core/util/http_client/httpcli_security_connector.cc \
     src/core/util/http_client/parser.cc \
     src/core/util/iphone/cpu.cc \
+    src/core/util/json/json_object_loader.cc \
+    src/core/util/json/json_reader.cc \
+    src/core/util/json/json_util.cc \
+    src/core/util/json/json_writer.cc \
     src/core/util/linux/cpu.cc \
     src/core/util/linux/log.cc \
     src/core/util/log.cc \

Package.swift

@@ -1459,17 +1459,6 @@ let package = Package(
         "src/core/lib/iomgr/wakeup_fd_pipe.h",
         "src/core/lib/iomgr/wakeup_fd_posix.cc",
         "src/core/lib/iomgr/wakeup_fd_posix.h",
-        "src/core/lib/json/json.h",
-        "src/core/lib/json/json_args.h",
-        "src/core/lib/json/json_channel_args.h",
-        "src/core/lib/json/json_object_loader.cc",
-        "src/core/lib/json/json_object_loader.h",
-        "src/core/lib/json/json_reader.cc",
-        "src/core/lib/json/json_reader.h",
-        "src/core/lib/json/json_util.cc",
-        "src/core/lib/json/json_util.h",
-        "src/core/lib/json/json_writer.cc",
-        "src/core/lib/json/json_writer.h",
         "src/core/lib/matchers/matchers.cc",
         "src/core/lib/matchers/matchers.h",
         "src/core/lib/promise/activity.cc",
@@ -1929,6 +1918,17 @@ let package = Package(
         "src/core/util/http_client/parser.cc",
         "src/core/util/http_client/parser.h",
         "src/core/util/iphone/cpu.cc",
+        "src/core/util/json/json.h",
+        "src/core/util/json/json_args.h",
+        "src/core/util/json/json_channel_args.h",
+        "src/core/util/json/json_object_loader.cc",
+        "src/core/util/json/json_object_loader.h",
+        "src/core/util/json/json_reader.cc",
+        "src/core/util/json/json_reader.h",
+        "src/core/util/json/json_util.cc",
+        "src/core/util/json/json_util.h",
+        "src/core/util/json/json_writer.cc",
+        "src/core/util/json/json_writer.h",
         "src/core/util/linux/cpu.cc",
         "src/core/util/linux/log.cc",
         "src/core/util/log.cc",

build_autogenerated.yaml

@@ -972,13 +972,6 @@ libs:
   - src/core/lib/iomgr/vsock.h
   - src/core/lib/iomgr/wakeup_fd_pipe.h
   - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_args.h
-  - src/core/lib/json/json_channel_args.h
-  - src/core/lib/json/json_object_loader.h
-  - src/core/lib/json/json_reader.h
-  - src/core/lib/json/json_util.h
-  - src/core/lib/json/json_writer.h
   - src/core/lib/matchers/matchers.h
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
@@ -1213,6 +1206,13 @@ libs:
   - src/core/util/http_client/httpcli.h
   - src/core/util/http_client/httpcli_ssl_credentials.h
   - src/core/util/http_client/parser.h
+  - src/core/util/json/json.h
+  - src/core/util/json/json_args.h
+  - src/core/util/json/json_channel_args.h
+  - src/core/util/json/json_object_loader.h
+  - src/core/util/json/json_reader.h
+  - src/core/util/json/json_util.h
+  - src/core/util/json/json_writer.h
   - src/core/util/spinlock.h
   - src/core/xds/grpc/certificate_provider_store.h
   - src/core/xds/grpc/file_watcher_certificate_provider_factory.h
@@ -1801,10 +1801,6 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_nospecial.cc
   - src/core/lib/iomgr/wakeup_fd_pipe.cc
   - src/core/lib/iomgr/wakeup_fd_posix.cc
-  - src/core/lib/json/json_object_loader.cc
-  - src/core/lib/json/json_reader.cc
-  - src/core/lib/json/json_util.cc
-  - src/core/lib/json/json_writer.cc
   - src/core/lib/matchers/matchers.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/promise/party.cc
@@ -2021,6 +2017,10 @@ libs:
   - src/core/util/http_client/httpcli.cc
   - src/core/util/http_client/httpcli_security_connector.cc
   - src/core/util/http_client/parser.cc
+  - src/core/util/json/json_object_loader.cc
+  - src/core/util/json/json_reader.cc
+  - src/core/util/json/json_util.cc
+  - src/core/util/json/json_writer.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
@@ -2508,12 +2508,6 @@ libs:
   - src/core/lib/iomgr/vsock.h
   - src/core/lib/iomgr/wakeup_fd_pipe.h
   - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_args.h
-  - src/core/lib/json/json_channel_args.h
-  - src/core/lib/json/json_object_loader.h
-  - src/core/lib/json/json_reader.h
-  - src/core/lib/json/json_writer.h
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
   - src/core/lib/promise/arena_promise.h
@@ -2683,6 +2677,12 @@ libs:
   - src/core/util/http_client/format_request.h
   - src/core/util/http_client/httpcli.h
   - src/core/util/http_client/parser.h
+  - src/core/util/json/json.h
+  - src/core/util/json/json_args.h
+  - src/core/util/json/json_channel_args.h
+  - src/core/util/json/json_object_loader.h
+  - src/core/util/json/json_reader.h
+  - src/core/util/json/json_writer.h
   - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -2952,9 +2952,6 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_nospecial.cc
   - src/core/lib/iomgr/wakeup_fd_pipe.cc
   - src/core/lib/iomgr/wakeup_fd_posix.cc
-  - src/core/lib/json/json_object_loader.cc
-  - src/core/lib/json/json_reader.cc
-  - src/core/lib/json/json_writer.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/promise/party.cc
   - src/core/lib/promise/sleep.cc
@@ -3098,6 +3095,9 @@ libs:
   - src/core/util/http_client/format_request.cc
   - src/core/util/http_client/httpcli.cc
   - src/core/util/http_client/parser.cc
+  - src/core/util/json/json_object_loader.cc
+  - src/core/util/json/json_reader.cc
+  - src/core/util/json/json_writer.cc
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
@@ -4596,10 +4596,6 @@ libs:
   - src/core/lib/iomgr/vsock.h
   - src/core/lib/iomgr/wakeup_fd_pipe.h
   - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_args.h
-  - src/core/lib/json/json_reader.h
-  - src/core/lib/json/json_writer.h
   - src/core/lib/matchers/matchers.h
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
@@ -4730,6 +4726,10 @@ libs:
   - src/core/tsi/transport_security.h
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
+  - src/core/util/json/json.h
+  - src/core/util/json/json_args.h
+  - src/core/util/json/json_reader.h
+  - src/core/util/json/json_writer.h
   - src/core/util/spinlock.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
@@ -4918,8 +4918,6 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_nospecial.cc
   - src/core/lib/iomgr/wakeup_fd_pipe.cc
   - src/core/lib/iomgr/wakeup_fd_posix.cc
-  - src/core/lib/json/json_reader.cc
-  - src/core/lib/json/json_writer.cc
   - src/core/lib/matchers/matchers.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/promise/party.cc
@@ -5017,6 +5015,8 @@ libs:
   - src/core/tsi/alts/handshaker/transport_security_common_api.cc
   - src/core/tsi/transport_security.cc
   - src/core/tsi/transport_security_grpc.cc
+  - src/core/util/json/json_reader.cc
+  - src/core/util/json/json_writer.cc
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
@@ -11755,9 +11755,6 @@ targets:
   - src/core/lib/iomgr/vsock.h
   - src/core/lib/iomgr/wakeup_fd_pipe.h
   - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_args.h
-  - src/core/lib/json/json_writer.h
   - src/core/lib/promise/activity.h
   - src/core/lib/promise/all_ok.h
   - src/core/lib/promise/arena_promise.h
@@ -11862,6 +11859,9 @@ targets:
   - src/core/telemetry/stats_data.h
   - src/core/telemetry/tcp_tracer.h
   - src/core/tsi/alts/handshaker/transport_security_common_api.h
+  - src/core/util/json/json.h
+  - src/core/util/json/json_args.h
+  - src/core/util/json/json_writer.h
   - src/core/util/spinlock.h
   - test/core/promise/poll_matcher.h
   - third_party/upb/upb/generated_code_support.h
@@ -12046,7 +12046,6 @@ targets:
   - src/core/lib/iomgr/wakeup_fd_nospecial.cc
   - src/core/lib/iomgr/wakeup_fd_pipe.cc
   - src/core/lib/iomgr/wakeup_fd_posix.cc
-  - src/core/lib/json/json_writer.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/promise/party.cc
   - src/core/lib/promise/trace.cc
@@ -12118,6 +12117,7 @@ targets:
   - src/core/telemetry/stats.cc
   - src/core/telemetry/stats_data.cc
   - src/core/tsi/alts/handshaker/transport_security_common_api.cc
+  - src/core/util/json/json_writer.cc
   - test/core/transport/interception_chain_test.cc
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c

config.m4

@@ -614,10 +614,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/iomgr/wakeup_fd_nospecial.cc \
     src/core/lib/iomgr/wakeup_fd_pipe.cc \
     src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json_object_loader.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_util.cc \
-    src/core/lib/json/json_writer.cc \
     src/core/lib/matchers/matchers.cc \
     src/core/lib/promise/activity.cc \
     src/core/lib/promise/party.cc \
@@ -838,6 +834,10 @@ if test "$PHP_GRPC" != "no"; then
     src/core/util/http_client/httpcli_security_connector.cc \
     src/core/util/http_client/parser.cc \
     src/core/util/iphone/cpu.cc \
+    src/core/util/json/json_object_loader.cc \
+    src/core/util/json/json_reader.cc \
+    src/core/util/json/json_util.cc \
+    src/core/util/json/json_writer.cc \
     src/core/util/linux/cpu.cc \
     src/core/util/linux/log.cc \
     src/core/util/log.cc \
@@ -1532,7 +1532,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota)
@@ -1603,6 +1602,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/android)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/http_client)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/iphone)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/json)
   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)

config.w32

@@ -579,10 +579,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\iomgr\\wakeup_fd_nospecial.cc " +
     "src\\core\\lib\\iomgr\\wakeup_fd_pipe.cc " +
     "src\\core\\lib\\iomgr\\wakeup_fd_posix.cc " +
-    "src\\core\\lib\\json\\json_object_loader.cc " +
-    "src\\core\\lib\\json\\json_reader.cc " +
-    "src\\core\\lib\\json\\json_util.cc " +
-    "src\\core\\lib\\json\\json_writer.cc " +
     "src\\core\\lib\\matchers\\matchers.cc " +
     "src\\core\\lib\\promise\\activity.cc " +
     "src\\core\\lib\\promise\\party.cc " +
@@ -803,6 +799,10 @@ if (PHP_GRPC != "no") {
     "src\\core\\util\\http_client\\httpcli_security_connector.cc " +
     "src\\core\\util\\http_client\\parser.cc " +
     "src\\core\\util\\iphone\\cpu.cc " +
+    "src\\core\\util\\json\\json_object_loader.cc " +
+    "src\\core\\util\\json\\json_reader.cc " +
+    "src\\core\\util\\json\\json_util.cc " +
+    "src\\core\\util\\json\\json_writer.cc " +
     "src\\core\\util\\linux\\cpu.cc " +
     "src\\core\\util\\linux\\log.cc " +
     "src\\core\\util\\log.cc " +
@@ -1669,7 +1669,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota");
@@ -1743,6 +1742,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\android");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\http_client");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\iphone");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\json");
   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");

gRPC-C++.podspec

@@ -1070,13 +1070,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/vsock.h',
                       'src/core/lib/iomgr/wakeup_fd_pipe.h',
                       'src/core/lib/iomgr/wakeup_fd_posix.h',
-                      'src/core/lib/json/json.h',
-                      'src/core/lib/json/json_args.h',
-                      'src/core/lib/json/json_channel_args.h',
-                      'src/core/lib/json/json_object_loader.h',
-                      'src/core/lib/json/json_reader.h',
-                      'src/core/lib/json/json_util.h',
-                      'src/core/lib/json/json_writer.h',
                       'src/core/lib/matchers/matchers.h',
                       'src/core/lib/promise/activity.h',
                       'src/core/lib/promise/all_ok.h',
@@ -1312,6 +1305,13 @@ Pod::Spec.new do |s|
                       'src/core/util/http_client/httpcli.h',
                       'src/core/util/http_client/httpcli_ssl_credentials.h',
                       'src/core/util/http_client/parser.h',
+                      'src/core/util/json/json.h',
+                      'src/core/util/json/json_args.h',
+                      'src/core/util/json/json_channel_args.h',
+                      'src/core/util/json/json_object_loader.h',
+                      'src/core/util/json/json_reader.h',
+                      'src/core/util/json/json_util.h',
+                      'src/core/util/json/json_writer.h',
                       'src/core/util/spinlock.h',
                       'src/core/util/string.h',
                       'src/core/util/time_precise.h',
@@ -2341,13 +2341,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/vsock.h',
                               'src/core/lib/iomgr/wakeup_fd_pipe.h',
                               'src/core/lib/iomgr/wakeup_fd_posix.h',
-                              'src/core/lib/json/json.h',
-                              'src/core/lib/json/json_args.h',
-                              'src/core/lib/json/json_channel_args.h',
-                              'src/core/lib/json/json_object_loader.h',
-                              'src/core/lib/json/json_reader.h',
-                              'src/core/lib/json/json_util.h',
-                              'src/core/lib/json/json_writer.h',
                               'src/core/lib/matchers/matchers.h',
                               'src/core/lib/promise/activity.h',
                               'src/core/lib/promise/all_ok.h',
@@ -2583,6 +2576,13 @@ Pod::Spec.new do |s|
                               'src/core/util/http_client/httpcli.h',
                               'src/core/util/http_client/httpcli_ssl_credentials.h',
                               'src/core/util/http_client/parser.h',
+                              'src/core/util/json/json.h',
+                              'src/core/util/json/json_args.h',
+                              'src/core/util/json/json_channel_args.h',
+                              'src/core/util/json/json_object_loader.h',
+                              'src/core/util/json/json_reader.h',
+                              'src/core/util/json/json_util.h',
+                              'src/core/util/json/json_writer.h',
                               'src/core/util/spinlock.h',
                               'src/core/util/string.h',
                               'src/core/util/time_precise.h',

gRPC-Core.podspec

@@ -1578,17 +1578,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/iomgr/wakeup_fd_pipe.h',
                       'src/core/lib/iomgr/wakeup_fd_posix.cc',
                       'src/core/lib/iomgr/wakeup_fd_posix.h',
-                      'src/core/lib/json/json.h',
-                      'src/core/lib/json/json_args.h',
-                      'src/core/lib/json/json_channel_args.h',
-                      'src/core/lib/json/json_object_loader.cc',
-                      'src/core/lib/json/json_object_loader.h',
-                      'src/core/lib/json/json_reader.cc',
-                      'src/core/lib/json/json_reader.h',
-                      'src/core/lib/json/json_util.cc',
-                      'src/core/lib/json/json_util.h',
-                      'src/core/lib/json/json_writer.cc',
-                      'src/core/lib/json/json_writer.h',
                       'src/core/lib/matchers/matchers.cc',
                       'src/core/lib/matchers/matchers.h',
                       'src/core/lib/promise/activity.cc',
@@ -2044,6 +2033,17 @@ Pod::Spec.new do |s|
                       'src/core/util/http_client/parser.cc',
                       'src/core/util/http_client/parser.h',
                       'src/core/util/iphone/cpu.cc',
+                      'src/core/util/json/json.h',
+                      'src/core/util/json/json_args.h',
+                      'src/core/util/json/json_channel_args.h',
+                      'src/core/util/json/json_object_loader.cc',
+                      'src/core/util/json/json_object_loader.h',
+                      'src/core/util/json/json_reader.cc',
+                      'src/core/util/json/json_reader.h',
+                      'src/core/util/json/json_util.cc',
+                      'src/core/util/json/json_util.h',
+                      'src/core/util/json/json_writer.cc',
+                      'src/core/util/json/json_writer.h',
                       'src/core/util/linux/cpu.cc',
                       'src/core/util/linux/log.cc',
                       'src/core/util/log.cc',
@@ -3121,13 +3121,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/iomgr/vsock.h',
                               'src/core/lib/iomgr/wakeup_fd_pipe.h',
                               'src/core/lib/iomgr/wakeup_fd_posix.h',
-                              'src/core/lib/json/json.h',
-                              'src/core/lib/json/json_args.h',
-                              'src/core/lib/json/json_channel_args.h',
-                              'src/core/lib/json/json_object_loader.h',
-                              'src/core/lib/json/json_reader.h',
-                              'src/core/lib/json/json_util.h',
-                              'src/core/lib/json/json_writer.h',
                               'src/core/lib/matchers/matchers.h',
                               'src/core/lib/promise/activity.h',
                               'src/core/lib/promise/all_ok.h',
@@ -3363,6 +3356,13 @@ Pod::Spec.new do |s|
                               'src/core/util/http_client/httpcli.h',
                               'src/core/util/http_client/httpcli_ssl_credentials.h',
                               'src/core/util/http_client/parser.h',
+                              'src/core/util/json/json.h',
+                              'src/core/util/json/json_args.h',
+                              'src/core/util/json/json_channel_args.h',
+                              'src/core/util/json/json_object_loader.h',
+                              'src/core/util/json/json_reader.h',
+                              'src/core/util/json/json_util.h',
+                              'src/core/util/json/json_writer.h',
                               'src/core/util/spinlock.h',
                               'src/core/util/string.h',
                               'src/core/util/time_precise.h',

grpc.gemspec

@@ -1465,17 +1465,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h )
   s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc )
   s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h )
-  s.files += %w( src/core/lib/json/json.h )
-  s.files += %w( src/core/lib/json/json_args.h )
-  s.files += %w( src/core/lib/json/json_channel_args.h )
-  s.files += %w( src/core/lib/json/json_object_loader.cc )
-  s.files += %w( src/core/lib/json/json_object_loader.h )
-  s.files += %w( src/core/lib/json/json_reader.cc )
-  s.files += %w( src/core/lib/json/json_reader.h )
-  s.files += %w( src/core/lib/json/json_util.cc )
-  s.files += %w( src/core/lib/json/json_util.h )
-  s.files += %w( src/core/lib/json/json_writer.cc )
-  s.files += %w( src/core/lib/json/json_writer.h )
   s.files += %w( src/core/lib/matchers/matchers.cc )
   s.files += %w( src/core/lib/matchers/matchers.h )
   s.files += %w( src/core/lib/promise/activity.cc )
@@ -1931,6 +1920,17 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/util/http_client/parser.cc )
   s.files += %w( src/core/util/http_client/parser.h )
   s.files += %w( src/core/util/iphone/cpu.cc )
+  s.files += %w( src/core/util/json/json.h )
+  s.files += %w( src/core/util/json/json_args.h )
+  s.files += %w( src/core/util/json/json_channel_args.h )
+  s.files += %w( src/core/util/json/json_object_loader.cc )
+  s.files += %w( src/core/util/json/json_object_loader.h )
+  s.files += %w( src/core/util/json/json_reader.cc )
+  s.files += %w( src/core/util/json/json_reader.h )
+  s.files += %w( src/core/util/json/json_util.cc )
+  s.files += %w( src/core/util/json/json_util.h )
+  s.files += %w( src/core/util/json/json_writer.cc )
+  s.files += %w( src/core/util/json/json_writer.h )
   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 )

package.xml

@@ -1447,17 +1447,6 @@
     <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_args.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_channel_args.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_object_loader.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_object_loader.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_reader.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_reader.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_util.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_util.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_writer.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/json/json_writer.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/matchers/matchers.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/matchers/matchers.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/activity.cc" role="src" />
@@ -1913,6 +1902,17 @@
     <file baseinstalldir="/" name="src/core/util/http_client/parser.cc" role="src" />
     <file baseinstalldir="/" name="src/core/util/http_client/parser.h" role="src" />
     <file baseinstalldir="/" name="src/core/util/iphone/cpu.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_args.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_channel_args.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_object_loader.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_object_loader.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_reader.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_reader.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_util.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_util.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_writer.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/json/json_writer.h" 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" />

src/core/BUILD

@@ -4524,7 +4524,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "json",
     hdrs = [
-        "lib/json/json.h",
+        "util/json/json.h",
     ],
     deps = ["//:gpr"],
 )
@@ -4532,10 +4532,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "json_reader",
     srcs = [
-        "lib/json/json_reader.cc",
+        "util/json/json_reader.cc",
     ],
     hdrs = [
-        "lib/json/json_reader.h",
+        "util/json/json_reader.h",
     ],
     external_deps = [
         "absl/base:core_headers",
@@ -4557,10 +4557,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "json_writer",
     srcs = [
-        "lib/json/json_writer.cc",
+        "util/json/json_writer.cc",
     ],
     hdrs = [
-        "lib/json/json_writer.h",
+        "util/json/json_writer.h",
     ],
     external_deps = ["absl/strings"],
     deps = [
@@ -4571,8 +4571,8 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "json_util",
-    srcs = ["lib/json/json_util.cc"],
-    hdrs = ["lib/json/json_util.h"],
+    srcs = ["util/json/json_util.cc"],
+    hdrs = ["util/json/json_util.h"],
     external_deps = ["absl/strings"],
     deps = [
         "error",
@@ -4588,15 +4588,15 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "json_args",
-    hdrs = ["lib/json/json_args.h"],
+    hdrs = ["util/json/json_args.h"],
     external_deps = ["absl/strings"],
     deps = ["//:gpr"],
 )
 
 grpc_cc_library(
     name = "json_object_loader",
-    srcs = ["lib/json/json_object_loader.cc"],
-    hdrs = ["lib/json/json_object_loader.h"],
+    srcs = ["util/json/json_object_loader.cc"],
+    hdrs = ["util/json/json_object_loader.h"],
     external_deps = [
         "absl/meta:type_traits",
         "absl/status",
@@ -4617,7 +4617,7 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "json_channel_args",
-    hdrs = ["lib/json/json_channel_args.h"],
+    hdrs = ["util/json/json_channel_args.h"],
     external_deps = [
         "absl/strings",
         "absl/types:optional",

src/core/channelz/channel_trace.h

@@ -30,7 +30,7 @@
 
 #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/json/json.h"
 
 namespace grpc_core {
 namespace channelz {

src/core/channelz/channelz.cc

@@ -38,9 +38,9 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.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/json/json_writer.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
 

src/core/channelz/channelz.h

@@ -42,7 +42,7 @@
 #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/json/json.h"
 #include "src/core/util/time_precise.h"
 #include "src/core/util/useful.h"
 

src/core/channelz/channelz_registry.cc

@@ -36,8 +36,8 @@
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
 namespace channelz {

src/core/client_channel/client_channel_filter.cc

@@ -79,7 +79,6 @@
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/latch.h"
@@ -103,6 +102,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/json/json.h"
 #include "src/core/util/useful.h"
 
 //

src/core/client_channel/client_channel_service_config.h

@@ -32,11 +32,11 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 namespace internal {

src/core/client_channel/retry_service_config.cc

@@ -35,7 +35,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/json/json_channel_args.h"
+#include "src/core/util/json/json_channel_args.h"
 
 // As per the retry design, we do not allow more than 5 retry attempts.
 #define MAX_MAX_RETRY_ATTEMPTS 5

src/core/client_channel/retry_service_config.h

@@ -32,10 +32,10 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 namespace internal {

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

@@ -35,10 +35,10 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 // Channel arg key for enabling parsing fault injection via method config.
 #define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \

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

@@ -34,12 +34,12 @@
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

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

@@ -31,10 +31,10 @@
 #include <grpc/grpc_audit_logging.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

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

@@ -31,10 +31,10 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 #include "src/core/lib/security/authorization/rbac_policy.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

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

@@ -32,10 +32,10 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 // Channel arg key for enabling parsing fault injection via method config.
 #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \

src/core/lib/security/authorization/rbac_translator.cc

@@ -37,10 +37,10 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/core/util/useful.h"
 
 namespace grpc_core {

src/core/lib/security/certificate_provider/certificate_provider_factory.h

@@ -30,8 +30,8 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 namespace grpc_core {
 

src/core/lib/security/credentials/channel_creds_registry.h

@@ -29,8 +29,8 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 struct grpc_channel_credentials;
 

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

@@ -34,9 +34,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
@@ -44,6 +41,9 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 #include "src/core/lib/security/credentials/tls/tls_credentials.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/lib/security/credentials/external/aws_external_account_credentials.cc

@@ -40,12 +40,12 @@
 
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
 

src/core/lib/security/credentials/external/external_account_credentials.cc

@@ -46,8 +46,6 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
@@ -56,6 +54,8 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \
   "urn:ietf:params:oauth:grant-type:token-exchange"

src/core/lib/security/credentials/external/external_account_credentials.h

@@ -33,10 +33,10 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/lib/security/credentials/external/file_external_account_credentials.cc

@@ -27,10 +27,10 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/load_file.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 
 namespace grpc_core {
 

src/core/lib/security/credentials/external/url_external_account_credentials.cc

@@ -38,12 +38,12 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 
 namespace grpc_core {
 

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

@@ -55,8 +55,6 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/iomgr/pollset.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
@@ -72,6 +70,8 @@
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 
 using grpc_core::Json;
 

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

@@ -45,9 +45,9 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/util/json_util.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 using grpc_core::Json;
 

src/core/lib/security/credentials/jwt/json_token.h

@@ -24,7 +24,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 // --- Constants. ---
 

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

@@ -40,14 +40,14 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/security/credentials/call_creds_util.h"
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 using grpc_core::Json;
 

src/core/lib/security/credentials/jwt/jwt_verifier.cc

@@ -63,7 +63,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/security/credentials/credentials.h"  // IWYU pragma: keep
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
@@ -72,6 +71,7 @@
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/core/util/string.h"
 
 using grpc_core::Json;

src/core/lib/security/credentials/jwt/jwt_verifier.h

@@ -26,7 +26,7 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 // --- Constants. ---
 

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

@@ -53,8 +53,6 @@
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
@@ -64,6 +62,8 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 
 using grpc_core::Json;
 

src/core/lib/security/credentials/oauth2/oauth2_credentials.h

@@ -40,7 +40,6 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
@@ -49,6 +48,7 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json.h"
 #include "src/core/util/useful.h"
 
 // Constants.

src/core/lib/security/util/json_util.h

@@ -22,7 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 // Constants.
 #define GRPC_AUTH_JSON_TYPE_INVALID "invalid"

src/core/load_balancing/endpoint_list.cc

@@ -38,12 +38,12 @@
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/grpclb/grpclb.cc

@@ -117,9 +117,6 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
@@ -141,6 +138,9 @@
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/fake/fake_resolver.h"
 #include "src/core/resolver/resolver.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
 

src/core/load_balancing/lb_policy_factory.h

@@ -24,8 +24,8 @@
 
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/lb_policy.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/lb_policy_registry.h

@@ -27,9 +27,9 @@
 
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/outlier_detection/outlier_detection.cc

@@ -62,7 +62,6 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/delegating_helper.h"
@@ -72,6 +71,7 @@
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/outlier_detection/outlier_detection.h

@@ -25,9 +25,9 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/pick_first/pick_first.cc

@@ -55,9 +55,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/health_check_client.h"
 #include "src/core/load_balancing/lb_policy.h"
@@ -65,6 +62,9 @@
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/telemetry/metrics.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/useful.h"
 
 namespace grpc_core {

src/core/load_balancing/priority/priority.cc

@@ -51,9 +51,6 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/address_filtering.h"
 #include "src/core/load_balancing/child_policy_handler.h"
@@ -62,6 +59,9 @@
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/ring_hash/ring_hash.cc

@@ -60,7 +60,6 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
@@ -68,6 +67,7 @@
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/ring_hash/ring_hash.h

@@ -23,10 +23,10 @@
 
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/service_config/service_config_call_data.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/rls/rls.cc

@@ -87,10 +87,6 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
@@ -107,6 +103,10 @@
 #include "src/core/resolver/resolver_registry.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/telemetry/metrics.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/proto/grpc/lookup/v1/rls.upb.h"
 
 using ::grpc_event_engine::experimental::EventEngine;

src/core/load_balancing/round_robin/round_robin.cc

@@ -44,12 +44,12 @@
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/work_serializer.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/endpoint_list.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc

@@ -58,9 +58,6 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/endpoint_list.h"
@@ -74,6 +71,9 @@
 #include "src/core/telemetry/metrics.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/weighted_target/weighted_target.cc

@@ -54,9 +54,6 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/address_filtering.h"
 #include "src/core/load_balancing/child_policy_handler.h"
@@ -65,6 +62,9 @@
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 // IWYU pragma: no_include <type_traits>
 

src/core/load_balancing/xds/cds.cc

@@ -49,10 +49,6 @@
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/load_balancing/address_filtering.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
@@ -61,6 +57,10 @@
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_health_status.h"

src/core/load_balancing/xds/xds_cluster_impl.cc

@@ -51,9 +51,6 @@
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/backend_metric_data.h"
@@ -67,6 +64,9 @@
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/xds/xds_dependency_manager.h"
 #include "src/core/telemetry/call_tracer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_client_grpc.h"
 #include "src/core/xds/grpc/xds_endpoint.h"

src/core/load_balancing/xds/xds_cluster_manager.cc

@@ -49,9 +49,6 @@
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/delegating_helper.h"
@@ -60,6 +57,9 @@
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/xds/xds_resolver_attributes.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/xds/xds_override_host.cc

@@ -70,9 +70,6 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/delegating_helper.h"
@@ -82,6 +79,9 @@
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/xds/grpc/xds_health_status.h"
 
 namespace grpc_core {

src/core/load_balancing/xds/xds_override_host.h

@@ -23,10 +23,10 @@
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/load_balancing/lb_policy.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/load_balancing/xds/xds_wrr_locality.cc

@@ -40,16 +40,16 @@
 #include "src/core/lib/gprpp/ref_counted_string.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/xds_client/xds_client_stats.h"
 
 namespace grpc_core {

src/core/resolver/dns/event_engine/service_config_helper.cc

@@ -25,11 +25,11 @@
 
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/gethostname.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
 

src/core/resolver/google_c2p/google_c2p_resolver.cc

@@ -43,14 +43,14 @@
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/resolver/resolver_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/xds_client_grpc.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 

src/core/service_config/service_config_impl.cc

@@ -31,14 +31,14 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
 

src/core/service_config/service_config_impl.h

@@ -35,10 +35,10 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
 
 // The main purpose of the code here is to parse the service config in
 // JSON form, which will look like this:

src/core/service_config/service_config_parser.h

@@ -30,7 +30,7 @@
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/util/json/json.h

@@ -14,16 +14,17 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_H
 
-#include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include <grpc/support/json.h>
+
 namespace grpc_core {
 
 using Json = experimental::Json;
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_H

src/core/util/json/json_args.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
-
-#include "absl/strings/string_view.h"
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 
 class JsonArgs {
@@ -31,4 +31,4 @@ class JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_ARGS_H

src/core/util/json/json_channel_args.h

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H
+
+#include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/json/json_args.h"
+#include "src/core/util/json/json_args.h"
 
 namespace grpc_core {
 
@@ -39,4 +39,4 @@ class JsonChannelArgs : public JsonArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_CHANNEL_ARGS_H

src/core/util/json/json_object_loader.cc

@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/json/json_object_loader.h"
+#include <grpc/support/port_platform.h>
+
+#include "src/core/util/json/json_object_loader.h"
 
 #include <utility>
 
@@ -21,7 +23,6 @@
 #include "absl/strings/strip.h"
 
 #include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 namespace json_detail {

src/core/util/json/json_object_loader.h

@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H
+
+#include <grpc/support/port_platform.h>
 
 #include <cstdint>
 #include <cstring>
@@ -30,14 +32,12 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 // Provides a means to load JSON objects into C++ objects, with the aim of
 // minimizing object code size.
@@ -642,4 +642,4 @@ absl::optional<T> LoadJsonObjectField(const Json::Object& json,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_OBJECT_LOADER_H

src/core/util/json/json_reader.cc

@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -35,10 +37,9 @@
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/match.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 #define GRPC_JSON_MAX_DEPTH 255
 #define GRPC_JSON_MAX_ERRORS 16

src/core/util/json/json_reader.h

@@ -14,15 +14,15 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H
+
+#include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -31,4 +31,4 @@ absl::StatusOr<Json> JsonParse(absl::string_view json_str);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_READER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_READER_H

src/core/util/json/json_util.cc

@@ -16,14 +16,14 @@
 //
 //
 
-#include "src/core/lib/json/json_util.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "src/core/util/json/json_util.h"
+
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/util/json/json_util.h

@@ -16,8 +16,10 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
+
+#include <grpc/support/port_platform.h>
 
 #include <algorithm>
 #include <map>
@@ -30,11 +32,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -161,4 +161,4 @@ bool ParseJsonObjectFieldAsDuration(const Json::Object& object,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H

src/core/util/json/json_writer.cc

@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -26,9 +28,7 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

src/core/util/json/json_writer.h

@@ -14,14 +14,14 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
-#define GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
-
-#include <string>
+#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H
+#define GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
+#include <string>
+
+#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 
@@ -30,4 +30,4 @@ std::string JsonDump(const Json& json, int indent = 0);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H
+#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_WRITER_H

src/core/xds/grpc/certificate_provider_store.h

@@ -34,12 +34,12 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/useful.h"
 
 namespace grpc_core {

src/core/xds/grpc/file_watcher_certificate_provider_factory.h

@@ -29,10 +29,10 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 

src/core/xds/grpc/xds_audit_logger_registry.h

@@ -26,7 +26,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {

src/core/xds/grpc/xds_bootstrap_grpc.cc

@@ -39,11 +39,11 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/util/string.h"
 
 namespace grpc_core {

src/core/xds/grpc/xds_bootstrap_grpc.h

@@ -31,10 +31,10 @@
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"

src/core/xds/grpc/xds_cluster.cc

@@ -63,9 +63,9 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"

src/core/xds/grpc/xds_cluster.h

@@ -35,8 +35,8 @@
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_health_status.h"

src/core/xds/grpc/xds_cluster_specifier_plugin.cc

@@ -33,8 +33,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
 

src/core/xds/grpc/xds_cluster_specifier_plugin.h

@@ -28,7 +28,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 
 namespace grpc_core {

src/core/xds/grpc/xds_common_types.cc

@@ -44,7 +44,7 @@
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/json/json_reader.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/xds_client/xds_client.h"

src/core/xds/grpc/xds_common_types.h

@@ -31,8 +31,8 @@
 
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {

src/core/xds/grpc/xds_http_fault_filter.cc

@@ -41,9 +41,9 @@
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/transport/status_conversion.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filters.h"
 

src/core/xds/grpc/xds_http_filters.h

@@ -35,8 +35,8 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 

src/core/xds/grpc/xds_http_rbac_filter.cc

@@ -47,8 +47,8 @@
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/util/string.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"

src/core/xds/grpc/xds_http_stateful_session_filter.cc

@@ -37,8 +37,8 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filters.h"

src/core/xds/grpc/xds_lb_policy_registry.h

@@ -26,7 +26,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {

src/core/xds/grpc/xds_route_config.cc

@@ -65,10 +65,10 @@
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/util/string.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"

src/core/xds/xds_client/xds_api.cc

@@ -47,7 +47,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/upb_utils.h"
 #include "src/core/xds/xds_client/xds_client.h"
 

src/core/xds/xds_client/xds_bootstrap.h

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

src/cpp/client/secure_credentials.cc

@@ -49,9 +49,9 @@
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/load_file.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/security/util/json_util.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/cpp/common/secure_auth_context.h"
 #include "src/cpp/server/thread_pool_interface.h"
 

src/cpp/ext/csm/metadata_exchange.cc

@@ -42,11 +42,11 @@
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/load_file.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/telemetry/call_tracer.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
+#include "src/core/util/json/json_reader.h"
 #include "src/cpp/ext/otel/key_value_iterable.h"
 
 namespace grpc {

src/cpp/ext/gcp/observability_config.cc

@@ -37,10 +37,10 @@
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_reader.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_reader.h"
 
 namespace grpc {
 namespace internal {