[reorg] move src/core/lib/config -> src/core/config (#37847)

Closes #37847

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37847 from markdroth:reorg_config 191c5460bc
PiperOrigin-RevId: 698957093

BUILD

@@ -2971,10 +2971,10 @@ grpc_filegroup(
 grpc_cc_library(
     name = "load_config",
     srcs = [
-        "//src/core:lib/config/load_config.cc",
+        "//src/core:config/load_config.cc",
     ],
     hdrs = [
-        "//src/core:lib/config/load_config.h",
+        "//src/core:config/load_config.h",
     ],
     external_deps = [
         "absl/flags:flag",
@@ -2992,11 +2992,11 @@ grpc_cc_library(
 grpc_cc_library(
     name = "config_vars",
     srcs = [
-        "//src/core:lib/config/config_vars.cc",
+        "//src/core:config/config_vars.cc",
-        "//src/core:lib/config/config_vars_non_generated.cc",
+        "//src/core:config/config_vars_non_generated.cc",
     ],
     hdrs = [
-        "//src/core:lib/config/config_vars.h",
+        "//src/core:config/config_vars.h",
     ],
     external_deps = [
         "absl/flags:flag",
@@ -3012,7 +3012,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "config",
     srcs = [
-        "//src/core:lib/config/core_configuration.cc",
+        "//src/core:config/core_configuration.cc",
     ],
     external_deps = [
         "absl/functional:any_invocable",
@@ -3020,7 +3020,7 @@ grpc_cc_library(
     ],
     language = "c++",
     public_hdrs = [
-        "//src/core:lib/config/core_configuration.h",
+        "//src/core:config/core_configuration.h",
     ],
     visibility = ["@grpc:client_channel"],
     deps = [

CMakeLists.txt

@@ -2036,9 +2036,9 @@ endif()
 
 
 add_library(gpr
-  src/core/lib/config/config_vars.cc
+  src/core/config/config_vars.cc
-  src/core/lib/config/config_vars_non_generated.cc
+  src/core/config/config_vars_non_generated.cc
-  src/core/lib/config/load_config.cc
+  src/core/config/load_config.cc
   src/core/lib/event_engine/thread_local.cc
   src/core/util/alloc.cc
   src/core/util/atm.cc
@@ -2224,6 +2224,7 @@ add_library(grpc
   src/core/client_channel/subchannel.cc
   src/core/client_channel/subchannel_pool_interface.cc
   src/core/client_channel/subchannel_stream_client.cc
+  src/core/config/core_configuration.cc
   src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   src/core/ext/filters/census/grpc_context.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -2621,7 +2622,6 @@ add_library(grpc
   src/core/lib/compression/compression.cc
   src/core/lib/compression/compression_internal.cc
   src/core/lib/compression/message_compress.cc
-  src/core/lib/config/core_configuration.cc
   src/core/lib/debug/trace.cc
   src/core/lib/debug/trace_flags.cc
   src/core/lib/event_engine/ares_resolver.cc
@@ -3344,6 +3344,7 @@ add_library(grpc_unsecure
   src/core/client_channel/subchannel.cc
   src/core/client_channel/subchannel_pool_interface.cc
   src/core/client_channel/subchannel_stream_client.cc
+  src/core/config/core_configuration.cc
   src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   src/core/ext/filters/census/grpc_context.cc
   src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -3431,7 +3432,6 @@ add_library(grpc_unsecure
   src/core/lib/compression/compression.cc
   src/core/lib/compression/compression_internal.cc
   src/core/lib/compression/message_compress.cc
-  src/core/lib/config/core_configuration.cc
   src/core/lib/debug/trace.cc
   src/core/lib/debug/trace_flags.cc
   src/core/lib/event_engine/ares_resolver.cc
@@ -5628,6 +5628,7 @@ add_library(grpc_authorization_provider
   src/core/channelz/channel_trace.cc
   src/core/channelz/channelz.cc
   src/core/channelz/channelz_registry.cc
+  src/core/config/core_configuration.cc
   src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
   src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -5653,7 +5654,6 @@ add_library(grpc_authorization_provider
   src/core/lib/compression/compression.cc
   src/core/lib/compression/compression_internal.cc
   src/core/lib/compression/message_compress.cc
-  src/core/lib/config/core_configuration.cc
   src/core/lib/debug/trace.cc
   src/core/lib/debug/trace_flags.cc
   src/core/lib/event_engine/ares_resolver.cc
@@ -9776,6 +9776,7 @@ add_executable(call_utils_test
   src/core/channelz/channel_trace.cc
   src/core/channelz/channelz.cc
   src/core/channelz/channelz_registry.cc
+  src/core/config/core_configuration.cc
   src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
   src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -9797,7 +9798,6 @@ add_executable(call_utils_test
   src/core/lib/compression/compression.cc
   src/core/lib/compression/compression_internal.cc
   src/core/lib/compression/message_compress.cc
-  src/core/lib/config/core_configuration.cc
   src/core/lib/debug/trace.cc
   src/core/lib/debug/trace_flags.cc
   src/core/lib/event_engine/ares_resolver.cc

Makefile

@@ -688,6 +688,10 @@ LIBGRPC_SRC = \
     src/core/client_channel/subchannel.cc \
     src/core/client_channel/subchannel_pool_interface.cc \
     src/core/client_channel/subchannel_stream_client.cc \
+    src/core/config/config_vars.cc \
+    src/core/config/config_vars_non_generated.cc \
+    src/core/config/core_configuration.cc \
+    src/core/config/load_config.cc \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
@@ -1085,10 +1089,6 @@ LIBGRPC_SRC = \
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/compression_internal.cc \
     src/core/lib/compression/message_compress.cc \
-    src/core/lib/config/config_vars.cc \
-    src/core/lib/config/config_vars_non_generated.cc \
-    src/core/lib/config/core_configuration.cc \
-    src/core/lib/config/load_config.cc \
     src/core/lib/debug/trace.cc \
     src/core/lib/debug/trace_flags.cc \
     src/core/lib/event_engine/ares_resolver.cc \

Package.swift

@@ -165,6 +165,13 @@ let package = Package(
         "src/core/client_channel/subchannel_pool_interface.h",
         "src/core/client_channel/subchannel_stream_client.cc",
         "src/core/client_channel/subchannel_stream_client.h",
+        "src/core/config/config_vars.cc",
+        "src/core/config/config_vars.h",
+        "src/core/config/config_vars_non_generated.cc",
+        "src/core/config/core_configuration.cc",
+        "src/core/config/core_configuration.h",
+        "src/core/config/load_config.cc",
+        "src/core/config/load_config.h",
         "src/core/ext/filters/backend_metrics/backend_metric_filter.cc",
         "src/core/ext/filters/backend_metrics/backend_metric_filter.h",
         "src/core/ext/filters/backend_metrics/backend_metric_provider.h",
@@ -1130,13 +1137,6 @@ let package = Package(
         "src/core/lib/compression/compression_internal.h",
         "src/core/lib/compression/message_compress.cc",
         "src/core/lib/compression/message_compress.h",
-        "src/core/lib/config/config_vars.cc",
-        "src/core/lib/config/config_vars.h",
-        "src/core/lib/config/config_vars_non_generated.cc",
-        "src/core/lib/config/core_configuration.cc",
-        "src/core/lib/config/core_configuration.h",
-        "src/core/lib/config/load_config.cc",
-        "src/core/lib/config/load_config.h",
         "src/core/lib/debug/trace.cc",
         "src/core/lib/debug/trace.h",
         "src/core/lib/debug/trace_flags.cc",

build_autogenerated.yaml

@@ -52,8 +52,8 @@ libs:
   - include/grpc/support/thd_id.h
   - include/grpc/support/time.h
   headers:
-  - src/core/lib/config/config_vars.h
+  - src/core/config/config_vars.h
-  - src/core/lib/config/load_config.h
+  - src/core/config/load_config.h
   - src/core/lib/event_engine/thread_local.h
   - src/core/util/alloc.h
   - src/core/util/construct_destruct.h
@@ -77,9 +77,9 @@ libs:
   - src/core/util/tmpfile.h
   - src/core/util/useful.h
   src:
-  - src/core/lib/config/config_vars.cc
+  - src/core/config/config_vars.cc
-  - src/core/lib/config/config_vars_non_generated.cc
+  - src/core/config/config_vars_non_generated.cc
-  - src/core/lib/config/load_config.cc
+  - src/core/config/load_config.cc
   - src/core/lib/event_engine/thread_local.cc
   - src/core/util/alloc.cc
   - src/core/util/atm.cc
@@ -245,6 +245,7 @@ libs:
   - src/core/client_channel/subchannel_interface_internal.h
   - src/core/client_channel/subchannel_pool_interface.h
   - src/core/client_channel/subchannel_stream_client.h
+  - src/core/config/core_configuration.h
   - src/core/ext/filters/backend_metrics/backend_metric_filter.h
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
@@ -813,7 +814,6 @@ libs:
   - src/core/lib/channel/status_util.h
   - src/core/lib/compression/compression_internal.h
   - src/core/lib/compression/message_compress.h
-  - src/core/lib/config/core_configuration.h
   - src/core/lib/debug/trace.h
   - src/core/lib/debug/trace_flags.h
   - src/core/lib/debug/trace_impl.h
@@ -1302,6 +1302,7 @@ libs:
   - src/core/client_channel/subchannel.cc
   - src/core/client_channel/subchannel_pool_interface.cc
   - src/core/client_channel/subchannel_stream_client.cc
+  - src/core/config/core_configuration.cc
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   - src/core/ext/filters/census/grpc_context.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -1699,7 +1700,6 @@ libs:
   - src/core/lib/compression/compression.cc
   - src/core/lib/compression/compression_internal.cc
   - src/core/lib/compression/message_compress.cc
-  - src/core/lib/config/core_configuration.cc
   - src/core/lib/debug/trace.cc
   - src/core/lib/debug/trace_flags.cc
   - src/core/lib/event_engine/ares_resolver.cc
@@ -2292,6 +2292,7 @@ libs:
   - src/core/client_channel/subchannel_interface_internal.h
   - src/core/client_channel/subchannel_pool_interface.h
   - src/core/client_channel/subchannel_stream_client.h
+  - src/core/config/core_configuration.h
   - src/core/ext/filters/backend_metrics/backend_metric_filter.h
   - src/core/ext/filters/backend_metrics/backend_metric_provider.h
   - src/core/ext/filters/channel_idle/idle_filter_state.h
@@ -2402,7 +2403,6 @@ libs:
   - src/core/lib/channel/status_util.h
   - src/core/lib/compression/compression_internal.h
   - src/core/lib/compression/message_compress.h
-  - src/core/lib/config/core_configuration.h
   - src/core/lib/debug/trace.h
   - src/core/lib/debug/trace_flags.h
   - src/core/lib/debug/trace_impl.h
@@ -2777,6 +2777,7 @@ libs:
   - src/core/client_channel/subchannel.cc
   - src/core/client_channel/subchannel_pool_interface.cc
   - src/core/client_channel/subchannel_stream_client.cc
+  - src/core/config/core_configuration.cc
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   - src/core/ext/filters/census/grpc_context.cc
   - src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -2864,7 +2865,6 @@ libs:
   - src/core/lib/compression/compression.cc
   - src/core/lib/compression/compression_internal.cc
   - src/core/lib/compression/message_compress.cc
-  - src/core/lib/config/core_configuration.cc
   - src/core/lib/debug/trace.cc
   - src/core/lib/debug/trace_flags.cc
   - src/core/lib/event_engine/ares_resolver.cc
@@ -4445,6 +4445,7 @@ libs:
   - src/core/channelz/channel_trace.h
   - src/core/channelz/channelz.h
   - src/core/channelz/channelz_registry.h
+  - src/core/config/core_configuration.h
   - src/core/ext/upb-gen/google/protobuf/any.upb.h
   - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
   - src/core/ext/upb-gen/google/rpc/status.upb.h
@@ -4478,7 +4479,6 @@ libs:
   - src/core/lib/channel/status_util.h
   - src/core/lib/compression/compression_internal.h
   - src/core/lib/compression/message_compress.h
-  - src/core/lib/config/core_configuration.h
   - src/core/lib/debug/trace.h
   - src/core/lib/debug/trace_flags.h
   - src/core/lib/debug/trace_impl.h
@@ -4788,6 +4788,7 @@ libs:
   - src/core/channelz/channel_trace.cc
   - src/core/channelz/channelz.cc
   - src/core/channelz/channelz_registry.cc
+  - src/core/config/core_configuration.cc
   - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
   - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -4813,7 +4814,6 @@ libs:
   - src/core/lib/compression/compression.cc
   - src/core/lib/compression/compression_internal.cc
   - src/core/lib/compression/message_compress.cc
-  - src/core/lib/config/core_configuration.cc
   - src/core/lib/debug/trace.cc
   - src/core/lib/debug/trace_flags.cc
   - src/core/lib/event_engine/ares_resolver.cc
@@ -6852,6 +6852,7 @@ targets:
   - src/core/channelz/channel_trace.h
   - src/core/channelz/channelz.h
   - src/core/channelz/channelz_registry.h
+  - src/core/config/core_configuration.h
   - src/core/ext/upb-gen/google/protobuf/any.upb.h
   - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
   - src/core/ext/upb-gen/google/rpc/status.upb.h
@@ -6881,7 +6882,6 @@ targets:
   - src/core/lib/channel/status_util.h
   - src/core/lib/compression/compression_internal.h
   - src/core/lib/compression/message_compress.h
-  - src/core/lib/config/core_configuration.h
   - src/core/lib/debug/trace.h
   - src/core/lib/debug/trace_flags.h
   - src/core/lib/debug/trace_impl.h
@@ -7163,6 +7163,7 @@ targets:
   - src/core/channelz/channel_trace.cc
   - src/core/channelz/channelz.cc
   - src/core/channelz/channelz_registry.cc
+  - src/core/config/core_configuration.cc
   - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
   - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -7184,7 +7185,6 @@ targets:
   - src/core/lib/compression/compression.cc
   - src/core/lib/compression/compression_internal.cc
   - src/core/lib/compression/message_compress.cc
-  - src/core/lib/config/core_configuration.cc
   - src/core/lib/debug/trace.cc
   - src/core/lib/debug/trace_flags.cc
   - src/core/lib/event_engine/ares_resolver.cc

config.m4

@@ -63,6 +63,10 @@ if test "$PHP_GRPC" != "no"; then
     src/core/client_channel/subchannel.cc \
     src/core/client_channel/subchannel_pool_interface.cc \
     src/core/client_channel/subchannel_stream_client.cc \
+    src/core/config/config_vars.cc \
+    src/core/config/config_vars_non_generated.cc \
+    src/core/config/core_configuration.cc \
+    src/core/config/load_config.cc \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
@@ -460,10 +464,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/compression/compression.cc \
     src/core/lib/compression/compression_internal.cc \
     src/core/lib/compression/message_compress.cc \
-    src/core/lib/config/config_vars.cc \
-    src/core/lib/config/config_vars_non_generated.cc \
-    src/core/lib/config/core_configuration.cc \
-    src/core/lib/config/load_config.cc \
     src/core/lib/debug/trace.cc \
     src/core/lib/debug/trace_flags.cc \
     src/core/lib/event_engine/ares_resolver.cc \
@@ -1416,6 +1416,7 @@ if test "$PHP_GRPC" != "no"; then
 
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/client_channel)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/config)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle)
@@ -1548,7 +1549,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/cf_engine)

config.w32

@@ -28,6 +28,10 @@ if (PHP_GRPC != "no") {
     "src\\core\\client_channel\\subchannel.cc " +
     "src\\core\\client_channel\\subchannel_pool_interface.cc " +
     "src\\core\\client_channel\\subchannel_stream_client.cc " +
+    "src\\core\\config\\config_vars.cc " +
+    "src\\core\\config\\config_vars_non_generated.cc " +
+    "src\\core\\config\\core_configuration.cc " +
+    "src\\core\\config\\load_config.cc " +
     "src\\core\\ext\\filters\\backend_metrics\\backend_metric_filter.cc " +
     "src\\core\\ext\\filters\\census\\grpc_context.cc " +
     "src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " +
@@ -425,10 +429,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\compression\\compression.cc " +
     "src\\core\\lib\\compression\\compression_internal.cc " +
     "src\\core\\lib\\compression\\message_compress.cc " +
-    "src\\core\\lib\\config\\config_vars.cc " +
-    "src\\core\\lib\\config\\config_vars_non_generated.cc " +
-    "src\\core\\lib\\config\\core_configuration.cc " +
-    "src\\core\\lib\\config\\load_config.cc " +
     "src\\core\\lib\\debug\\trace.cc " +
     "src\\core\\lib\\debug\\trace_flags.cc " +
     "src\\core\\lib\\event_engine\\ares_resolver.cc " +
@@ -1408,6 +1408,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\channelz");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\client_channel");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\config");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\backend_metrics");
@@ -1689,7 +1690,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\channel");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\config");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\debug");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\cf_engine");

gRPC-C++.podspec

@@ -294,6 +294,9 @@ Pod::Spec.new do |s|
                       'src/core/client_channel/subchannel_interface_internal.h',
                       'src/core/client_channel/subchannel_pool_interface.h',
                       'src/core/client_channel/subchannel_stream_client.h',
+                      'src/core/config/config_vars.h',
+                      'src/core/config/core_configuration.h',
+                      'src/core/config/load_config.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                       'src/core/ext/filters/channel_idle/idle_filter_state.h',
@@ -862,9 +865,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/status_util.h',
                       'src/core/lib/compression/compression_internal.h',
                       'src/core/lib/compression/message_compress.h',
-                      'src/core/lib/config/config_vars.h',
-                      'src/core/lib/config/core_configuration.h',
-                      'src/core/lib/config/load_config.h',
                       'src/core/lib/debug/trace.h',
                       'src/core/lib/debug/trace_flags.h',
                       'src/core/lib/debug/trace_impl.h',
@@ -1586,6 +1586,9 @@ Pod::Spec.new do |s|
                               'src/core/client_channel/subchannel_interface_internal.h',
                               'src/core/client_channel/subchannel_pool_interface.h',
                               'src/core/client_channel/subchannel_stream_client.h',
+                              'src/core/config/config_vars.h',
+                              'src/core/config/core_configuration.h',
+                              'src/core/config/load_config.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
@@ -2154,9 +2157,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/channel/status_util.h',
                               'src/core/lib/compression/compression_internal.h',
                               'src/core/lib/compression/message_compress.h',
-                              'src/core/lib/config/config_vars.h',
-                              'src/core/lib/config/core_configuration.h',
-                              'src/core/lib/config/load_config.h',
                               'src/core/lib/debug/trace.h',
                               'src/core/lib/debug/trace_flags.h',
                               'src/core/lib/debug/trace_impl.h',

gRPC-Core.podspec

@@ -285,6 +285,13 @@ Pod::Spec.new do |s|
                       'src/core/client_channel/subchannel_pool_interface.h',
                       'src/core/client_channel/subchannel_stream_client.cc',
                       'src/core/client_channel/subchannel_stream_client.h',
+                      'src/core/config/config_vars.cc',
+                      'src/core/config/config_vars.h',
+                      'src/core/config/config_vars_non_generated.cc',
+                      'src/core/config/core_configuration.cc',
+                      'src/core/config/core_configuration.h',
+                      'src/core/config/load_config.cc',
+                      'src/core/config/load_config.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
                       'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                       'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
@@ -1250,13 +1257,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/compression/compression_internal.h',
                       'src/core/lib/compression/message_compress.cc',
                       'src/core/lib/compression/message_compress.h',
-                      'src/core/lib/config/config_vars.cc',
-                      'src/core/lib/config/config_vars.h',
-                      'src/core/lib/config/config_vars_non_generated.cc',
-                      'src/core/lib/config/core_configuration.cc',
-                      'src/core/lib/config/core_configuration.h',
-                      'src/core/lib/config/load_config.cc',
-                      'src/core/lib/config/load_config.h',
                       'src/core/lib/debug/trace.cc',
                       'src/core/lib/debug/trace.h',
                       'src/core/lib/debug/trace_flags.cc',
@@ -2439,6 +2439,9 @@ Pod::Spec.new do |s|
                               'src/core/client_channel/subchannel_interface_internal.h',
                               'src/core/client_channel/subchannel_pool_interface.h',
                               'src/core/client_channel/subchannel_stream_client.h',
+                              'src/core/config/config_vars.h',
+                              'src/core/config/core_configuration.h',
+                              'src/core/config/load_config.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
                               'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
                               'src/core/ext/filters/channel_idle/idle_filter_state.h',
@@ -3007,9 +3010,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/channel/status_util.h',
                               'src/core/lib/compression/compression_internal.h',
                               'src/core/lib/compression/message_compress.h',
-                              'src/core/lib/config/config_vars.h',
-                              'src/core/lib/config/core_configuration.h',
-                              'src/core/lib/config/load_config.h',
                               'src/core/lib/debug/trace.h',
                               'src/core/lib/debug/trace_flags.h',
                               'src/core/lib/debug/trace_impl.h',

grpc.gemspec

@@ -171,6 +171,13 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/client_channel/subchannel_pool_interface.h )
   s.files += %w( src/core/client_channel/subchannel_stream_client.cc )
   s.files += %w( src/core/client_channel/subchannel_stream_client.h )
+  s.files += %w( src/core/config/config_vars.cc )
+  s.files += %w( src/core/config/config_vars.h )
+  s.files += %w( src/core/config/config_vars_non_generated.cc )
+  s.files += %w( src/core/config/core_configuration.cc )
+  s.files += %w( src/core/config/core_configuration.h )
+  s.files += %w( src/core/config/load_config.cc )
+  s.files += %w( src/core/config/load_config.h )
   s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.cc )
   s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.h )
   s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_provider.h )
@@ -1136,13 +1143,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/compression/compression_internal.h )
   s.files += %w( src/core/lib/compression/message_compress.cc )
   s.files += %w( src/core/lib/compression/message_compress.h )
-  s.files += %w( src/core/lib/config/config_vars.cc )
-  s.files += %w( src/core/lib/config/config_vars.h )
-  s.files += %w( src/core/lib/config/config_vars_non_generated.cc )
-  s.files += %w( src/core/lib/config/core_configuration.cc )
-  s.files += %w( src/core/lib/config/core_configuration.h )
-  s.files += %w( src/core/lib/config/load_config.cc )
-  s.files += %w( src/core/lib/config/load_config.h )
   s.files += %w( src/core/lib/debug/trace.cc )
   s.files += %w( src/core/lib/debug/trace.h )
   s.files += %w( src/core/lib/debug/trace_flags.cc )

package.xml

@@ -153,6 +153,13 @@
     <file baseinstalldir="/" name="src/core/client_channel/subchannel_pool_interface.h" role="src" />
     <file baseinstalldir="/" name="src/core/client_channel/subchannel_stream_client.cc" role="src" />
     <file baseinstalldir="/" name="src/core/client_channel/subchannel_stream_client.h" role="src" />
+    <file baseinstalldir="/" name="src/core/config/config_vars.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/config/config_vars.h" role="src" />
+    <file baseinstalldir="/" name="src/core/config/config_vars_non_generated.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/config/core_configuration.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/config/core_configuration.h" role="src" />
+    <file baseinstalldir="/" name="src/core/config/load_config.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/config/load_config.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_provider.h" role="src" />
@@ -1118,13 +1125,6 @@
     <file baseinstalldir="/" name="src/core/lib/compression/compression_internal.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/config_vars.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/config_vars.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/config_vars_non_generated.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/core_configuration.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/core_configuration.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/load_config.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/config/load_config.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/trace.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/trace.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/trace_flags.cc" role="src" />

src/core/client_channel/backup_poller.cc

@@ -25,7 +25,7 @@
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr.h"

src/core/client_channel/client_channel.cc

@@ -53,11 +53,11 @@
 #include "src/core/client_channel/local_subchannel_pool.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #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/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/resolved_address.h"

src/core/client_channel/client_channel_filter.cc

@@ -59,12 +59,12 @@
 #include "src/core/client_channel/retry_filter.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
-#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/iomgr/exec_ctx.h"

src/core/client_channel/client_channel_plugin.cc

@@ -23,8 +23,8 @@
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/retry_service_config.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 
 namespace grpc_core {

src/core/client_channel/client_channel_service_config.h

@@ -25,8 +25,8 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.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"

src/core/client_channel/direct_channel.cc

@@ -14,7 +14,7 @@
 
 #include "src/core/client_channel/direct_channel.h"
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/client_call.h"

src/core/client_channel/load_balanced_call_destination.cc

@@ -19,8 +19,8 @@
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/lb_metadata.h"
 #include "src/core/client_channel/subchannel.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/status_util.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/telemetry/call_tracer.h"
 

src/core/client_channel/retry_service_config.cc

@@ -30,9 +30,9 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #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/util/json/json_channel_args.h"
 
 // As per the retry design, we do not allow more than 5 retry attempts.

src/core/client_channel/retry_service_config.h

@@ -25,9 +25,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #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/service_config/service_config_parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"

src/core/client_channel/subchannel.cc

@@ -39,12 +39,12 @@
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
-#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/iomgr/exec_ctx.h"

src/core/config/config_vars.cc

@@ -16,13 +16,13 @@
 // Automatically generated by tools/codegen/core/gen_config_vars.py
 //
 
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 
 #include <grpc/support/port_platform.h>
 
 #include "absl/flags/flag.h"
 #include "absl/strings/escaping.h"
-#include "src/core/lib/config/load_config.h"
+#include "src/core/config/load_config.h"
 
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING
 #define GPR_DEFAULT_LOG_VERBOSITY_STRING ""

src/core/config/config_vars.h

@@ -16,8 +16,8 @@
 // Automatically generated by tools/codegen/core/gen_config_vars.py
 //
 
-#ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
+#ifndef GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H
-#define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
+#define GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H
 
 #include <grpc/support/port_platform.h>
 #include <stdint.h>
@@ -125,4 +125,4 @@ class GPR_DLL ConfigVars {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
+#endif  // GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H

src/core/config/config_vars_non_generated.cc

@@ -17,7 +17,7 @@
 #include <atomic>
 #include <string>
 
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 
 namespace grpc_core {
 

src/core/config/core_configuration.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 #include <grpc/support/port_platform.h>
 

src/core/config/core_configuration.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
+#ifndef GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H
-#define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
+#define GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H
 
 #include <grpc/support/port_platform.h>
 
@@ -239,4 +239,4 @@ extern void BuildCoreConfiguration(CoreConfiguration::Builder* builder);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
+#endif  // GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H

src/core/config/load_config.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/config/load_config.h"
+#include "src/core/config/load_config.h"
 
 #include <grpc/support/port_platform.h>
 #include <stdio.h>

src/core/config/load_config.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
+#ifndef GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H
-#define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
+#define GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H
 
 #include <grpc/support/port_platform.h>
 #include <stdint.h>
@@ -51,4 +51,4 @@ std::string LoadConfig(const absl::Flag<std::vector<std::string>>& flag,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
+#endif  // GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H

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

@@ -26,9 +26,9 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#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/promise/context.h"

src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc

@@ -28,9 +28,9 @@
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#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/iomgr/closure.h"

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

@@ -35,10 +35,10 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/sleep.h"

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

@@ -28,8 +28,8 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.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"

src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc

@@ -22,9 +22,9 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/security/context/security_context.h"

src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h

@@ -25,8 +25,8 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.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"

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

@@ -27,8 +27,8 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"

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

@@ -19,12 +19,12 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/match.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/transport.h"

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

@@ -41,13 +41,13 @@
 #include "absl/types/optional.h"
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"

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

@@ -45,11 +45,11 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/context.h"

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

@@ -26,9 +26,9 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"

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

@@ -26,10 +26,10 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#include "src/core/lib/config/core_configuration.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"

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

@@ -24,10 +24,10 @@
 #include <utility>
 
 #include "absl/status/status.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/promise.h"

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

@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.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"

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

@@ -35,9 +35,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/map.h"

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

@@ -26,8 +26,8 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.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"

src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc

@@ -28,6 +28,7 @@
 #include "absl/status/statusor.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.h"
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
@@ -35,7 +36,6 @@
 #include "src/core/ext/transport/chaotic_good_legacy/client/chaotic_good_connector.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h"

src/core/ext/transport/chaotic_good_legacy/client/chaotic_good_connector.cc

@@ -28,13 +28,13 @@
 #include "absl/status/statusor.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/chaotic_good_legacy/client_transport.h"
 #include "src/core/ext/transport/chaotic_good_legacy/frame.h"
 #include "src/core/ext/transport/chaotic_good_legacy/frame_header.h"
 #include "src/core/ext/transport/chaotic_good_legacy/settings_metadata.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h"

src/core/ext/transport/chttp2/client/chttp2_connector.cc

@@ -42,6 +42,7 @@
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_registry.h"
@@ -49,7 +50,6 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/endpoint.h"

src/core/ext/transport/chttp2/server/chttp2_server.cc

@@ -47,6 +47,7 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
@@ -54,7 +55,6 @@
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"

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

@@ -55,6 +55,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
@@ -73,7 +74,6 @@
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 #include "src/core/ext/transport/chttp2/transport/write_size_policy.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/extensions/tcp_trace.h"
 #include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/experiments/experiments.h"

src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc

@@ -23,10 +23,10 @@
 
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/cronet/transport/cronet_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_create.h"

src/core/ext/transport/inproc/inproc_transport.cc

@@ -23,8 +23,8 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/promise.h"

src/core/ext/transport/inproc/legacy_inproc_transport.cc

@@ -42,9 +42,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"

src/core/handshaker/endpoint_info/endpoint_info_handshaker.h

@@ -19,7 +19,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 // Set by the handshaker to indicate the local address of the endpoint.
 #define GRPC_ARG_ENDPOINT_LOCAL_ADDRESS "grpc.internal.endpoint_local_address"

src/core/handshaker/http_connect/http_connect_handshaker.cc

@@ -35,11 +35,11 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #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/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"

src/core/handshaker/http_connect/http_connect_handshaker.h

@@ -21,7 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 /// Channel arg indicating the server in HTTP CONNECT request (string).
 /// The presence of this arg triggers the use of HTTP CONNECT.

src/core/handshaker/http_connect/http_proxy_mapper.h

@@ -25,9 +25,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {

src/core/handshaker/http_connect/xds_http_proxy_mapper.h

@@ -21,9 +21,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {

src/core/handshaker/security/security_handshaker.cc

@@ -42,12 +42,12 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/security/secure_endpoint.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"

src/core/handshaker/security/security_handshaker.h

@@ -23,9 +23,9 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/ref_counted_ptr.h"

src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc

@@ -32,12 +32,12 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"

src/core/handshaker/tcp_connect/tcp_connect_handshaker.h

@@ -19,7 +19,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 // Indicates the address that the tcp connect handshaker should connect to.
 #define GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS \

src/core/lib/channel/connected_channel.cc

@@ -34,11 +34,11 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#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/iomgr/call_combiner.h"

src/core/lib/debug/trace.cc

@@ -31,7 +31,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/util/glob.h"
 
 int grpc_tracer_set_enabled(const char* name, int enabled);

src/core/lib/event_engine/ares_resolver.cc

@@ -60,9 +60,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/time_util.h"

src/core/lib/event_engine/default_event_engine.cc

@@ -21,8 +21,8 @@
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine_factory.h"
 #include "src/core/util/debug_location.h"

src/core/lib/event_engine/default_event_engine.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/util/debug_location.h"
 
 namespace grpc_event_engine {

src/core/lib/event_engine/forkable.cc

@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 
 namespace grpc_event_engine {

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

@@ -19,7 +19,7 @@
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
 #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h"

src/core/lib/experiments/config.cc

@@ -31,7 +31,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 #include "src/core/util/no_destruct.h"

src/core/lib/iomgr/ev_posix.cc

@@ -30,7 +30,7 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"

src/core/lib/iomgr/iomgr.cc

@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "absl/log/log.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/iomgr/buffer_list.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"

src/core/lib/resource_quota/api.h

@@ -20,7 +20,7 @@
 #include <grpc/support/port_platform.h>
 #include <stddef.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 
 typedef struct grpc_resource_quota grpc_resource_quota;

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

@@ -29,7 +29,7 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.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"

src/core/lib/security/security_connector/load_system_roots_supported.cc

@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #include "absl/log/log.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/lib/security/security_connector/load_system_roots_supported.h"

src/core/lib/security/security_connector/ssl_utils.cc

@@ -38,9 +38,9 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/tsi/ssl_transport_security.h"

src/core/lib/surface/channel_create.cc

@@ -24,8 +24,8 @@
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/direct_channel.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_stack_type.h"

src/core/lib/surface/init.cc

@@ -32,7 +32,7 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "src/core/client_channel/backup_poller.h"
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 #include "src/core/lib/experiments/config.h"

src/core/lib/surface/lame_client.cc

@@ -28,11 +28,11 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/pipe.h"

src/core/lib/surface/legacy_channel.cc

@@ -31,11 +31,11 @@
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"

src/core/load_balancing/child_policy_handler.cc

@@ -27,8 +27,8 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/transport/connectivity_state.h"

src/core/load_balancing/endpoint_list.cc

@@ -30,8 +30,8 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"

src/core/load_balancing/grpclb/grpclb.cc

@@ -93,9 +93,9 @@
 #include "absl/types/variant.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#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/iomgr/closure.h"

src/core/load_balancing/outlier_detection/outlier_detection.cc

@@ -43,9 +43,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#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/iomgr/exec_ctx.h"

src/core/load_balancing/pick_first/pick_first.cc

@@ -39,9 +39,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#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/iomgr/exec_ctx.h"

src/core/load_balancing/priority/priority.cc

@@ -37,8 +37,8 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"

src/core/load_balancing/ring_hash/ring_hash.cc

@@ -41,9 +41,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/client_channel/client_channel_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"

src/core/load_balancing/rls/rls.cc

@@ -64,8 +64,8 @@
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"

src/core/load_balancing/round_robin/round_robin.cc

@@ -35,8 +35,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/endpoint_list.h"

src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc

@@ -42,8 +42,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#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/iomgr/exec_ctx.h"

src/core/load_balancing/weighted_target/weighted_target.cc

@@ -40,8 +40,8 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"

src/core/load_balancing/xds/cds.cc

@@ -36,8 +36,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/address_filtering.h"

src/core/load_balancing/xds/xds_cluster_impl.cc

@@ -36,8 +36,8 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "src/core/client_channel/client_channel_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"

src/core/load_balancing/xds/xds_cluster_manager.cc

@@ -36,8 +36,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/client_channel/client_channel_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset_set.h"

src/core/load_balancing/xds/xds_override_host.cc

@@ -46,11 +46,11 @@
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
 #include "src/core/client_channel/client_channel_internal.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #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/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/closure.h"

src/core/load_balancing/xds/xds_wrr_locality.cc

@@ -30,8 +30,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"

src/core/plugin_registry/grpc_plugin_registry.cc

@@ -19,10 +19,10 @@
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/lame_client.h"
 #include "src/core/server/server.h"

src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -17,7 +17,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 namespace grpc_core {
 #ifndef GRPC_NO_XDS

src/core/plugin_registry/grpc_plugin_registry_noextra.cc

@@ -17,7 +17,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 namespace grpc_core {
 void RegisterExtraFilters(CoreConfiguration::Builder* /* builder */) {}

src/core/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -34,7 +34,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
@@ -58,8 +58,8 @@
 #include <address_sorting/address_sorting.h>
 
 #include "absl/strings/str_cat.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"