From 7570d8b5450e12f6aa7cba46439d565982e911c9 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 22 Nov 2024 00:34:23 +0000 Subject: [PATCH] [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 191c5460bc2b9c974bf76a3eedc876963d296f47 PiperOrigin-RevId: 698957093 --- BUILD | 14 +++++----- CMakeLists.txt | 14 +++++----- Makefile | 8 +++--- Package.swift | 14 +++++----- build_autogenerated.yaml | 26 +++++++++---------- config.m4 | 10 +++---- config.w32 | 10 +++---- gRPC-C++.podspec | 12 ++++----- gRPC-Core.podspec | 20 +++++++------- grpc.gemspec | 14 +++++----- package.xml | 14 +++++----- src/core/client_channel/backup_poller.cc | 2 +- src/core/client_channel/client_channel.cc | 2 +- .../client_channel/client_channel_filter.cc | 2 +- .../client_channel/client_channel_plugin.cc | 2 +- .../client_channel_service_config.h | 2 +- src/core/client_channel/direct_channel.cc | 2 +- .../load_balanced_call_destination.cc | 2 +- .../client_channel/retry_service_config.cc | 2 +- .../client_channel/retry_service_config.h | 2 +- src/core/client_channel/subchannel.cc | 2 +- src/core/{lib => }/config/config_vars.cc | 4 +-- src/core/{lib => }/config/config_vars.h | 6 ++--- src/core/{lib => }/config/config_vars.yaml | 0 .../config/config_vars_non_generated.cc | 2 +- .../{lib => }/config/core_configuration.cc | 2 +- .../{lib => }/config/core_configuration.h | 6 ++--- src/core/{lib => }/config/load_config.cc | 2 +- src/core/{lib => }/config/load_config.h | 6 ++--- .../backend_metrics/backend_metric_filter.cc | 2 +- .../legacy_channel_idle_filter.cc | 2 +- .../fault_injection/fault_injection_filter.cc | 2 +- .../fault_injection_service_config_parser.h | 2 +- .../gcp_authentication_filter.cc | 2 +- ...gcp_authentication_service_config_parser.h | 2 +- .../filters/http/client_authority_filter.cc | 2 +- .../ext/filters/http/http_filters_plugin.cc | 2 +- .../server_load_reporting_filter.cc | 2 +- .../ext/filters/logging/logging_filter.cc | 2 +- .../message_size/message_size_filter.cc | 2 +- .../message_size/message_size_filter.h | 2 +- src/core/ext/filters/rbac/rbac_filter.cc | 2 +- .../filters/rbac/rbac_service_config_parser.h | 2 +- .../stateful_session_filter.cc | 2 +- .../stateful_session_service_config_parser.h | 2 +- .../client/chaotic_good_connector.cc | 2 +- .../client/chaotic_good_connector.cc | 2 +- .../chttp2/client/chttp2_connector.cc | 2 +- .../transport/chttp2/server/chttp2_server.cc | 2 +- .../chttp2/transport/chttp2_transport.cc | 2 +- .../client/secure/cronet_channel_create.cc | 2 +- .../ext/transport/inproc/inproc_transport.cc | 2 +- .../inproc/legacy_inproc_transport.cc | 2 +- .../endpoint_info/endpoint_info_handshaker.h | 2 +- .../http_connect/http_connect_handshaker.cc | 2 +- .../http_connect/http_connect_handshaker.h | 2 +- .../http_connect/http_proxy_mapper.h | 2 +- .../http_connect/xds_http_proxy_mapper.h | 2 +- .../security/security_handshaker.cc | 2 +- .../handshaker/security/security_handshaker.h | 2 +- .../tcp_connect/tcp_connect_handshaker.cc | 2 +- .../tcp_connect/tcp_connect_handshaker.h | 2 +- src/core/lib/channel/connected_channel.cc | 2 +- src/core/lib/debug/trace.cc | 2 +- src/core/lib/event_engine/ares_resolver.cc | 2 +- .../lib/event_engine/default_event_engine.cc | 2 +- .../lib/event_engine/default_event_engine.h | 2 +- src/core/lib/event_engine/forkable.cc | 2 +- .../event_poller_posix_default.cc | 2 +- src/core/lib/experiments/config.cc | 2 +- src/core/lib/iomgr/ev_posix.cc | 2 +- src/core/lib/iomgr/iomgr.cc | 2 +- src/core/lib/resource_quota/api.h | 2 +- .../channel_creds_registry_init.cc | 2 +- .../load_system_roots_supported.cc | 2 +- .../security/security_connector/ssl_utils.cc | 2 +- src/core/lib/surface/channel_create.cc | 2 +- src/core/lib/surface/init.cc | 2 +- src/core/lib/surface/lame_client.cc | 2 +- src/core/lib/surface/legacy_channel.cc | 2 +- .../load_balancing/child_policy_handler.cc | 2 +- src/core/load_balancing/endpoint_list.cc | 2 +- src/core/load_balancing/grpclb/grpclb.cc | 2 +- .../outlier_detection/outlier_detection.cc | 2 +- .../load_balancing/pick_first/pick_first.cc | 2 +- src/core/load_balancing/priority/priority.cc | 2 +- .../load_balancing/ring_hash/ring_hash.cc | 2 +- src/core/load_balancing/rls/rls.cc | 2 +- .../load_balancing/round_robin/round_robin.cc | 2 +- .../weighted_round_robin.cc | 2 +- .../weighted_target/weighted_target.cc | 2 +- src/core/load_balancing/xds/cds.cc | 2 +- .../load_balancing/xds/xds_cluster_impl.cc | 2 +- .../load_balancing/xds/xds_cluster_manager.cc | 2 +- .../load_balancing/xds/xds_override_host.cc | 2 +- .../load_balancing/xds/xds_wrr_locality.cc | 2 +- .../plugin_registry/grpc_plugin_registry.cc | 2 +- .../grpc_plugin_registry_extra.cc | 2 +- .../grpc_plugin_registry_noextra.cc | 2 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 4 +-- .../resolver/dns/c_ares/dns_resolver_ares.h | 2 +- src/core/resolver/dns/dns_resolver_plugin.cc | 2 +- src/core/resolver/dns/dns_resolver_plugin.h | 2 +- src/core/resolver/dns/native/dns_resolver.cc | 2 +- src/core/resolver/dns/native/dns_resolver.h | 2 +- src/core/resolver/fake/fake_resolver.cc | 2 +- .../google_c2p/google_c2p_resolver.cc | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 2 +- .../resolver/xds/xds_dependency_manager.cc | 2 +- src/core/resolver/xds/xds_resolver.cc | 2 +- src/core/server/server.cc | 2 +- src/core/server/server_call_tracer_filter.cc | 2 +- src/core/server/server_call_tracer_filter.h | 2 +- src/core/server/xds_channel_stack_modifier.cc | 2 +- src/core/server/xds_server_config_fetcher.cc | 2 +- .../service_config_channel_arg_filter.cc | 2 +- .../service_config/service_config_impl.cc | 2 +- src/core/util/fork.cc | 2 +- src/core/util/http_client/httpcli.cc | 2 +- src/core/util/log.cc | 2 +- .../xds/grpc/certificate_provider_store.cc | 2 +- ...le_watcher_certificate_provider_factory.cc | 2 +- src/core/xds/grpc/xds_cluster_parser.cc | 2 +- src/core/xds/grpc/xds_lb_policy_registry.cc | 2 +- src/core/xds/grpc/xds_route_config_parser.cc | 2 +- src/core/xds/grpc/xds_server_grpc.cc | 2 +- src/core/xds/grpc/xds_transport_grpc.cc | 2 +- src/cpp/ext/filters/census/grpc_plugin.cc | 2 +- src/cpp/ext/otel/otel_plugin.cc | 2 +- src/cpp/ext/proto_server_reflection_plugin.cc | 2 +- .../grpcio/grpc/_cython/_cygrpc/grpc.pxi | 2 +- src/python/grpcio/grpc_core_dependencies.py | 8 +++--- .../observability_lib_deps.py | 6 ++--- test/core/bad_client/bad_client.cc | 2 +- test/core/call/yodel/fuzzer_main.cc | 2 +- test/core/call/yodel/yodel_test.cc | 2 +- test/core/channel/channel_stack_test.cc | 2 +- .../channel/minimal_stack_is_minimal_test.cc | 2 +- .../client_channel_service_config_test.cc | 2 +- .../client_channel/client_channel_test.cc | 2 +- .../connected_subchannel_test.cc | 2 +- .../retry_service_config_test.cc | 2 +- test/core/config/core_configuration_test.cc | 2 +- test/core/config/load_config_test.cc | 2 +- test/core/end2end/end2end_test_fuzzer.cc | 2 +- test/core/end2end/end2end_test_main.cc | 2 +- test/core/end2end/end2end_tests.cc | 2 +- test/core/end2end/end2end_tests.h | 2 +- .../end2end/fixtures/http_proxy_fixture.cc | 2 +- test/core/end2end/fixtures/sockpair_fixture.h | 2 +- test/core/end2end/fuzzers/client_fuzzer.cc | 2 +- test/core/end2end/fuzzers/network_input.cc | 2 +- test/core/end2end/fuzzers/server_fuzzer.cc | 2 +- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../core/end2end/h2_ssl_session_reuse_test.cc | 2 +- ...ls_peer_property_external_verifier_test.cc | 2 +- .../core/end2end/tests/filter_causes_close.cc | 2 +- test/core/end2end/tests/filter_init_fails.cc | 2 +- test/core/end2end/tests/http2_stats.cc | 2 +- test/core/end2end/tests/keepalive_timeout.cc | 2 +- ...retry_cancel_with_multiple_send_batches.cc | 2 +- test/core/end2end/tests/retry_lb_drop.cc | 2 +- test/core/end2end/tests/retry_lb_fail.cc | 2 +- .../tests/retry_recv_message_replay.cc | 2 +- .../retry_recv_trailing_metadata_error.cc | 2 +- .../core/end2end/tests/retry_send_op_fails.cc | 2 +- .../end2end/tests/retry_transparent_goaway.cc | 2 +- .../retry_transparent_not_sent_on_wire.cc | 2 +- test/core/event_engine/forkable_test.cc | 2 +- .../posix/event_poller_posix_test.cc | 2 +- .../event_engine/posix/posix_endpoint_test.cc | 2 +- .../posix_event_engine_native_dns_test.cc | 2 +- .../event_engine/test_suite/tests/dns_test.cc | 2 +- .../test_suite/tools/echo_client.cc | 2 +- test/core/experiments/experiments_tag_test.cc | 2 +- .../readahead_handshaker_server_ssl.cc | 2 +- test/core/http/httpcli_test_util.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 2 +- test/core/iomgr/resolve_address_test.cc | 2 +- test/core/load_balancing/bm_picker.cc | 2 +- test/core/load_balancing/lb_policy_test_lib.h | 2 +- test/core/memory_usage/memory_usage_test.cc | 2 +- .../message_size_service_config_test.cc | 2 +- .../resolver/dns_resolver_cooldown_test.cc | 2 +- test/core/resolver/dns_resolver_test.cc | 4 +-- test/core/resolver/fake_resolver_test.cc | 2 +- test/core/resolver/sockaddr_resolver_test.cc | 2 +- .../security/channel_creds_registry_test.cc | 2 +- .../grpc_tls_credentials_options_test.cc | 2 +- test/core/security/security_connector_test.cc | 2 +- .../security/tls_security_connector_test.cc | 2 +- .../server/xds_channel_stack_modifier_test.cc | 2 +- .../service_config/service_config_test.cc | 2 +- .../surface/concurrent_connectivity_test.cc | 2 +- .../surface/secure_channel_create_test.cc | 2 +- test/core/test_util/fake_stats_plugin.cc | 2 +- test/core/test_util/fuzz_config_vars.h | 2 +- test/core/test_util/test_lb_policies.cc | 2 +- test/core/test_util/test_lb_policies.h | 2 +- test/core/test_util/test_tcp_server.cc | 2 +- .../client_transport_error_test.cc | 2 +- .../chaotic_good/client_transport_test.cc | 2 +- .../client_transport_error_test.cc | 2 +- .../client_transport_test.cc | 2 +- .../remove_stream_from_stalled_lists_test.cc | 2 +- .../transport/chttp2/settings_timeout_test.cc | 2 +- .../transport/chttp2/streams_not_seen_test.cc | 2 +- .../transport/test_suite/inproc_fixture.cc | 2 +- .../xds/certificate_provider_store_test.cc | 2 +- test/core/xds/xds_bootstrap_test.cc | 2 +- test/core/xds/xds_lb_policy_registry_test.cc | 2 +- test/cpp/end2end/async_end2end_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- test/cpp/end2end/end2end_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 2 +- .../server_load_reporting_end2end_test.cc | 2 +- .../end2end/service_config_end2end_test.cc | 2 +- .../end2end/xds/xds_cluster_end2end_test.cc | 2 +- .../xds/xds_cluster_type_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_core_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_csds_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test.cc | 4 +-- .../end2end/xds/xds_fallback_end2end_test.cc | 2 +- .../xds/xds_fault_injection_end2end_test.cc | 2 +- .../end2end/xds/xds_gcp_authn_end2end_test.cc | 2 +- .../xds/xds_http_connect_end2end_test.cc | 2 +- .../xds/xds_outlier_detection_end2end_test.cc | 2 +- .../xds/xds_override_host_end2end_test.cc | 2 +- .../xds/xds_pick_first_end2end_test.cc | 2 +- .../end2end/xds/xds_ring_hash_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_rls_end2end_test.cc | 2 +- .../end2end/xds/xds_routing_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_wrr_end2end_test.cc | 2 +- test/cpp/ext/csm/metadata_exchange_test.cc | 2 +- test/cpp/ext/filters/census/library.h | 2 +- .../logging_census_integration_test.cc | 2 +- test/cpp/ext/gcp/observability_config_test.cc | 2 +- test/cpp/ext/gcp/observability_test.cc | 2 +- test/cpp/ext/otel/otel_plugin_test.cc | 2 +- test/cpp/ext/otel/otel_test_library.cc | 2 +- test/cpp/ext/otel/otel_test_library.h | 2 +- test/cpp/interop/backend_metrics_lb_policy.h | 2 +- .../interop/backend_metrics_lb_policy_test.cc | 2 +- test/cpp/interop/interop_client.cc | 4 +-- test/cpp/interop/rpc_behavior_lb_policy.h | 2 +- .../microbenchmarks/bm_opencensus_plugin.cc | 2 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 +- test/cpp/naming/address_sorting_test.cc | 2 +- test/cpp/naming/cancel_ares_query_test.cc | 4 +-- test/cpp/naming/resolver_component_test.cc | 2 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- tools/codegen/core/gen_config_vars.py | 12 ++++----- tools/doxygen/Doxyfile.c++.internal | 14 +++++----- tools/doxygen/Doxyfile.core.internal | 14 +++++----- 255 files changed, 355 insertions(+), 355 deletions(-) rename src/core/{lib => }/config/config_vars.cc (98%) rename src/core/{lib => }/config/config_vars.h (97%) rename src/core/{lib => }/config/config_vars.yaml (100%) rename src/core/{lib => }/config/config_vars_non_generated.cc (97%) rename src/core/{lib => }/config/core_configuration.cc (98%) rename src/core/{lib => }/config/core_configuration.h (98%) rename src/core/{lib => }/config/load_config.cc (98%) rename src/core/{lib => }/config/load_config.h (92%) diff --git a/BUILD b/BUILD index 07db4180285..7bbf3ed6f47 100644 --- a/BUILD +++ b/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:lib/config/config_vars_non_generated.cc", + "//src/core:config/config_vars.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 = [ diff --git a/CMakeLists.txt b/CMakeLists.txt index 167c7919a71..b8b3fdd676a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2036,9 +2036,9 @@ endif() add_library(gpr - src/core/lib/config/config_vars.cc - src/core/lib/config/config_vars_non_generated.cc - src/core/lib/config/load_config.cc + src/core/config/config_vars.cc + src/core/config/config_vars_non_generated.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 diff --git a/Makefile b/Makefile index ba9bd8ba040..9383c5fe2fb 100644 --- a/Makefile +++ b/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 \ diff --git a/Package.swift b/Package.swift index 780fe8ff063..c571733bf3b 100644 --- a/Package.swift +++ b/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", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 0a976bccef9..051708a380e 100644 --- a/build_autogenerated.yaml +++ b/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/lib/config/load_config.h + - src/core/config/config_vars.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/lib/config/config_vars_non_generated.cc - - src/core/lib/config/load_config.cc + - src/core/config/config_vars.cc + - src/core/config/config_vars_non_generated.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 diff --git a/config.m4 b/config.m4 index 98278457102..a9a74d4a820 100644 --- a/config.m4 +++ b/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) diff --git a/config.w32 b/config.w32 index 6dac489066e..b02aaf47683 100644 --- a/config.w32 +++ b/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"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 2365d2e89ed..7ed582d9010 100644 --- a/gRPC-C++.podspec +++ b/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', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 733e089783e..436b8fb0d82 100644 --- a/gRPC-Core.podspec +++ b/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', diff --git a/grpc.gemspec b/grpc.gemspec index b53df0df1f5..12c8ece0bd1 100644 --- a/grpc.gemspec +++ b/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 ) diff --git a/package.xml b/package.xml index 2f235cfa185..fa379471d1d 100644 --- a/package.xml +++ b/package.xml @@ -153,6 +153,13 @@ + + + + + + + @@ -1118,13 +1125,6 @@ - - - - - - - diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc index 973df54ee46..ef13d2285e3 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/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" diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 3af1535435a..dac21433edd 100644 --- a/src/core/client_channel/client_channel.cc +++ b/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" diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 6436d6fa70d..4d2e8a2e195 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/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" diff --git a/src/core/client_channel/client_channel_plugin.cc b/src/core/client_channel/client_channel_plugin.cc index afb99741950..65b269d1df9 100644 --- a/src/core/client_channel/client_channel_plugin.cc +++ b/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 { diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 6d33d11b170..53dd71f7fff 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/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" diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc index 6ccde807dcc..3f5014d0db6 100644 --- a/src/core/client_channel/direct_channel.cc +++ b/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" diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index 2415e367ccc..86d1da29c83 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/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" diff --git a/src/core/client_channel/retry_service_config.cc b/src/core/client_channel/retry_service_config.cc index 01e4c867ea9..bc281a26708 100644 --- a/src/core/client_channel/retry_service_config.cc +++ b/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. diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 91c6fe52dc9..e37ef9d5e2d 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/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" diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 56918f0f294..9692e073a05 100644 --- a/src/core/client_channel/subchannel.cc +++ b/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" diff --git a/src/core/lib/config/config_vars.cc b/src/core/config/config_vars.cc similarity index 98% rename from src/core/lib/config/config_vars.cc rename to src/core/config/config_vars.cc index 6aa9f551d71..4abd223540b 100644 --- a/src/core/lib/config/config_vars.cc +++ b/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 #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 "" diff --git a/src/core/lib/config/config_vars.h b/src/core/config/config_vars.h similarity index 97% rename from src/core/lib/config/config_vars.h rename to src/core/config/config_vars.h index b7ea541ad92..3890a183395 100644 --- a/src/core/lib/config/config_vars.h +++ b/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 -#define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H +#ifndef GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H +#define GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H #include #include @@ -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 diff --git a/src/core/lib/config/config_vars.yaml b/src/core/config/config_vars.yaml similarity index 100% rename from src/core/lib/config/config_vars.yaml rename to src/core/config/config_vars.yaml diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/config/config_vars_non_generated.cc similarity index 97% rename from src/core/lib/config/config_vars_non_generated.cc rename to src/core/config/config_vars_non_generated.cc index 78af08c1d8d..32c4da53175 100644 --- a/src/core/lib/config/config_vars_non_generated.cc +++ b/src/core/config/config_vars_non_generated.cc @@ -17,7 +17,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.cc b/src/core/config/core_configuration.cc similarity index 98% rename from src/core/lib/config/core_configuration.cc rename to src/core/config/core_configuration.cc index fc447b47e07..5c5dc469446 100644 --- a/src/core/lib/config/core_configuration.cc +++ b/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 diff --git a/src/core/lib/config/core_configuration.h b/src/core/config/core_configuration.h similarity index 98% rename from src/core/lib/config/core_configuration.h rename to src/core/config/core_configuration.h index aa2f79c64fe..29bacf96d5d 100644 --- a/src/core/lib/config/core_configuration.h +++ b/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 -#define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H +#ifndef GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H +#define GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H #include @@ -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 diff --git a/src/core/lib/config/load_config.cc b/src/core/config/load_config.cc similarity index 98% rename from src/core/lib/config/load_config.cc rename to src/core/config/load_config.cc index afceacc7e4f..133b78e2663 100644 --- a/src/core/lib/config/load_config.cc +++ b/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 #include diff --git a/src/core/lib/config/load_config.h b/src/core/config/load_config.h similarity index 92% rename from src/core/lib/config/load_config.h rename to src/core/config/load_config.h index c0a1fe486cd..80a300f885a 100644 --- a/src/core/lib/config/load_config.h +++ b/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 -#define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H +#ifndef GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H +#define GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H #include #include @@ -51,4 +51,4 @@ std::string LoadConfig(const absl::Flag>& flag, } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H +#endif // GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index 8d5e559e7a5..dd983bcbcf5 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/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" diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index 4420986c02e..32360fff513 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/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" diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 72429fea9d6..6c71ab8e2d6 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/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" diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index f2c4769ccc6..7c9928d3d5a 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -28,8 +28,8 @@ #include #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" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc index 61a6a84a64e..f22079c97d9 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc +++ b/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" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h index 36637d580b3..53fc64a3bdf 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h +++ b/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" diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index 924a54d469f..c101c361ebc 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/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" diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index b791e454b33..a684ef0fc9e 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -19,12 +19,12 @@ #include #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" diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index a7d9eeccdd9..bcd9f90c1be 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/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" diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index b8563872eb4..509ad77f17d 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/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" diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 813cd04dbf3..16c17bf77df 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/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" diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index ff6dc5837df..968901f9fe5 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/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" diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index 0385b865c7c..270548aa5a6 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -24,10 +24,10 @@ #include #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" diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index 0bd3bc465e6..b62db1bdc2b 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -26,8 +26,8 @@ #include #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" diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 22b3177c08f..1deb4b512a1 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/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" diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index 59ee3bd7069..e4eec1997ad 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/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" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index e5a012f073d..b3ba87564ce 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/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" diff --git a/src/core/ext/transport/chaotic_good_legacy/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good_legacy/client/chaotic_good_connector.cc index 26d3eeaac35..cc4044242d3 100644 --- a/src/core/ext/transport/chaotic_good_legacy/client/chaotic_good_connector.cc +++ b/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" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index d381443bdea..5c32f169eef 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/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" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index ba6bb81ac6c..3358d185038 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/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" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 3dfd962a85b..000767ad0f9 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/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" diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 538c6aa2ee0..ff036c27955 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/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" diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 16846ac1960..ef0cd9bc1a8 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/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" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index fd7fc3f99b6..0ae7aabe5e0 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/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" diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h index a45105a62b6..d64253abafb 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h @@ -19,7 +19,7 @@ #include -#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" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 1bbb5d64faf..fe3766c49bb 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/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" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.h b/src/core/handshaker/http_connect/http_connect_handshaker.h index 6d2fc0aed63..286d0c6631c 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.h +++ b/src/core/handshaker/http_connect/http_connect_handshaker.h @@ -21,7 +21,7 @@ #include -#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. diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h index 50fb2919c96..6beaa721374 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.h +++ b/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 { diff --git a/src/core/handshaker/http_connect/xds_http_proxy_mapper.h b/src/core/handshaker/http_connect/xds_http_proxy_mapper.h index 176c6afb5fc..bff3c6f275b 100644 --- a/src/core/handshaker/http_connect/xds_http_proxy_mapper.h +++ b/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 { diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 1e1102846df..f6d9266a9aa 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/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" diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 23c10b94fac..f1f8d7088cc 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -23,9 +23,9 @@ #include #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" diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 8dd1ff89d44..32584b58716 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/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" diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h index 94e05bdc815..44293941e7d 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h @@ -19,7 +19,7 @@ #include -#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 \ diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 6f8b1bb2913..633f80698a9 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/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" diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 3eb004ec232..bd4a81b8ffe 100644 --- a/src/core/lib/debug/trace.cc +++ b/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); diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 08ed8d23859..a146acfa504 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/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" diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 7b005d02d8e..0d5372598fd 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -21,8 +21,8 @@ #include #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" diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index 2a254d49586..8f6a140c1ca 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -20,7 +20,7 @@ #include -#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 { diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc index e83c8105dee..09a48f06d02 100644 --- a/src/core/lib/event_engine/forkable.cc +++ b/src/core/lib/event_engine/forkable.cc @@ -26,7 +26,7 @@ #include #include -#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 { diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc index 7d22bcaf503..8b0d08b2c4d 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/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" diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index f2ec5d1a0db..0488c5a5da1 100644 --- a/src/core/lib/experiments/config.cc +++ b/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" diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 055ca6efb5e..532a611d330 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/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" diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 39e0504d0d7..3b571df5687 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -27,7 +27,7 @@ #include #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" diff --git a/src/core/lib/resource_quota/api.h b/src/core/lib/resource_quota/api.h index 9d80d576afb..f88b2ff975d 100644 --- a/src/core/lib/resource_quota/api.h +++ b/src/core/lib/resource_quota/api.h @@ -20,7 +20,7 @@ #include #include -#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; diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index cf55ff2da64..3986eed1e4d 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -29,7 +29,7 @@ #include #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" diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index 11a9c3f4957..c1cf3ab2a2e 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -34,7 +34,7 @@ #include #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" diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 2fcd67d1e85..09962b3eec9 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/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" diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc index d8a243ceb27..e14b3aa3683 100644 --- a/src/core/lib/surface/channel_create.cc +++ b/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" diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 485ece5aa0b..dbe8f9adbeb 100644 --- a/src/core/lib/surface/init.cc +++ b/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" diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 64030cfbbe8..7084f40114b 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/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" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index ba9826e5118..0b4fafbe37c 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/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" diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index 5f6b545af9d..30485083149 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/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" diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 93161132732..47eab58e348 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/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" diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index a214f92c4db..44d8f41b1ff 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/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" diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index c2a3dab85cb..6bd599dec74 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/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" diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 6fab6bd9426..879772604d4 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/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" diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index 854ea3c4c79..f55c85c31a3 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/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" diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index 5613648b1b6..2409a40e425 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/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" diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 3024ebbef0d..edd6b93cfac 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/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" diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index 44fa7f9104c..481ddb54235 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/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" diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index 522b73ece7d..e961a8cbb07 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/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" diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index bebda9cba0d..5c3c21e3c7c 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/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" diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 71f2dbd06ae..4d3ba8357bf 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/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" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index ba655bfb762..471a6efa292 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/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" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index 96ad1313aeb..2a587b1a5c8 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/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" diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 5384e2662c9..72ce90719f1 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/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" diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index 6ac208dc5a8..2ebce6ced68 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/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" diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc index 4022d1f5735..4970e2a0127 100644 --- a/src/core/plugin_registry/grpc_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_plugin_registry.cc @@ -19,10 +19,10 @@ #include #include +#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" diff --git a/src/core/plugin_registry/grpc_plugin_registry_extra.cc b/src/core/plugin_registry/grpc_plugin_registry_extra.cc index 555503ddedd..aa91cba2417 100644 --- a/src/core/plugin_registry/grpc_plugin_registry_extra.cc +++ b/src/core/plugin_registry/grpc_plugin_registry_extra.cc @@ -17,7 +17,7 @@ #include #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { #ifndef GRPC_NO_XDS diff --git a/src/core/plugin_registry/grpc_plugin_registry_noextra.cc b/src/core/plugin_registry/grpc_plugin_registry_noextra.cc index c6666166742..1fdbf7dc38b 100644 --- a/src/core/plugin_registry/grpc_plugin_registry_noextra.cc +++ b/src/core/plugin_registry/grpc_plugin_registry_noextra.cc @@ -17,7 +17,7 @@ #include #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { void RegisterExtraFilters(CoreConfiguration::Builder* /* builder */) {} diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index 7f866dff773..426ee4acd08 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/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 #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" diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.h b/src/core/resolver/dns/c_ares/dns_resolver_ares.h index 0eb98efe38b..ad37e610a87 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.h +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h @@ -17,7 +17,7 @@ #include #include "absl/strings/string_view.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index c40f628570e..92fff39943f 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -19,7 +19,7 @@ #include "absl/log/log.h" #include "absl/strings/match.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/resolver/dns/c_ares/dns_resolver_ares.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" diff --git a/src/core/resolver/dns/dns_resolver_plugin.h b/src/core/resolver/dns/dns_resolver_plugin.h index a9025f741f5..6907201587a 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.h +++ b/src/core/resolver/dns/dns_resolver_plugin.h @@ -15,7 +15,7 @@ #define GRPC_SRC_CORE_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index 9c138bae997..9c642201cac 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -30,8 +30,8 @@ #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/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/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/resolver/dns/native/dns_resolver.h b/src/core/resolver/dns/native/dns_resolver.h index 84e13036020..383aa50522d 100644 --- a/src/core/resolver/dns/native/dns_resolver.h +++ b/src/core/resolver/dns/native/dns_resolver.h @@ -15,7 +15,7 @@ #define GRPC_SRC_CORE_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder); diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index a3ff19fb353..27dc8544c04 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -27,8 +27,8 @@ #include "absl/log/check.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/resolver/resolver_factory.h" #include "src/core/util/debug_location.h" #include "src/core/util/orphanable.h" diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index 7aa5ee7009c..67d0adc3388 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -31,8 +31,8 @@ #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/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index 6657faa4680..0e433d29ad0 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -25,9 +25,9 @@ #include "absl/status/statusor.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" +#include "src/core/config/core_configuration.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/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index ddc0dcdbfd9..b514a9af583 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -21,7 +21,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_join.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/util/match.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index fb9d1da293a..84b872d3f45 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -48,12 +48,12 @@ #include "re2/re2.h" #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/config_selector.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/promise_based_filter.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/iomgr_fwd.h" diff --git a/src/core/server/server.cc b/src/core/server/server.cc index 9f070136ecf..f4ef152e64e 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -46,9 +46,9 @@ #include "absl/types/optional.h" #include "src/core/channelz/channel_trace.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/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc index 692915750d3..04fab837eda 100644 --- a/src/core/server/server_call_tracer_filter.cc +++ b/src/core/server/server_call_tracer_filter.cc @@ -24,12 +24,12 @@ #include "absl/status/status.h" #include "absl/status/statusor.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/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/promise/cancel_callback.h" #include "src/core/lib/promise/context.h" diff --git a/src/core/server/server_call_tracer_filter.h b/src/core/server/server_call_tracer_filter.h index af554b84aff..d8348571441 100644 --- a/src/core/server/server_call_tracer_filter.h +++ b/src/core/server/server_call_tracer_filter.h @@ -17,7 +17,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { diff --git a/src/core/server/xds_channel_stack_modifier.cc b/src/core/server/xds_channel_stack_modifier.cc index 5a31507b138..e76b535acc4 100644 --- a/src/core/server/xds_channel_stack_modifier.cc +++ b/src/core/server/xds_channel_stack_modifier.cc @@ -24,9 +24,9 @@ #include #include +#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/surface/channel_init.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/util/useful.h" diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc index 35b64a5e19e..b7644d11488 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -45,12 +45,12 @@ #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/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/channel/channel_args_preconditioning.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index 635dd184ca5..a3e7e657e79 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -29,12 +29,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/ext/filters/message_size/message_size_filter.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/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index f678568957a..bc81e985a73 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -26,7 +26,7 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.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/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/util/fork.cc b/src/core/util/fork.cc index 27415423f1b..82946036029 100644 --- a/src/core/util/fork.cc +++ b/src/core/util/fork.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/thread_local.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc index 20e77682c81..5ddffec3c22 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -31,13 +31,13 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #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/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/util/log.cc b/src/core/util/log.cc index fb0119947c3..f627f7622a3 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -29,7 +29,7 @@ #include "absl/log/globals.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/crash.h" #include "src/core/util/string.h" diff --git a/src/core/xds/grpc/certificate_provider_store.cc b/src/core/xds/grpc/certificate_provider_store.cc index 1e7b9199d61..b5b991c3f13 100644 --- a/src/core/xds/grpc/certificate_provider_store.cc +++ b/src/core/xds/grpc/certificate_provider_store.cc @@ -23,7 +23,7 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" namespace grpc_core { diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc index dd52e46d8e6..f668d3f3812 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc @@ -29,7 +29,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index b8ed06f80f8..3c0680434a8 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -45,7 +45,7 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.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/load_balancing/lb_policy_registry.h" #include "src/core/util/env.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc index cff37249417..e538048167b 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -33,7 +33,7 @@ #include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h" #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc index fc94e71e07b..c0eb9aefeb4 100644 --- a/src/core/xds/grpc/xds_route_config_parser.cc +++ b/src/core/xds/grpc/xds_route_config_parser.cc @@ -53,8 +53,8 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" #include "re2/re2.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/debug/trace.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/env.h" diff --git a/src/core/xds/grpc/xds_server_grpc.cc b/src/core/xds/grpc/xds_server_grpc.cc index 99654977e81..00541208036 100644 --- a/src/core/xds/grpc/xds_server_grpc.cc +++ b/src/core/xds/grpc/xds_server_grpc.cc @@ -25,7 +25,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index ef0186a2f8a..a9956930030 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -35,10 +35,10 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.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/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index cb407b21cdb..c97b7f0bca1 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -28,8 +28,8 @@ #include "absl/strings/string_view.h" #include "opencensus/tags/tag_key.h" #include "opencensus/trace/span.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/filters/census/client_filter.h" diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index c55c4584358..d8480d5a009 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -34,8 +34,8 @@ #include "opentelemetry/nostd/unique_ptr.h" #include "opentelemetry/nostd/variant.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/surface/channel_stack_type.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/match.h" diff --git a/src/cpp/ext/proto_server_reflection_plugin.cc b/src/cpp/ext/proto_server_reflection_plugin.cc index d880fc127a1..9e5c2576abe 100644 --- a/src/cpp/ext/proto_server_reflection_plugin.cc +++ b/src/cpp/ext/proto_server_reflection_plugin.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/cpp/ext/proto_server_reflection.h" namespace grpc { diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 22c2d224b6e..4c6c29e869c 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -780,7 +780,7 @@ cdef extern from "grpc/grpc_security_constants.h": UDS LOCAL_TCP -cdef extern from "src/core/lib/config/config_vars.h" namespace "grpc_core": +cdef extern from "src/core/config/config_vars.h" namespace "grpc_core": cdef cppclass ConfigVars: @staticmethod void Reset() diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index d2c46a476a1..f42f4bf8164 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -37,6 +37,10 @@ CORE_SOURCE_FILES = [ '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', @@ -434,10 +438,6 @@ CORE_SOURCE_FILES = [ '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', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 9896cd7368b..dc1cdba7c8f 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -15,9 +15,9 @@ # AUTO-GENERATED BY make_grpcio_observability.py! CC_FILES=[ - 'grpc_root/src/core/lib/config/config_vars.cc', - 'grpc_root/src/core/lib/config/config_vars_non_generated.cc', - 'grpc_root/src/core/lib/config/load_config.cc', + 'grpc_root/src/core/config/config_vars.cc', + 'grpc_root/src/core/config/config_vars_non_generated.cc', + 'grpc_root/src/core/config/load_config.cc', 'grpc_root/src/core/lib/debug/trace.cc', 'grpc_root/src/core/lib/debug/trace_flags.cc', 'grpc_root/src/core/lib/event_engine/thread_local.cc', diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 83c05a2ad9b..b6e78983ad9 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -29,10 +29,10 @@ #include "absl/log/check.h" #include "absl/log/log.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/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/endpoint_pair.h" diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index 7e7f37224f0..54e58e1ebc3 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -17,7 +17,7 @@ #include #include "absl/log/check.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" #include "src/core/util/env.h" diff --git a/test/core/call/yodel/yodel_test.cc b/test/core/call/yodel/yodel_test.cc index 871596197ca..67b8068822b 100644 --- a/test/core/call/yodel/yodel_test.cc +++ b/test/core/call/yodel/yodel_test.cc @@ -17,7 +17,7 @@ #include #include "absl/random/random.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 31d5e5fd216..11c806cef9b 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -23,9 +23,9 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.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/exec_ctx.h" #include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index c207c274f80..845199fa8e3 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -41,10 +41,10 @@ #include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "gtest/gtest.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/channel/channel_stack_builder_impl.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index 67b6af99e43..05cb285b086 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -22,8 +22,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.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.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc index 4dc980f5855..2d09480acfe 100644 --- a/test/core/client_channel/client_channel_test.cc +++ b/test/core/client_channel/client_channel_test.cc @@ -22,9 +22,9 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_impl.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/client_channel/connected_subchannel_test.cc b/test/core/client_channel/connected_subchannel_test.cc index 619577d719e..9e294a81141 100644 --- a/test/core/client_channel/connected_subchannel_test.cc +++ b/test/core/client_channel/connected_subchannel_test.cc @@ -22,8 +22,8 @@ #include "gtest/gtest.h" #include "src/core/client_channel/client_channel.h" #include "src/core/client_channel/local_subchannel_pool.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/config/core_configuration.h" #include "test/core/call/yodel/yodel_test.h" namespace grpc_core { diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index b44bf119ec9..1e4924aa41c 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -24,8 +24,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.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.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc index 3a391a8f097..92b95af997e 100644 --- a/test/core/config/core_configuration_test.cc +++ b/test/core/config/core_configuration_test.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 diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc index 8c34bb0b651..081001144cb 100644 --- a/test/core/config/load_config_test.cc +++ b/test/core/config/load_config_test.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 "absl/flags/flag.h" #include "gtest/gtest.h" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index 331ad4b998b..20052ca331b 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -27,7 +27,7 @@ #include #include "absl/log/check.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/end2end/end2end_test_main.cc b/test/core/end2end/end2end_test_main.cc index c9b0d0f0050..abd8b0e7a93 100644 --- a/test/core/end2end/end2end_test_main.cc +++ b/test/core/end2end/end2end_test_main.cc @@ -19,7 +19,7 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "gtest/gtest.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_tls_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 1c14cc7386c..8181e60a9bb 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/no_destruct.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 6447f1ecf0a..ac943d15c69 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -46,8 +46,8 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "gtest/gtest.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/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call_test_only.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 8220c5b9984..cfef9898cf5 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -38,10 +38,10 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.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/channel/channel_args_preconditioning.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/default_event_engine.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h index ce3616c22cf..0685d668457 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -27,10 +27,10 @@ #include "absl/status/statusor.h" #include "gtest/gtest.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/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/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index b44a42e8fa6..c7cbffa53ea 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -21,10 +21,10 @@ #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/chttp2_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/experiments/config.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/end2end/fuzzers/network_input.cc b/test/core/end2end/fuzzers/network_input.cc index 675b9e630da..67f4e6b8c28 100644 --- a/test/core/end2end/fuzzers/network_input.cc +++ b/test/core/end2end/fuzzers/network_input.cc @@ -27,12 +27,12 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/varint.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/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 1983ff9316e..f31db7fef14 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -20,7 +20,7 @@ #include "absl/log/check.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/experiments/config.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/env.h" diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 716b1faa0ad..1385da41868 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -38,8 +38,8 @@ #include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.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/util/time.h" #include "src/core/util/tmpfile.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 7bb518425b4..8ce7d3d5b42 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -32,8 +32,8 @@ #include "absl/log/check.h" #include "absl/types/optional.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/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/host_port.h" diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc index 9d232edf911..f5d24dbbc0e 100644 --- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc +++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc @@ -32,8 +32,8 @@ #include "absl/log/check.h" #include "absl/types/optional.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/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/host_port.h" diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index e1836375f1c..4584c941c10 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -24,10 +24,10 @@ #include "absl/status/status.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_fwd.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/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 62484f57911..dd85a4ad7dd 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -25,10 +25,10 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.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/config/core_configuration.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index 9e33da9ad5d..2cd3649117b 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -26,11 +26,11 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "gtest/gtest.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/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index e60f8b29c97..f92e4640abc 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -23,9 +23,9 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" +#include "src/core/config/config_vars.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index 026bfc18278..51a9a83088c 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -26,11 +26,11 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/internal.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/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index f09cb785251..9cdfd7001ab 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -28,8 +28,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.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/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index 7eed6fe21b3..3064f8d78b9 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -22,8 +22,8 @@ #include "absl/status/status.h" #include "gtest/gtest.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/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index 31f11c01567..b93b9ba16d0 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -25,10 +25,10 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.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/config/core_configuration.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index 9f986707f50..f8d070e4647 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -23,10 +23,10 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.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/config/core_configuration.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index 96cc4b0197a..eae91e66024 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -25,10 +25,10 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.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/config/core_configuration.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index e26882ca11e..cc1c21a1ac4 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -23,9 +23,9 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.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/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc index 9b3366397f1..cd928854908 100644 --- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc +++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc @@ -24,9 +24,9 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.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/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc index 2b1da1d0b09..afe0b92206b 100644 --- a/test/core/event_engine/forkable_test.cc +++ b/test/core/event_engine/forkable_test.cc @@ -28,7 +28,7 @@ #include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/no_destruct.h" namespace { diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index e236989da69..b07b9b44fda 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -29,7 +29,7 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index 5ad8bb7d937..64f6daeb93a 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -34,8 +34,8 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "gtest/gtest.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/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc index 682d4402d80..80acdcaaac0 100644 --- a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc +++ b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc @@ -18,7 +18,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h" diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index 1613085a42d..b827c6626eb 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -34,7 +34,7 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/crash.h" // IWYU pragma: keep diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc index f44ddae72e6..2802065a5f2 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -46,8 +46,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args_preconditioning.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/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/test/core/experiments/experiments_tag_test.cc b/test/core/experiments/experiments_tag_test.cc index 63d42a7bd3b..adc670c23f2 100644 --- a/test/core/experiments/experiments_tag_test.cc +++ b/test/core/experiments/experiments_tag_test.cc @@ -22,7 +22,7 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "gtest/gtest.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/experiments/config.h" #include "test/core/experiments/fixtures/experiments.h" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index e8401f084f6..0e6704ac76a 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -23,11 +23,11 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "gtest/gtest.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" diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc index 2d608c88896..043b43333bb 100644 --- a/test/core/http/httpcli_test_util.cc +++ b/test/core/http/httpcli_test_util.cc @@ -32,7 +32,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/subprocess.h" #include "test/core/test_util/port.h" diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 0d3deea8ba4..123f1b3f08a 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -31,7 +31,7 @@ #include "absl/flags/parse.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index db0c041c470..055321b64f7 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -31,7 +31,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/match.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc index b596ef553bc..5e4ebad9c46 100644 --- a/test/core/load_balancing/bm_picker.cc +++ b/test/core/load_balancing/bm_picker.cc @@ -19,8 +19,8 @@ #include "absl/strings/string_view.h" #include "src/core/client_channel/subchannel_interface_internal.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/address_utils/parse_address.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/default_event_engine.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 626bb7bde9c..fcb935256d1 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -55,10 +55,10 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_pool_interface.h" +#include "src/core/config/core_configuration.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/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 94a1534d236..0e15ed31ce2 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -45,7 +45,7 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/core/v3/health_check.pb.h" #include "google/protobuf/wrappers.pb.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/env.h" #include "src/core/util/subprocess.h" #include "test/core/test_util/port.h" diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc index ed15404a886..85c53e97efd 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -23,9 +23,9 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.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/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index 8682a1b2553..a05a95c21a9 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -36,8 +36,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.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/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index 9a80fbc2787..e14f3d0341f 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -25,9 +25,9 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" +#include "src/core/config/config_vars.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/resolver.h" diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index d71f0ed7aab..b9b59d508ef 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -35,9 +35,9 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/notification.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.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/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index 94559aca191..ef72bd5f418 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -24,7 +24,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/core/security/channel_creds_registry_test.cc b/test/core/security/channel_creds_registry_test.cc index f2a207ce439..e882ddf4713 100644 --- a/test/core/security/channel_creds_registry_test.cc +++ b/test/core/security/channel_creds_registry_test.cc @@ -23,7 +23,7 @@ #include #include "absl/types/optional.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 9064a430e0a..712a515503a 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "src/core/util/crash.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 2716441b900..4d0eaf24588 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -27,7 +27,7 @@ #include #include "absl/log/log.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 16a498f6097..bac0f8291f6 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -27,8 +27,8 @@ #include #include "absl/log/check.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/security/context/security_context.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" diff --git a/test/core/server/xds_channel_stack_modifier_test.cc b/test/core/server/xds_channel_stack_modifier_test.cc index 07569b8b93c..a77f123f260 100644 --- a/test/core/server/xds_channel_stack_modifier_test.cc +++ b/test/core/server/xds_channel_stack_modifier_test.cc @@ -24,10 +24,10 @@ #include #include "gtest/gtest.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/channel/channel_stack_builder_impl.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index 26a381084f9..ebb7694a2c3 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -28,8 +28,8 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.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_impl.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index ff6edf5d877..097b9ecf585 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -32,8 +32,8 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args_preconditioning.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" diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index 54f2ece9629..2559255a14e 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -20,9 +20,9 @@ #include #include "gtest/gtest.h" +#include "src/core/config/core_configuration.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/exec_ctx.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/test/core/test_util/fake_stats_plugin.cc b/test/core/test_util/fake_stats_plugin.cc index 74d7dcecc1f..4cddc924074 100644 --- a/test/core/test_util/fake_stats_plugin.cc +++ b/test/core/test_util/fake_stats_plugin.cc @@ -15,7 +15,7 @@ #include "test/core/test_util/fake_stats_plugin.h" #include "absl/log/check.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc_core { diff --git a/test/core/test_util/fuzz_config_vars.h b/test/core/test_util/fuzz_config_vars.h index 4ee69ee2aa0..19d690d7b07 100644 --- a/test/core/test_util/fuzz_config_vars.h +++ b/test/core/test_util/fuzz_config_vars.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/fuzz_config_vars.pb.h" namespace grpc_core { diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index d02b224793a..b3e7db11245 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -29,9 +29,9 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" #include "src/core/client_channel/lb_metadata.h" +#include "src/core/config/core_configuration.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/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/test_util/test_lb_policies.h b/test/core/test_util/test_lb_policies.h index 18c016fb80f..64a358f9290 100644 --- a/test/core/test_util/test_lb_policies.h +++ b/test/core/test_util/test_lb_policies.h @@ -27,7 +27,7 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index 25193394c40..e3197c03b0a 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -29,8 +29,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args_preconditioning.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/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc index 79cf11caf6d..d8e987400af 100644 --- a/test/core/transport/chaotic_good/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good/client_transport_error_test.cc @@ -34,8 +34,8 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chaotic_good/client_transport.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/activity.h" diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc index 6d3f40b5752..1c550fd3cc6 100644 --- a/test/core/transport/chaotic_good/client_transport_test.cc +++ b/test/core/transport/chaotic_good/client_transport_test.cc @@ -36,8 +36,8 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc b/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc index f3475d9f1b9..e2bb24a7f1d 100644 --- a/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc @@ -34,8 +34,8 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chaotic_good_legacy/client_transport.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/activity.h" diff --git a/test/core/transport/chaotic_good_legacy/client_transport_test.cc b/test/core/transport/chaotic_good_legacy/client_transport_test.cc index 3d1b0652aa3..7a3b6e01a50 100644 --- a/test/core/transport/chaotic_good_legacy/client_transport_test.cc +++ b/test/core/transport/chaotic_good_legacy/client_transport_test.cc @@ -36,7 +36,7 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index d7c5799d797..ac3d4ab4d97 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -39,9 +39,9 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/optional.h" +#include "src/core/config/config_vars.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/util/host_port.h" #include "src/core/util/sync.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 0d6d4037760..0f166798753 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -40,8 +40,8 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args_preconditioning.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" diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index 2c435727a54..e87be215d8c 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -47,12 +47,12 @@ #include "absl/time/time.h" #include "absl/types/optional.h" #include "gtest/gtest.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/frame_goaway.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/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/transport/test_suite/inproc_fixture.cc b/test/core/transport/test_suite/inproc_fixture.cc index 65a7d7f4889..aa1b238e6f8 100644 --- a/test/core/transport/test_suite/inproc_fixture.cc +++ b/test/core/transport/test_suite/inproc_fixture.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/config/core_configuration.h" #include "test/core/transport/test_suite/transport_test.h" namespace grpc_core { diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index e486fd33dc6..e9ffc91202b 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -27,7 +27,7 @@ #include "absl/log/check.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 45dbfefdf4e..2eaa7bd5be8 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -33,7 +33,7 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/util/env.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index 46d32d408f4..3e1bfc2717d 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -37,7 +37,7 @@ #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/crash.h" diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index d964042f37a..67d64561e4d 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -37,7 +37,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index c429b20d30b..ac3bc0c10e8 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -50,10 +50,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/global_subchannel_pool.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/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 88829e477ff..f94f416b04f 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -42,7 +42,7 @@ #include "absl/strings/match.h" #include "absl/strings/str_format.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/crash.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index f5d4c5da167..a4e0b04c925 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -43,9 +43,9 @@ #include "absl/synchronization/notification.h" #include "absl/types/span.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/load_balancing/grpclb/grpclb.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 6a6f1f47a1f..47744f096ad 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -41,9 +41,9 @@ #include "absl/strings/str_join.h" #include "absl/types/optional.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/load_balancing/rls/rls.h" diff --git a/test/cpp/end2end/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc index 076ca75c7dd..8a0d71bff16 100644 --- a/test/cpp/end2end/server_load_reporting_end2end_test.cc +++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc @@ -29,7 +29,7 @@ #include "absl/log/log.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/crash.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 381440cc61e..2399dfa3bb5 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -45,9 +45,9 @@ #include "absl/strings/str_cat.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/global_subchannel_pool.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/error_utils.h" diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index f0b578afeca..0bf717ba730 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -24,8 +24,8 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/surface/call.h" #include "src/core/telemetry/call_tracer.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index e49fa554a3f..ef6c4d210b1 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -25,8 +25,8 @@ #include "absl/strings/str_cat.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc index 25f19d6f87b..036f9e3de83 100644 --- a/test/cpp/end2end/xds/xds_core_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc @@ -26,7 +26,7 @@ #include "absl/strings/str_cat.h" #include "envoy/config/listener/v3/listener.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc index 647df5f16fe..3065bffea54 100644 --- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc @@ -32,7 +32,7 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index ff4637467ae..a67758cb8fc 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -65,12 +65,12 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.pb.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/http/client/http_client_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/config_vars.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc index 171fd7b4130..aebfc4ce33e 100644 --- a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc @@ -26,7 +26,7 @@ #include "absl/cleanup/cleanup.h" #include "absl/strings/str_format.h" #include "absl/strings/strip.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/proto/grpc/testing/echo.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc index 04505512c06..1b7c22a29e8 100644 --- a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc @@ -24,7 +24,7 @@ #include "envoy/extensions/filters/http/router/v3/router.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc index 7eaf687e754..79afe32e64e 100644 --- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc @@ -26,7 +26,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/http_client/httpcli.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc b/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc index c13bc1c4d8f..b070ba4c052 100644 --- a/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc @@ -26,7 +26,7 @@ #include "envoy/config/core/v3/address.pb.h" #include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc index 2fe894b4551..c3ae88561f0 100644 --- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc @@ -26,7 +26,7 @@ #include "envoy/extensions/filters/http/fault/v3/fault.pb.h" #include "envoy/extensions/filters/http/router/v3/router.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index 0b023737fc5..25474cfd245 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -24,7 +24,7 @@ #include "absl/strings/str_split.h" #include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.pb.h" #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.pb.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/time.h" #include "test/core/test_util/scoped_env_var.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc index b4b4c30e532..a8f9631e6ec 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -29,8 +29,8 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index b09d754fffd..75afa6c12bf 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -27,8 +27,8 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h" #include "src/core/client_channel/backup_poller.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc index 5b4ce986275..ba40fddb2bb 100644 --- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc @@ -21,7 +21,7 @@ #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/env.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "src/proto/grpc/lookup/v1/rls_config.pb.h" diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc index 1e4e53d46ed..3e970d8e26b 100644 --- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc @@ -24,7 +24,7 @@ #include "envoy/extensions/filters/http/fault/v3/fault.pb.h" #include "envoy/extensions/filters/http/router/v3/router.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" namespace grpc { diff --git a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc index a03a25b804e..758b1aeec7f 100644 --- a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc @@ -27,7 +27,7 @@ #include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.h" #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.h" #include "src/core/client_channel/backup_poller.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/scoped_env_var.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index 969376f96fb..4fe5b04676c 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -28,7 +28,7 @@ #include "opentelemetry/metrics/provider.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/env.h" #include "src/core/util/tmpfile.h" diff --git a/test/cpp/ext/filters/census/library.h b/test/cpp/ext/filters/census/library.h index c1fa9f58f71..33df8fc74dc 100644 --- a/test/cpp/ext/filters/census/library.h +++ b/test/cpp/ext/filters/census/library.h @@ -30,7 +30,7 @@ #include "gtest/gtest.h" #include "opencensus/stats/stats.h" #include "opencensus/trace/exporter/span_exporter.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/cpp/client/client_stats_interceptor.h" #include "src/cpp/ext/filters/census/client_filter.h" #include "src/cpp/ext/filters/census/context.h" diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc index e6142d4f8fa..bd931073274 100644 --- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc +++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc @@ -29,8 +29,8 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "opencensus/stats/testing/test_utils.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc index 31ba998455f..021458a1cd7 100644 --- a/test/cpp/ext/gcp/observability_config_test.cc +++ b/test/cpp/ext/gcp/observability_config_test.cc @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/tmpfile.h" diff --git a/test/cpp/ext/gcp/observability_test.cc b/test/cpp/ext/gcp/observability_test.cc index ca26f6a9e93..1decf157d27 100644 --- a/test/cpp/ext/gcp/observability_test.cc +++ b/test/cpp/ext/gcp/observability_test.cc @@ -19,7 +19,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc index 4c96d0eef26..8a4fb7a6d04 100644 --- a/test/cpp/ext/otel/otel_plugin_test.cc +++ b/test/cpp/ext/otel/otel_plugin_test.cc @@ -37,7 +37,7 @@ #include "opentelemetry/sdk/metrics/data/point_data.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/telemetry/call_tracer.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index 15bc96c63c1..3a02a72741f 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -30,8 +30,8 @@ #include "opentelemetry/sdk/metrics/export/metric_producer.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/notification.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h index 78195fe3541..367a83a3685 100644 --- a/test/cpp/ext/otel/otel_test_library.h +++ b/test/cpp/ext/otel/otel_test_library.h @@ -32,7 +32,7 @@ #include "opentelemetry/metrics/provider.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/backend_metrics_lb_policy.h b/test/cpp/interop/backend_metrics_lb_policy.h index 2012132b03c..fb268854dce 100644 --- a/test/cpp/interop/backend_metrics_lb_policy.h +++ b/test/cpp/interop/backend_metrics_lb_policy.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/proto/grpc/testing/messages.pb.h" namespace grpc { diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc index 1d2dc8372d2..52be592a979 100644 --- a/test/cpp/interop/backend_metrics_lb_policy_test.cc +++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index d259cdcfd26..dd32ff797db 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -40,8 +40,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" -#include "src/core/lib/config/config_vars.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/config_vars.h" +#include "src/core/config/core_configuration.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/rpc_behavior_lb_policy.h b/test/cpp/interop/rpc_behavior_lb_policy.h index f0d6504b2f9..2c72d5a2b61 100644 --- a/test/cpp/interop/rpc_behavior_lb_policy.h +++ b/test/cpp/interop/rpc_behavior_lb_policy.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" namespace grpc { namespace testing { diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc index 8e85213182b..c8ac81ff2e0 100644 --- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc +++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc @@ -27,7 +27,7 @@ #include "absl/base/call_once.h" #include "absl/strings/str_cat.h" #include "opencensus/stats/stats.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 56c205466b4..ba787d4b402 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -29,9 +29,9 @@ #include #include "absl/log/check.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 00a55c37d7c..1b901c3c8be 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -31,9 +31,9 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "src/core/client_channel/client_channel_filter.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index cb05f8d9030..9ef6a78ec50 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -31,9 +31,9 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "src/core/config/config_vars.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 050e42dd00e..857ab09b735 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -38,10 +38,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "src/core/client_channel/client_channel_filter.h" +#include "src/core/config/core_configuration.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/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index c171daeebd6..b8370366bdb 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -30,9 +30,9 @@ #include "absl/log/check.h" #include "absl/log/log.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.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/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/tools/codegen/core/gen_config_vars.py b/tools/codegen/core/gen_config_vars.py index 036a59518bc..defeda2d112 100755 --- a/tools/codegen/core/gen_config_vars.py +++ b/tools/codegen/core/gen_config_vars.py @@ -28,7 +28,7 @@ import sys import yaml -with open("src/core/lib/config/config_vars.yaml") as f: +with open("src/core/config/config_vars.yaml") as f: attrs = yaml.safe_load(f.read()) error = False @@ -227,7 +227,7 @@ with open("test/core/test_util/fuzz_config_vars.h", "w") as H: print("#include ", file=H) print(file=H) print('#include "test/core/test_util/fuzz_config_vars.pb.h"', file=H) - print('#include "src/core/lib/config/config_vars.h"', file=H) + print('#include "src/core/config/config_vars.h"', file=H) print(file=H) print("namespace grpc_core {", file=H) print(file=H) @@ -302,7 +302,7 @@ with open("test/core/test_util/fuzz_config_vars.cc", "w") as C: print(file=C) print("} // namespace grpc_core", file=C) -with open("src/core/lib/config/config_vars.h", "w") as H: +with open("src/core/config/config_vars.h", "w") as H: put_copyright(H) put_banner( @@ -397,7 +397,7 @@ with open("src/core/lib/config/config_vars.h", "w") as H: print(file=H) print("#endif // GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H", file=H) -with open("src/core/lib/config/config_vars.cc", "w") as C: +with open("src/core/config/config_vars.cc", "w") as C: put_copyright(C) put_banner( @@ -410,8 +410,8 @@ with open("src/core/lib/config/config_vars.cc", "w") as C: ) print("#include ", file=C) - print('#include "src/core/lib/config/config_vars.h"', file=C) - print('#include "src/core/lib/config/load_config.h"', file=C) + print('#include "src/core/config/config_vars.h"', file=C) + print('#include "src/core/config/load_config.h"', file=C) print('#include "absl/strings/escaping.h"', file=C) print('#include "absl/flags/flag.h"', file=C) print(file=C) diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 87c21198fa7..143304a85c2 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1136,6 +1136,13 @@ src/core/client_channel/subchannel_pool_interface.cc \ 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 \ @@ -2101,13 +2108,6 @@ src/core/lib/compression/compression_internal.cc \ 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 \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f72d7a221d3..946939f62f2 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -938,6 +938,13 @@ src/core/client_channel/subchannel_pool_interface.cc \ 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/README.md \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/backend_metrics/backend_metric_filter.h \ @@ -1909,13 +1916,6 @@ src/core/lib/compression/compression_internal.cc \ 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 \