diff --git a/BUILD b/BUILD
index 3dd6e4f8d62..449a668cd08 100644
--- a/BUILD
+++ b/BUILD
@@ -2930,10 +2930,10 @@ grpc_cc_library(
grpc_cc_library(
name = "endpoint_addresses",
srcs = [
- "//src/core:lib/resolver/endpoint_addresses.cc",
+ "//src/core:resolver/endpoint_addresses.cc",
],
hdrs = [
- "//src/core:lib/resolver/endpoint_addresses.h",
+ "//src/core:resolver/endpoint_addresses.h",
],
external_deps = [
"absl/functional:function_ref",
@@ -2956,7 +2956,7 @@ grpc_cc_library(
grpc_cc_library(
name = "server_address",
hdrs = [
- "//src/core:lib/resolver/server_address.h",
+ "//src/core:resolver/server_address.h",
],
language = "c++",
visibility = ["@grpc:client_channel"],
@@ -2969,13 +2969,13 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver",
srcs = [
- "//src/core:lib/resolver/resolver.cc",
- "//src/core:lib/resolver/resolver_registry.cc",
+ "//src/core:resolver/resolver.cc",
+ "//src/core:resolver/resolver_registry.cc",
],
hdrs = [
- "//src/core:lib/resolver/resolver.h",
- "//src/core:lib/resolver/resolver_factory.h",
- "//src/core:lib/resolver/resolver_registry.h",
+ "//src/core:resolver/resolver.h",
+ "//src/core:resolver/resolver_factory.h",
+ "//src/core:resolver/resolver_registry.h",
],
external_deps = [
"absl/status",
@@ -3162,17 +3162,17 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_dns_ares",
srcs = [
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc",
+ "//src/core:resolver/dns/c_ares/dns_resolver_ares.cc",
+ "//src/core:resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc",
+ "//src/core:resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc",
+ "//src/core:resolver/dns/c_ares/grpc_ares_wrapper.cc",
+ "//src/core:resolver/dns/c_ares/grpc_ares_wrapper_posix.cc",
+ "//src/core:resolver/dns/c_ares/grpc_ares_wrapper_windows.cc",
],
hdrs = [
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h",
- "//src/core:ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h",
+ "//src/core:resolver/dns/c_ares/dns_resolver_ares.h",
+ "//src/core:resolver/dns/c_ares/grpc_ares_ev_driver.h",
+ "//src/core:resolver/dns/c_ares/grpc_ares_wrapper.h",
],
external_deps = [
"absl/base:core_headers",
@@ -3761,8 +3761,8 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_fake",
- srcs = ["//src/core:ext/filters/client_channel/resolver/fake/fake_resolver.cc"],
- hdrs = ["//src/core:ext/filters/client_channel/resolver/fake/fake_resolver.h"],
+ srcs = ["//src/core:resolver/fake/fake_resolver.cc"],
+ hdrs = ["//src/core:resolver/fake/fake_resolver.h"],
external_deps = [
"absl/base:core_headers",
"absl/strings",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12959352064..98b83d153a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1795,24 +1795,6 @@ add_library(grpc
src/core/ext/filters/client_channel/global_subchannel_pool.cc
src/core/ext/filters/client_channel/http_proxy_mapper.cc
src/core/ext/filters/client_channel/local_subchannel_pool.cc
- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
- src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
- src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
- src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
- src/core/ext/filters/client_channel/resolver/polling_resolver.cc
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
- src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
src/core/ext/filters/client_channel/retry_filter.cc
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
src/core/ext/filters/client_channel/retry_service_config.cc
@@ -2393,9 +2375,6 @@ add_library(grpc
src/core/lib/promise/party.cc
src/core/lib/promise/sleep.cc
src/core/lib/promise/trace.cc
- src/core/lib/resolver/endpoint_addresses.cc
- src/core/lib/resolver/resolver.cc
- src/core/lib/resolver/resolver_registry.cc
src/core/lib/resource_quota/api.cc
src/core/lib/resource_quota/arena.cc
src/core/lib/resource_quota/memory_quota.cc
@@ -2548,6 +2527,27 @@ add_library(grpc
src/core/load_balancing/xds/xds_wrr_locality.cc
src/core/plugin_registry/grpc_plugin_registry.cc
src/core/plugin_registry/grpc_plugin_registry_extra.cc
+ src/core/resolver/binder/binder_resolver.cc
+ src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+ src/core/resolver/dns/dns_resolver_plugin.cc
+ src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+ src/core/resolver/dns/event_engine/service_config_helper.cc
+ src/core/resolver/dns/native/dns_resolver.cc
+ src/core/resolver/endpoint_addresses.cc
+ src/core/resolver/fake/fake_resolver.cc
+ src/core/resolver/google_c2p/google_c2p_resolver.cc
+ src/core/resolver/polling_resolver.cc
+ src/core/resolver/resolver.cc
+ src/core/resolver/resolver_registry.cc
+ src/core/resolver/sockaddr/sockaddr_resolver.cc
+ src/core/resolver/xds/xds_dependency_manager.cc
+ src/core/resolver/xds/xds_resolver.cc
+ src/core/resolver/xds/xds_resolver_trace.cc
src/core/tsi/alts/crypt/aes_gcm.cc
src/core/tsi/alts/crypt/gsec.cc
src/core/tsi/alts/frame_protector/alts_counter.cc
@@ -2893,20 +2893,6 @@ add_library(grpc_unsecure
src/core/ext/filters/client_channel/global_subchannel_pool.cc
src/core/ext/filters/client_channel/http_proxy_mapper.cc
src/core/ext/filters/client_channel/local_subchannel_pool.cc
- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
- src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
- src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
- src/core/ext/filters/client_channel/resolver/polling_resolver.cc
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
src/core/ext/filters/client_channel/retry_filter.cc
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
src/core/ext/filters/client_channel/retry_service_config.cc
@@ -3151,9 +3137,6 @@ add_library(grpc_unsecure
src/core/lib/promise/party.cc
src/core/lib/promise/sleep.cc
src/core/lib/promise/trace.cc
- src/core/lib/resolver/endpoint_addresses.cc
- src/core/lib/resolver/resolver.cc
- src/core/lib/resolver/resolver_registry.cc
src/core/lib/resource_quota/api.cc
src/core/lib/resource_quota/arena.cc
src/core/lib/resource_quota/memory_quota.cc
@@ -3266,6 +3249,23 @@ add_library(grpc_unsecure
src/core/load_balancing/weighted_target/weighted_target.cc
src/core/plugin_registry/grpc_plugin_registry.cc
src/core/plugin_registry/grpc_plugin_registry_noextra.cc
+ src/core/resolver/binder/binder_resolver.cc
+ src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+ src/core/resolver/dns/dns_resolver_plugin.cc
+ src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+ src/core/resolver/dns/event_engine/service_config_helper.cc
+ src/core/resolver/dns/native/dns_resolver.cc
+ src/core/resolver/endpoint_addresses.cc
+ src/core/resolver/fake/fake_resolver.cc
+ src/core/resolver/polling_resolver.cc
+ src/core/resolver/resolver.cc
+ src/core/resolver/resolver_registry.cc
+ src/core/resolver/sockaddr/sockaddr_resolver.cc
src/core/tsi/alts/handshaker/transport_security_common_api.cc
src/core/tsi/fake_transport_security.cc
src/core/tsi/local_transport_security.cc
@@ -5259,9 +5259,6 @@ add_library(grpc_authorization_provider
src/core/lib/promise/activity.cc
src/core/lib/promise/party.cc
src/core/lib/promise/trace.cc
- src/core/lib/resolver/endpoint_addresses.cc
- src/core/lib/resolver/resolver.cc
- src/core/lib/resolver/resolver_registry.cc
src/core/lib/resource_quota/api.cc
src/core/lib/resource_quota/arena.cc
src/core/lib/resource_quota/memory_quota.cc
@@ -5352,6 +5349,9 @@ add_library(grpc_authorization_provider
src/core/lib/uri/uri_parser.cc
src/core/load_balancing/lb_policy.cc
src/core/load_balancing/lb_policy_registry.cc
+ src/core/resolver/endpoint_addresses.cc
+ src/core/resolver/resolver.cc
+ src/core/resolver/resolver_registry.cc
src/core/tsi/alts/handshaker/transport_security_common_api.cc
src/core/tsi/transport_security.cc
src/core/tsi/transport_security_grpc.cc
diff --git a/Makefile b/Makefile
index d72aa44ba90..2a61f91ad28 100644
--- a/Makefile
+++ b/Makefile
@@ -977,24 +977,6 @@ LIBGRPC_SRC = \
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc \
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
- src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc \
- src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
@@ -1575,9 +1557,6 @@ LIBGRPC_SRC = \
src/core/lib/promise/party.cc \
src/core/lib/promise/sleep.cc \
src/core/lib/promise/trace.cc \
- src/core/lib/resolver/endpoint_addresses.cc \
- src/core/lib/resolver/resolver.cc \
- src/core/lib/resolver/resolver_registry.cc \
src/core/lib/resource_quota/api.cc \
src/core/lib/resource_quota/arena.cc \
src/core/lib/resource_quota/memory_quota.cc \
@@ -1730,6 +1709,27 @@ LIBGRPC_SRC = \
src/core/load_balancing/xds/xds_wrr_locality.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+ src/core/resolver/binder/binder_resolver.cc \
+ src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
+ src/core/resolver/dns/dns_resolver_plugin.cc \
+ src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
+ src/core/resolver/dns/event_engine/service_config_helper.cc \
+ src/core/resolver/dns/native/dns_resolver.cc \
+ src/core/resolver/endpoint_addresses.cc \
+ src/core/resolver/fake/fake_resolver.cc \
+ src/core/resolver/google_c2p/google_c2p_resolver.cc \
+ src/core/resolver/polling_resolver.cc \
+ src/core/resolver/resolver.cc \
+ src/core/resolver/resolver_registry.cc \
+ src/core/resolver/sockaddr/sockaddr_resolver.cc \
+ src/core/resolver/xds/xds_dependency_manager.cc \
+ src/core/resolver/xds/xds_resolver.cc \
+ src/core/resolver/xds/xds_resolver_trace.cc \
src/core/tsi/alts/crypt/aes_gcm.cc \
src/core/tsi/alts/crypt/gsec.cc \
src/core/tsi/alts/frame_protector/alts_counter.cc \
@@ -1909,20 +1909,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc \
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
- src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
@@ -2167,9 +2153,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/lib/promise/party.cc \
src/core/lib/promise/sleep.cc \
src/core/lib/promise/trace.cc \
- src/core/lib/resolver/endpoint_addresses.cc \
- src/core/lib/resolver/resolver.cc \
- src/core/lib/resolver/resolver_registry.cc \
src/core/lib/resource_quota/api.cc \
src/core/lib/resource_quota/arena.cc \
src/core/lib/resource_quota/memory_quota.cc \
@@ -2282,6 +2265,23 @@ LIBGRPC_UNSECURE_SRC = \
src/core/load_balancing/weighted_target/weighted_target.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
src/core/plugin_registry/grpc_plugin_registry_noextra.cc \
+ src/core/resolver/binder/binder_resolver.cc \
+ src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
+ src/core/resolver/dns/dns_resolver_plugin.cc \
+ src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
+ src/core/resolver/dns/event_engine/service_config_helper.cc \
+ src/core/resolver/dns/native/dns_resolver.cc \
+ src/core/resolver/endpoint_addresses.cc \
+ src/core/resolver/fake/fake_resolver.cc \
+ src/core/resolver/polling_resolver.cc \
+ src/core/resolver/resolver.cc \
+ src/core/resolver/resolver_registry.cc \
+ src/core/resolver/sockaddr/sockaddr_resolver.cc \
src/core/tsi/alts/handshaker/transport_security_common_api.cc \
src/core/tsi/fake_transport_security.cc \
src/core/tsi/local_transport_security.cc \
@@ -3422,10 +3422,6 @@ ifneq ($(OPENSSL_DEP),)
# This is to ensure the embedded OpenSSL is built beforehand, properly
# installing headers to their final destination on the drive. We need this
# otherwise parallel compilation will fail if a source is compiled first.
-src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc: $(OPENSSL_DEP)
-src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc: $(OPENSSL_DEP)
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP)
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc: $(OPENSSL_DEP)
src/core/ext/filters/rbac/rbac_filter.cc: $(OPENSSL_DEP)
src/core/ext/filters/rbac/rbac_service_config_parser.cc: $(OPENSSL_DEP)
src/core/ext/filters/server_config_selector/server_config_selector_filter.cc: $(OPENSSL_DEP)
@@ -3803,6 +3799,10 @@ src/core/load_balancing/xds/xds_cluster_manager.cc: $(OPENSSL_DEP)
src/core/load_balancing/xds/xds_override_host.cc: $(OPENSSL_DEP)
src/core/load_balancing/xds/xds_wrr_locality.cc: $(OPENSSL_DEP)
src/core/plugin_registry/grpc_plugin_registry_extra.cc: $(OPENSSL_DEP)
+src/core/resolver/google_c2p/google_c2p_resolver.cc: $(OPENSSL_DEP)
+src/core/resolver/xds/xds_dependency_manager.cc: $(OPENSSL_DEP)
+src/core/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP)
+src/core/resolver/xds/xds_resolver_trace.cc: $(OPENSSL_DEP)
src/core/tsi/alts/crypt/aes_gcm.cc: $(OPENSSL_DEP)
src/core/tsi/alts/crypt/gsec.cc: $(OPENSSL_DEP)
src/core/tsi/alts/frame_protector/alts_counter.cc: $(OPENSSL_DEP)
diff --git a/Package.swift b/Package.swift
index 39976a00980..79c17f2bfc4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -151,36 +151,6 @@ let package = Package(
"src/core/ext/filters/client_channel/http_proxy_mapper.h",
"src/core/ext/filters/client_channel/local_subchannel_pool.cc",
"src/core/ext/filters/client_channel/local_subchannel_pool.h",
- "src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc",
- "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc",
- "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc",
- "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h",
- "src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h",
- "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc",
- "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h",
- "src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h",
- "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h",
- "src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/polling_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/polling_resolver.h",
- "src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc",
- "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h",
- "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc",
- "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h",
- "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc",
- "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h",
"src/core/ext/filters/client_channel/retry_filter.cc",
"src/core/ext/filters/client_channel/retry_filter.h",
"src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc",
@@ -1637,14 +1607,6 @@ let package = Package(
"src/core/lib/promise/trace.h",
"src/core/lib/promise/try_join.h",
"src/core/lib/promise/try_seq.h",
- "src/core/lib/resolver/endpoint_addresses.cc",
- "src/core/lib/resolver/endpoint_addresses.h",
- "src/core/lib/resolver/resolver.cc",
- "src/core/lib/resolver/resolver.h",
- "src/core/lib/resolver/resolver_factory.h",
- "src/core/lib/resolver/resolver_registry.cc",
- "src/core/lib/resolver/resolver_registry.h",
- "src/core/lib/resolver/server_address.h",
"src/core/lib/resource_quota/api.cc",
"src/core/lib/resource_quota/api.h",
"src/core/lib/resource_quota/arena.cc",
@@ -1946,6 +1908,44 @@ let package = Package(
"src/core/load_balancing/xds/xds_wrr_locality.cc",
"src/core/plugin_registry/grpc_plugin_registry.cc",
"src/core/plugin_registry/grpc_plugin_registry_extra.cc",
+ "src/core/resolver/binder/binder_resolver.cc",
+ "src/core/resolver/dns/c_ares/dns_resolver_ares.cc",
+ "src/core/resolver/dns/c_ares/dns_resolver_ares.h",
+ "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h",
+ "src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc",
+ "src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc",
+ "src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc",
+ "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h",
+ "src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc",
+ "src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc",
+ "src/core/resolver/dns/dns_resolver_plugin.cc",
+ "src/core/resolver/dns/dns_resolver_plugin.h",
+ "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc",
+ "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h",
+ "src/core/resolver/dns/event_engine/service_config_helper.cc",
+ "src/core/resolver/dns/event_engine/service_config_helper.h",
+ "src/core/resolver/dns/native/dns_resolver.cc",
+ "src/core/resolver/dns/native/dns_resolver.h",
+ "src/core/resolver/endpoint_addresses.cc",
+ "src/core/resolver/endpoint_addresses.h",
+ "src/core/resolver/fake/fake_resolver.cc",
+ "src/core/resolver/fake/fake_resolver.h",
+ "src/core/resolver/google_c2p/google_c2p_resolver.cc",
+ "src/core/resolver/polling_resolver.cc",
+ "src/core/resolver/polling_resolver.h",
+ "src/core/resolver/resolver.cc",
+ "src/core/resolver/resolver.h",
+ "src/core/resolver/resolver_factory.h",
+ "src/core/resolver/resolver_registry.cc",
+ "src/core/resolver/resolver_registry.h",
+ "src/core/resolver/server_address.h",
+ "src/core/resolver/sockaddr/sockaddr_resolver.cc",
+ "src/core/resolver/xds/xds_dependency_manager.cc",
+ "src/core/resolver/xds/xds_dependency_manager.h",
+ "src/core/resolver/xds/xds_resolver.cc",
+ "src/core/resolver/xds/xds_resolver_attributes.h",
+ "src/core/resolver/xds/xds_resolver_trace.cc",
+ "src/core/resolver/xds/xds_resolver_trace.h",
"src/core/tsi/alts/crypt/aes_gcm.cc",
"src/core/tsi/alts/crypt/gsec.cc",
"src/core/tsi/alts/crypt/gsec.h",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 1964edf6d8a..9bb7a8a93dc 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -235,18 +235,6 @@ libs:
- src/core/ext/filters/client_channel/global_subchannel_pool.h
- src/core/ext/filters/client_channel/http_proxy_mapper.h
- src/core/ext/filters/client_channel/local_subchannel_pool.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
- - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h
- - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h
- - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
- - src/core/ext/filters/client_channel/resolver/polling_resolver.h
- - src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h
- - src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h
- - src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h
- src/core/ext/filters/client_channel/retry_filter.h
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h
- src/core/ext/filters/client_channel/retry_service_config.h
@@ -1052,11 +1040,6 @@ libs:
- src/core/lib/promise/trace.h
- src/core/lib/promise/try_join.h
- src/core/lib/promise/try_seq.h
- - src/core/lib/resolver/endpoint_addresses.h
- - src/core/lib/resolver/resolver.h
- - src/core/lib/resolver/resolver_factory.h
- - src/core/lib/resolver/resolver_registry.h
- - src/core/lib/resolver/server_address.h
- src/core/lib/resource_quota/api.h
- src/core/lib/resource_quota/arena.h
- src/core/lib/resource_quota/memory_quota.h
@@ -1202,6 +1185,23 @@ libs:
- src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
- src/core/load_balancing/xds/xds_channel_args.h
- src/core/load_balancing/xds/xds_override_host.h
+ - src/core/resolver/dns/c_ares/dns_resolver_ares.h
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
+ - src/core/resolver/dns/dns_resolver_plugin.h
+ - src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+ - src/core/resolver/dns/event_engine/service_config_helper.h
+ - src/core/resolver/dns/native/dns_resolver.h
+ - src/core/resolver/endpoint_addresses.h
+ - src/core/resolver/fake/fake_resolver.h
+ - src/core/resolver/polling_resolver.h
+ - src/core/resolver/resolver.h
+ - src/core/resolver/resolver_factory.h
+ - src/core/resolver/resolver_registry.h
+ - src/core/resolver/server_address.h
+ - src/core/resolver/xds/xds_dependency_manager.h
+ - src/core/resolver/xds/xds_resolver_attributes.h
+ - src/core/resolver/xds/xds_resolver_trace.h
- src/core/tsi/alts/crypt/gsec.h
- src/core/tsi/alts/frame_protector/alts_counter.h
- src/core/tsi/alts/frame_protector/alts_crypter.h
@@ -1252,24 +1252,6 @@ libs:
- src/core/ext/filters/client_channel/global_subchannel_pool.cc
- src/core/ext/filters/client_channel/http_proxy_mapper.cc
- src/core/ext/filters/client_channel/local_subchannel_pool.cc
- - src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
- - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
- - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
- - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
- - src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
- - src/core/ext/filters/client_channel/resolver/polling_resolver.cc
- - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
- - src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
- - src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
- - src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
- src/core/ext/filters/client_channel/retry_filter.cc
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
- src/core/ext/filters/client_channel/retry_service_config.cc
@@ -1850,9 +1832,6 @@ libs:
- src/core/lib/promise/party.cc
- src/core/lib/promise/sleep.cc
- src/core/lib/promise/trace.cc
- - src/core/lib/resolver/endpoint_addresses.cc
- - src/core/lib/resolver/resolver.cc
- - src/core/lib/resolver/resolver_registry.cc
- src/core/lib/resource_quota/api.cc
- src/core/lib/resource_quota/arena.cc
- src/core/lib/resource_quota/memory_quota.cc
@@ -2005,6 +1984,27 @@ libs:
- src/core/load_balancing/xds/xds_wrr_locality.cc
- src/core/plugin_registry/grpc_plugin_registry.cc
- src/core/plugin_registry/grpc_plugin_registry_extra.cc
+ - src/core/resolver/binder/binder_resolver.cc
+ - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+ - src/core/resolver/dns/dns_resolver_plugin.cc
+ - src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+ - src/core/resolver/dns/event_engine/service_config_helper.cc
+ - src/core/resolver/dns/native/dns_resolver.cc
+ - src/core/resolver/endpoint_addresses.cc
+ - src/core/resolver/fake/fake_resolver.cc
+ - src/core/resolver/google_c2p/google_c2p_resolver.cc
+ - src/core/resolver/polling_resolver.cc
+ - src/core/resolver/resolver.cc
+ - src/core/resolver/resolver_registry.cc
+ - src/core/resolver/sockaddr/sockaddr_resolver.cc
+ - src/core/resolver/xds/xds_dependency_manager.cc
+ - src/core/resolver/xds/xds_resolver.cc
+ - src/core/resolver/xds/xds_resolver_trace.cc
- src/core/tsi/alts/crypt/aes_gcm.cc
- src/core/tsi/alts/crypt/gsec.cc
- src/core/tsi/alts/frame_protector/alts_counter.cc
@@ -2214,15 +2214,6 @@ libs:
- src/core/ext/filters/client_channel/global_subchannel_pool.h
- src/core/ext/filters/client_channel/http_proxy_mapper.h
- src/core/ext/filters/client_channel/local_subchannel_pool.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
- - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h
- - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h
- - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
- - src/core/ext/filters/client_channel/resolver/polling_resolver.h
- src/core/ext/filters/client_channel/retry_filter.h
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h
- src/core/ext/filters/client_channel/retry_service_config.h
@@ -2541,11 +2532,6 @@ libs:
- src/core/lib/promise/trace.h
- src/core/lib/promise/try_join.h
- src/core/lib/promise/try_seq.h
- - src/core/lib/resolver/endpoint_addresses.h
- - src/core/lib/resolver/resolver.h
- - src/core/lib/resolver/resolver_factory.h
- - src/core/lib/resolver/resolver_registry.h
- - src/core/lib/resolver/server_address.h
- src/core/lib/resource_quota/api.h
- src/core/lib/resource_quota/arena.h
- src/core/lib/resource_quota/memory_quota.h
@@ -2657,6 +2643,20 @@ libs:
- src/core/load_balancing/subchannel_interface.h
- src/core/load_balancing/subchannel_list.h
- src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
+ - src/core/resolver/dns/c_ares/dns_resolver_ares.h
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
+ - src/core/resolver/dns/dns_resolver_plugin.h
+ - src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+ - src/core/resolver/dns/event_engine/service_config_helper.h
+ - src/core/resolver/dns/native/dns_resolver.h
+ - src/core/resolver/endpoint_addresses.h
+ - src/core/resolver/fake/fake_resolver.h
+ - src/core/resolver/polling_resolver.h
+ - src/core/resolver/resolver.h
+ - src/core/resolver/resolver_factory.h
+ - src/core/resolver/resolver_registry.h
+ - src/core/resolver/server_address.h
- src/core/tsi/alts/handshaker/transport_security_common_api.h
- src/core/tsi/fake_transport_security.h
- src/core/tsi/local_transport_security.h
@@ -2703,20 +2703,6 @@ libs:
- src/core/ext/filters/client_channel/global_subchannel_pool.cc
- src/core/ext/filters/client_channel/http_proxy_mapper.cc
- src/core/ext/filters/client_channel/local_subchannel_pool.cc
- - src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
- - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
- - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
- - src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
- - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
- - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
- - src/core/ext/filters/client_channel/resolver/polling_resolver.cc
- - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
- src/core/ext/filters/client_channel/retry_filter.cc
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
- src/core/ext/filters/client_channel/retry_service_config.cc
@@ -2961,9 +2947,6 @@ libs:
- src/core/lib/promise/party.cc
- src/core/lib/promise/sleep.cc
- src/core/lib/promise/trace.cc
- - src/core/lib/resolver/endpoint_addresses.cc
- - src/core/lib/resolver/resolver.cc
- - src/core/lib/resolver/resolver_registry.cc
- src/core/lib/resource_quota/api.cc
- src/core/lib/resource_quota/arena.cc
- src/core/lib/resource_quota/memory_quota.cc
@@ -3076,6 +3059,23 @@ libs:
- src/core/load_balancing/weighted_target/weighted_target.cc
- src/core/plugin_registry/grpc_plugin_registry.cc
- src/core/plugin_registry/grpc_plugin_registry_noextra.cc
+ - src/core/resolver/binder/binder_resolver.cc
+ - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+ - src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+ - src/core/resolver/dns/dns_resolver_plugin.cc
+ - src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+ - src/core/resolver/dns/event_engine/service_config_helper.cc
+ - src/core/resolver/dns/native/dns_resolver.cc
+ - src/core/resolver/endpoint_addresses.cc
+ - src/core/resolver/fake/fake_resolver.cc
+ - src/core/resolver/polling_resolver.cc
+ - src/core/resolver/resolver.cc
+ - src/core/resolver/resolver_registry.cc
+ - src/core/resolver/sockaddr/sockaddr_resolver.cc
- src/core/tsi/alts/handshaker/transport_security_common_api.cc
- src/core/tsi/fake_transport_security.cc
- src/core/tsi/local_transport_security.cc
@@ -4604,11 +4604,6 @@ libs:
- src/core/lib/promise/trace.h
- src/core/lib/promise/try_join.h
- src/core/lib/promise/try_seq.h
- - src/core/lib/resolver/endpoint_addresses.h
- - src/core/lib/resolver/resolver.h
- - src/core/lib/resolver/resolver_factory.h
- - src/core/lib/resolver/resolver_registry.h
- - src/core/lib/resolver/server_address.h
- src/core/lib/resource_quota/api.h
- src/core/lib/resource_quota/arena.h
- src/core/lib/resource_quota/memory_quota.h
@@ -4702,6 +4697,11 @@ libs:
- src/core/load_balancing/lb_policy_factory.h
- src/core/load_balancing/lb_policy_registry.h
- src/core/load_balancing/subchannel_interface.h
+ - src/core/resolver/endpoint_addresses.h
+ - src/core/resolver/resolver.h
+ - src/core/resolver/resolver_factory.h
+ - src/core/resolver/resolver_registry.h
+ - src/core/resolver/server_address.h
- src/core/tsi/alts/handshaker/transport_security_common_api.h
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
@@ -4903,9 +4903,6 @@ libs:
- src/core/lib/promise/activity.cc
- src/core/lib/promise/party.cc
- src/core/lib/promise/trace.cc
- - src/core/lib/resolver/endpoint_addresses.cc
- - src/core/lib/resolver/resolver.cc
- - src/core/lib/resolver/resolver_registry.cc
- src/core/lib/resource_quota/api.cc
- src/core/lib/resource_quota/arena.cc
- src/core/lib/resource_quota/memory_quota.cc
@@ -4996,6 +4993,9 @@ libs:
- src/core/lib/uri/uri_parser.cc
- src/core/load_balancing/lb_policy.cc
- src/core/load_balancing/lb_policy_registry.cc
+ - src/core/resolver/endpoint_addresses.cc
+ - src/core/resolver/resolver.cc
+ - src/core/resolver/resolver_registry.cc
- src/core/tsi/alts/handshaker/transport_security_common_api.cc
- src/core/tsi/transport_security.cc
- src/core/tsi/transport_security_grpc.cc
diff --git a/config.m4 b/config.m4
index 30bbb2dcf5c..e6ca5d180da 100644
--- a/config.m4
+++ b/config.m4
@@ -59,24 +59,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
- src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc \
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
- src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc \
- src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
@@ -703,9 +685,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/promise/party.cc \
src/core/lib/promise/sleep.cc \
src/core/lib/promise/trace.cc \
- src/core/lib/resolver/endpoint_addresses.cc \
- src/core/lib/resolver/resolver.cc \
- src/core/lib/resolver/resolver_registry.cc \
src/core/lib/resource_quota/api.cc \
src/core/lib/resource_quota/arena.cc \
src/core/lib/resource_quota/memory_quota.cc \
@@ -858,6 +837,27 @@ if test "$PHP_GRPC" != "no"; then
src/core/load_balancing/xds/xds_wrr_locality.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+ src/core/resolver/binder/binder_resolver.cc \
+ src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
+ src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
+ src/core/resolver/dns/dns_resolver_plugin.cc \
+ src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
+ src/core/resolver/dns/event_engine/service_config_helper.cc \
+ src/core/resolver/dns/native/dns_resolver.cc \
+ src/core/resolver/endpoint_addresses.cc \
+ src/core/resolver/fake/fake_resolver.cc \
+ src/core/resolver/google_c2p/google_c2p_resolver.cc \
+ src/core/resolver/polling_resolver.cc \
+ src/core/resolver/resolver.cc \
+ src/core/resolver/resolver_registry.cc \
+ src/core/resolver/sockaddr/sockaddr_resolver.cc \
+ src/core/resolver/xds/xds_dependency_manager.cc \
+ src/core/resolver/xds/xds_resolver.cc \
+ src/core/resolver/xds/xds_resolver_trace.cc \
src/core/tsi/alts/crypt/aes_gcm.cc \
src/core/tsi/alts/crypt/gsec.cc \
src/core/tsi/alts/frame_protector/alts_counter.cc \
@@ -1374,16 +1374,6 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/binder)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns/c_ares)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns/event_engine)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns/native)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/fake)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/google_c2p)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/sockaddr)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/fault_injection)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http)
@@ -1535,7 +1525,6 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resolver)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/certificate_provider)
@@ -1581,6 +1570,16 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/weighted_target)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/binder)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/c_ares)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/event_engine)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/native)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/fake)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/google_c2p)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/sockaddr)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/frame_protector)
diff --git a/config.w32 b/config.w32
index b316bb9bbcb..226e4817739 100644
--- a/config.w32
+++ b/config.w32
@@ -24,24 +24,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\filters\\client_channel\\global_subchannel_pool.cc " +
"src\\core\\ext\\filters\\client_channel\\http_proxy_mapper.cc " +
"src\\core\\ext\\filters\\client_channel\\local_subchannel_pool.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\binder\\binder_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_posix.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_windows.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\dns_resolver_plugin.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\event_engine\\event_engine_client_channel_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\event_engine\\service_config_helper.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\dns\\native\\dns_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\fake\\fake_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\google_c2p\\google_c2p_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\polling_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\sockaddr\\sockaddr_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\xds\\xds_dependency_manager.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\xds\\xds_resolver.cc " +
- "src\\core\\ext\\filters\\client_channel\\resolver\\xds\\xds_resolver_trace.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_filter.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_filter_legacy_call_data.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_service_config.cc " +
@@ -668,9 +650,6 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\promise\\party.cc " +
"src\\core\\lib\\promise\\sleep.cc " +
"src\\core\\lib\\promise\\trace.cc " +
- "src\\core\\lib\\resolver\\endpoint_addresses.cc " +
- "src\\core\\lib\\resolver\\resolver.cc " +
- "src\\core\\lib\\resolver\\resolver_registry.cc " +
"src\\core\\lib\\resource_quota\\api.cc " +
"src\\core\\lib\\resource_quota\\arena.cc " +
"src\\core\\lib\\resource_quota\\memory_quota.cc " +
@@ -823,6 +802,27 @@ if (PHP_GRPC != "no") {
"src\\core\\load_balancing\\xds\\xds_wrr_locality.cc " +
"src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
"src\\core\\plugin_registry\\grpc_plugin_registry_extra.cc " +
+ "src\\core\\resolver\\binder\\binder_resolver.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\grpc_ares_wrapper.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\grpc_ares_wrapper_posix.cc " +
+ "src\\core\\resolver\\dns\\c_ares\\grpc_ares_wrapper_windows.cc " +
+ "src\\core\\resolver\\dns\\dns_resolver_plugin.cc " +
+ "src\\core\\resolver\\dns\\event_engine\\event_engine_client_channel_resolver.cc " +
+ "src\\core\\resolver\\dns\\event_engine\\service_config_helper.cc " +
+ "src\\core\\resolver\\dns\\native\\dns_resolver.cc " +
+ "src\\core\\resolver\\endpoint_addresses.cc " +
+ "src\\core\\resolver\\fake\\fake_resolver.cc " +
+ "src\\core\\resolver\\google_c2p\\google_c2p_resolver.cc " +
+ "src\\core\\resolver\\polling_resolver.cc " +
+ "src\\core\\resolver\\resolver.cc " +
+ "src\\core\\resolver\\resolver_registry.cc " +
+ "src\\core\\resolver\\sockaddr\\sockaddr_resolver.cc " +
+ "src\\core\\resolver\\xds\\xds_dependency_manager.cc " +
+ "src\\core\\resolver\\xds\\xds_resolver.cc " +
+ "src\\core\\resolver\\xds\\xds_resolver_trace.cc " +
"src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " +
"src\\core\\tsi\\alts\\crypt\\gsec.cc " +
"src\\core\\tsi\\alts\\frame_protector\\alts_counter.cc " +
@@ -1368,16 +1368,6 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\census");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\channel_idle");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\binder");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\dns");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\dns\\event_engine");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\dns\\native");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\fake");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\google_c2p");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\sockaddr");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\deadline");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\fault_injection");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http");
@@ -1672,7 +1662,6 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise");
- FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resolver");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\authorization");
@@ -1719,6 +1708,16 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\weighted_target");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\binder");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\c_ares");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\event_engine");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\native");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\fake");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\google_c2p");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\sockaddr");
+ FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\crypt");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 1b5a250be1b..cee645af1f6 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -275,18 +275,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
@@ -1156,11 +1144,6 @@ Pod::Spec.new do |s|
'src/core/lib/promise/trace.h',
'src/core/lib/promise/try_join.h',
'src/core/lib/promise/try_seq.h',
- 'src/core/lib/resolver/endpoint_addresses.h',
- 'src/core/lib/resolver/resolver.h',
- 'src/core/lib/resolver/resolver_factory.h',
- 'src/core/lib/resolver/resolver_registry.h',
- 'src/core/lib/resolver/server_address.h',
'src/core/lib/resource_quota/api.h',
'src/core/lib/resource_quota/arena.h',
'src/core/lib/resource_quota/memory_quota.h',
@@ -1306,6 +1289,23 @@ Pod::Spec.new do |s|
'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h',
'src/core/load_balancing/xds/xds_channel_args.h',
'src/core/load_balancing/xds/xds_override_host.h',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.h',
+ 'src/core/resolver/dns/dns_resolver_plugin.h',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
+ 'src/core/resolver/dns/event_engine/service_config_helper.h',
+ 'src/core/resolver/dns/native/dns_resolver.h',
+ 'src/core/resolver/endpoint_addresses.h',
+ 'src/core/resolver/fake/fake_resolver.h',
+ 'src/core/resolver/polling_resolver.h',
+ 'src/core/resolver/resolver.h',
+ 'src/core/resolver/resolver_factory.h',
+ 'src/core/resolver/resolver_registry.h',
+ 'src/core/resolver/server_address.h',
+ 'src/core/resolver/xds/xds_dependency_manager.h',
+ 'src/core/resolver/xds/xds_resolver_attributes.h',
+ 'src/core/resolver/xds/xds_resolver_trace.h',
'src/core/tsi/alts/crypt/gsec.h',
'src/core/tsi/alts/frame_protector/alts_counter.h',
'src/core/tsi/alts/frame_protector/alts_crypter.h',
@@ -1550,18 +1550,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
@@ -2413,11 +2401,6 @@ Pod::Spec.new do |s|
'src/core/lib/promise/trace.h',
'src/core/lib/promise/try_join.h',
'src/core/lib/promise/try_seq.h',
- 'src/core/lib/resolver/endpoint_addresses.h',
- 'src/core/lib/resolver/resolver.h',
- 'src/core/lib/resolver/resolver_factory.h',
- 'src/core/lib/resolver/resolver_registry.h',
- 'src/core/lib/resolver/server_address.h',
'src/core/lib/resource_quota/api.h',
'src/core/lib/resource_quota/arena.h',
'src/core/lib/resource_quota/memory_quota.h',
@@ -2563,6 +2546,23 @@ Pod::Spec.new do |s|
'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h',
'src/core/load_balancing/xds/xds_channel_args.h',
'src/core/load_balancing/xds/xds_override_host.h',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.h',
+ 'src/core/resolver/dns/dns_resolver_plugin.h',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
+ 'src/core/resolver/dns/event_engine/service_config_helper.h',
+ 'src/core/resolver/dns/native/dns_resolver.h',
+ 'src/core/resolver/endpoint_addresses.h',
+ 'src/core/resolver/fake/fake_resolver.h',
+ 'src/core/resolver/polling_resolver.h',
+ 'src/core/resolver/resolver.h',
+ 'src/core/resolver/resolver_factory.h',
+ 'src/core/resolver/resolver_registry.h',
+ 'src/core/resolver/server_address.h',
+ 'src/core/resolver/xds/xds_dependency_manager.h',
+ 'src/core/resolver/xds/xds_resolver_attributes.h',
+ 'src/core/resolver/xds/xds_resolver_trace.h',
'src/core/tsi/alts/crypt/gsec.h',
'src/core/tsi/alts/frame_protector/alts_counter.h',
'src/core/tsi/alts/frame_protector/alts_crypter.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 19436806e23..d9514fbb5ae 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -264,36 +264,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
- 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
@@ -1750,14 +1720,6 @@ Pod::Spec.new do |s|
'src/core/lib/promise/trace.h',
'src/core/lib/promise/try_join.h',
'src/core/lib/promise/try_seq.h',
- 'src/core/lib/resolver/endpoint_addresses.cc',
- 'src/core/lib/resolver/endpoint_addresses.h',
- 'src/core/lib/resolver/resolver.cc',
- 'src/core/lib/resolver/resolver.h',
- 'src/core/lib/resolver/resolver_factory.h',
- 'src/core/lib/resolver/resolver_registry.cc',
- 'src/core/lib/resolver/resolver_registry.h',
- 'src/core/lib/resolver/server_address.h',
'src/core/lib/resource_quota/api.cc',
'src/core/lib/resource_quota/api.h',
'src/core/lib/resource_quota/arena.cc',
@@ -2055,6 +2017,44 @@ Pod::Spec.new do |s|
'src/core/load_balancing/xds/xds_wrr_locality.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
+ 'src/core/resolver/binder/binder_resolver.cc',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
+ 'src/core/resolver/dns/dns_resolver_plugin.cc',
+ 'src/core/resolver/dns/dns_resolver_plugin.h',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
+ 'src/core/resolver/dns/event_engine/service_config_helper.cc',
+ 'src/core/resolver/dns/event_engine/service_config_helper.h',
+ 'src/core/resolver/dns/native/dns_resolver.cc',
+ 'src/core/resolver/dns/native/dns_resolver.h',
+ 'src/core/resolver/endpoint_addresses.cc',
+ 'src/core/resolver/endpoint_addresses.h',
+ 'src/core/resolver/fake/fake_resolver.cc',
+ 'src/core/resolver/fake/fake_resolver.h',
+ 'src/core/resolver/google_c2p/google_c2p_resolver.cc',
+ 'src/core/resolver/polling_resolver.cc',
+ 'src/core/resolver/polling_resolver.h',
+ 'src/core/resolver/resolver.cc',
+ 'src/core/resolver/resolver.h',
+ 'src/core/resolver/resolver_factory.h',
+ 'src/core/resolver/resolver_registry.cc',
+ 'src/core/resolver/resolver_registry.h',
+ 'src/core/resolver/server_address.h',
+ 'src/core/resolver/sockaddr/sockaddr_resolver.cc',
+ 'src/core/resolver/xds/xds_dependency_manager.cc',
+ 'src/core/resolver/xds/xds_dependency_manager.h',
+ 'src/core/resolver/xds/xds_resolver.cc',
+ 'src/core/resolver/xds/xds_resolver_attributes.h',
+ 'src/core/resolver/xds/xds_resolver_trace.cc',
+ 'src/core/resolver/xds/xds_resolver_trace.h',
'src/core/tsi/alts/crypt/aes_gcm.cc',
'src/core/tsi/alts/crypt/gsec.cc',
'src/core/tsi/alts/crypt/gsec.h',
@@ -2351,18 +2351,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
@@ -3193,11 +3181,6 @@ Pod::Spec.new do |s|
'src/core/lib/promise/trace.h',
'src/core/lib/promise/try_join.h',
'src/core/lib/promise/try_seq.h',
- 'src/core/lib/resolver/endpoint_addresses.h',
- 'src/core/lib/resolver/resolver.h',
- 'src/core/lib/resolver/resolver_factory.h',
- 'src/core/lib/resolver/resolver_registry.h',
- 'src/core/lib/resolver/server_address.h',
'src/core/lib/resource_quota/api.h',
'src/core/lib/resource_quota/arena.h',
'src/core/lib/resource_quota/memory_quota.h',
@@ -3343,6 +3326,23 @@ Pod::Spec.new do |s|
'src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h',
'src/core/load_balancing/xds/xds_channel_args.h',
'src/core/load_balancing/xds/xds_override_host.h',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.h',
+ 'src/core/resolver/dns/dns_resolver_plugin.h',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h',
+ 'src/core/resolver/dns/event_engine/service_config_helper.h',
+ 'src/core/resolver/dns/native/dns_resolver.h',
+ 'src/core/resolver/endpoint_addresses.h',
+ 'src/core/resolver/fake/fake_resolver.h',
+ 'src/core/resolver/polling_resolver.h',
+ 'src/core/resolver/resolver.h',
+ 'src/core/resolver/resolver_factory.h',
+ 'src/core/resolver/resolver_registry.h',
+ 'src/core/resolver/server_address.h',
+ 'src/core/resolver/xds/xds_dependency_manager.h',
+ 'src/core/resolver/xds/xds_resolver_attributes.h',
+ 'src/core/resolver/xds/xds_resolver_trace.h',
'src/core/tsi/alts/crypt/gsec.h',
'src/core/tsi/alts/frame_protector/alts_counter.h',
'src/core/tsi/alts/frame_protector/alts_crypter.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index b78139acfa3..4caf5f23bc2 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -157,36 +157,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/client_channel/http_proxy_mapper.h )
s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.cc )
s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/polling_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/polling_resolver.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc )
- s.files += %w( src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h )
s.files += %w( src/core/ext/filters/client_channel/retry_filter.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_filter.h )
s.files += %w( src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc )
@@ -1643,14 +1613,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/promise/trace.h )
s.files += %w( src/core/lib/promise/try_join.h )
s.files += %w( src/core/lib/promise/try_seq.h )
- s.files += %w( src/core/lib/resolver/endpoint_addresses.cc )
- s.files += %w( src/core/lib/resolver/endpoint_addresses.h )
- s.files += %w( src/core/lib/resolver/resolver.cc )
- s.files += %w( src/core/lib/resolver/resolver.h )
- s.files += %w( src/core/lib/resolver/resolver_factory.h )
- s.files += %w( src/core/lib/resolver/resolver_registry.cc )
- s.files += %w( src/core/lib/resolver/resolver_registry.h )
- s.files += %w( src/core/lib/resolver/server_address.h )
s.files += %w( src/core/lib/resource_quota/api.cc )
s.files += %w( src/core/lib/resource_quota/api.h )
s.files += %w( src/core/lib/resource_quota/arena.cc )
@@ -1948,6 +1910,44 @@ Gem::Specification.new do |s|
s.files += %w( src/core/load_balancing/xds/xds_wrr_locality.cc )
s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
s.files += %w( src/core/plugin_registry/grpc_plugin_registry_extra.cc )
+ s.files += %w( src/core/resolver/binder/binder_resolver.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.h )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_wrapper.h )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc )
+ s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc )
+ s.files += %w( src/core/resolver/dns/dns_resolver_plugin.cc )
+ s.files += %w( src/core/resolver/dns/dns_resolver_plugin.h )
+ s.files += %w( src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc )
+ s.files += %w( src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h )
+ s.files += %w( src/core/resolver/dns/event_engine/service_config_helper.cc )
+ s.files += %w( src/core/resolver/dns/event_engine/service_config_helper.h )
+ s.files += %w( src/core/resolver/dns/native/dns_resolver.cc )
+ s.files += %w( src/core/resolver/dns/native/dns_resolver.h )
+ s.files += %w( src/core/resolver/endpoint_addresses.cc )
+ s.files += %w( src/core/resolver/endpoint_addresses.h )
+ s.files += %w( src/core/resolver/fake/fake_resolver.cc )
+ s.files += %w( src/core/resolver/fake/fake_resolver.h )
+ s.files += %w( src/core/resolver/google_c2p/google_c2p_resolver.cc )
+ s.files += %w( src/core/resolver/polling_resolver.cc )
+ s.files += %w( src/core/resolver/polling_resolver.h )
+ s.files += %w( src/core/resolver/resolver.cc )
+ s.files += %w( src/core/resolver/resolver.h )
+ s.files += %w( src/core/resolver/resolver_factory.h )
+ s.files += %w( src/core/resolver/resolver_registry.cc )
+ s.files += %w( src/core/resolver/resolver_registry.h )
+ s.files += %w( src/core/resolver/server_address.h )
+ s.files += %w( src/core/resolver/sockaddr/sockaddr_resolver.cc )
+ s.files += %w( src/core/resolver/xds/xds_dependency_manager.cc )
+ s.files += %w( src/core/resolver/xds/xds_dependency_manager.h )
+ s.files += %w( src/core/resolver/xds/xds_resolver.cc )
+ s.files += %w( src/core/resolver/xds/xds_resolver_attributes.h )
+ s.files += %w( src/core/resolver/xds/xds_resolver_trace.cc )
+ s.files += %w( src/core/resolver/xds/xds_resolver_trace.h )
s.files += %w( src/core/tsi/alts/crypt/aes_gcm.cc )
s.files += %w( src/core/tsi/alts/crypt/gsec.cc )
s.files += %w( src/core/tsi/alts/crypt/gsec.h )
diff --git a/grpc.gyp b/grpc.gyp
index b43595e2b0d..97d4590242b 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -291,24 +291,6 @@
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
- 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
@@ -889,9 +871,6 @@
'src/core/lib/promise/party.cc',
'src/core/lib/promise/sleep.cc',
'src/core/lib/promise/trace.cc',
- 'src/core/lib/resolver/endpoint_addresses.cc',
- 'src/core/lib/resolver/resolver.cc',
- 'src/core/lib/resolver/resolver_registry.cc',
'src/core/lib/resource_quota/api.cc',
'src/core/lib/resource_quota/arena.cc',
'src/core/lib/resource_quota/memory_quota.cc',
@@ -1044,6 +1023,27 @@
'src/core/load_balancing/xds/xds_wrr_locality.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
+ 'src/core/resolver/binder/binder_resolver.cc',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
+ 'src/core/resolver/dns/dns_resolver_plugin.cc',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
+ 'src/core/resolver/dns/event_engine/service_config_helper.cc',
+ 'src/core/resolver/dns/native/dns_resolver.cc',
+ 'src/core/resolver/endpoint_addresses.cc',
+ 'src/core/resolver/fake/fake_resolver.cc',
+ 'src/core/resolver/google_c2p/google_c2p_resolver.cc',
+ 'src/core/resolver/polling_resolver.cc',
+ 'src/core/resolver/resolver.cc',
+ 'src/core/resolver/resolver_registry.cc',
+ 'src/core/resolver/sockaddr/sockaddr_resolver.cc',
+ 'src/core/resolver/xds/xds_dependency_manager.cc',
+ 'src/core/resolver/xds/xds_resolver.cc',
+ 'src/core/resolver/xds/xds_resolver_trace.cc',
'src/core/tsi/alts/crypt/aes_gcm.cc',
'src/core/tsi/alts/crypt/gsec.cc',
'src/core/tsi/alts/frame_protector/alts_counter.cc',
@@ -1163,20 +1163,6 @@
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
- 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
@@ -1421,9 +1407,6 @@
'src/core/lib/promise/party.cc',
'src/core/lib/promise/sleep.cc',
'src/core/lib/promise/trace.cc',
- 'src/core/lib/resolver/endpoint_addresses.cc',
- 'src/core/lib/resolver/resolver.cc',
- 'src/core/lib/resolver/resolver_registry.cc',
'src/core/lib/resource_quota/api.cc',
'src/core/lib/resource_quota/arena.cc',
'src/core/lib/resource_quota/memory_quota.cc',
@@ -1536,6 +1519,23 @@
'src/core/load_balancing/weighted_target/weighted_target.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
'src/core/plugin_registry/grpc_plugin_registry_noextra.cc',
+ 'src/core/resolver/binder/binder_resolver.cc',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
+ 'src/core/resolver/dns/dns_resolver_plugin.cc',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
+ 'src/core/resolver/dns/event_engine/service_config_helper.cc',
+ 'src/core/resolver/dns/native/dns_resolver.cc',
+ 'src/core/resolver/endpoint_addresses.cc',
+ 'src/core/resolver/fake/fake_resolver.cc',
+ 'src/core/resolver/polling_resolver.cc',
+ 'src/core/resolver/resolver.cc',
+ 'src/core/resolver/resolver_registry.cc',
+ 'src/core/resolver/sockaddr/sockaddr_resolver.cc',
'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
'src/core/tsi/fake_transport_security.cc',
'src/core/tsi/local_transport_security.cc',
@@ -2211,9 +2211,6 @@
'src/core/lib/promise/activity.cc',
'src/core/lib/promise/party.cc',
'src/core/lib/promise/trace.cc',
- 'src/core/lib/resolver/endpoint_addresses.cc',
- 'src/core/lib/resolver/resolver.cc',
- 'src/core/lib/resolver/resolver_registry.cc',
'src/core/lib/resource_quota/api.cc',
'src/core/lib/resource_quota/arena.cc',
'src/core/lib/resource_quota/memory_quota.cc',
@@ -2304,6 +2301,9 @@
'src/core/lib/uri/uri_parser.cc',
'src/core/load_balancing/lb_policy.cc',
'src/core/load_balancing/lb_policy_registry.cc',
+ 'src/core/resolver/endpoint_addresses.cc',
+ 'src/core/resolver/resolver.cc',
+ 'src/core/resolver/resolver_registry.cc',
'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
'src/core/tsi/transport_security.cc',
'src/core/tsi/transport_security_grpc.cc',
diff --git a/package.xml b/package.xml
index 2248624d4d4..5b1b5aae823 100644
--- a/package.xml
+++ b/package.xml
@@ -139,36 +139,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1625,14 +1595,6 @@
-
-
-
-
-
-
-
-
@@ -1930,6 +1892,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/core/BUILD b/src/core/BUILD
index 4603f0cba85..3db3e15eedb 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -5655,10 +5655,10 @@ grpc_cc_library(
grpc_cc_library(
name = "polling_resolver",
srcs = [
- "ext/filters/client_channel/resolver/polling_resolver.cc",
+ "resolver/polling_resolver.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/polling_resolver.h",
+ "resolver/polling_resolver.h",
],
external_deps = [
"absl/status",
@@ -5690,10 +5690,10 @@ grpc_cc_library(
grpc_cc_library(
name = "service_config_helper",
srcs = [
- "ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc",
+ "resolver/dns/event_engine/service_config_helper.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h",
+ "resolver/dns/event_engine/service_config_helper.h",
],
external_deps = [
"absl/status:statusor",
@@ -5715,10 +5715,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_dns_event_engine",
srcs = [
- "ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc",
+ "resolver/dns/event_engine/event_engine_client_channel_resolver.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h",
+ "resolver/dns/event_engine/event_engine_client_channel_resolver.h",
],
external_deps = [
"absl/base:core_headers",
@@ -5758,10 +5758,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_dns_plugin",
srcs = [
- "ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc",
+ "resolver/dns/dns_resolver_plugin.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h",
+ "resolver/dns/dns_resolver_plugin.h",
],
external_deps = ["absl/strings"],
language = "c++",
@@ -5780,10 +5780,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_dns_native",
srcs = [
- "ext/filters/client_channel/resolver/dns/native/dns_resolver.cc",
+ "resolver/dns/native/dns_resolver.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/dns/native/dns_resolver.h",
+ "resolver/dns/native/dns_resolver.h",
],
external_deps = [
"absl/functional:bind_front",
@@ -5816,7 +5816,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_sockaddr",
srcs = [
- "ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc",
+ "resolver/sockaddr/sockaddr_resolver.cc",
],
external_deps = [
"absl/status:statusor",
@@ -5840,7 +5840,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_binder",
srcs = [
- "ext/filters/client_channel/resolver/binder/binder_resolver.cc",
+ "resolver/binder/binder_resolver.cc",
],
external_deps = [
"absl/status",
@@ -5866,7 +5866,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_xds_attributes",
hdrs = [
- "ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h",
+ "resolver/xds/xds_resolver_attributes.h",
],
external_deps = ["absl/strings"],
language = "c++",
@@ -5880,10 +5880,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_xds_trace",
srcs = [
- "ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc",
+ "resolver/xds/xds_resolver_trace.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/xds/xds_resolver_trace.h",
+ "resolver/xds/xds_resolver_trace.h",
],
language = "c++",
deps = [
@@ -5895,10 +5895,10 @@ grpc_cc_library(
grpc_cc_library(
name = "xds_dependency_manager",
srcs = [
- "ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc",
+ "resolver/xds/xds_dependency_manager.cc",
],
hdrs = [
- "ext/filters/client_channel/resolver/xds/xds_dependency_manager.h",
+ "resolver/xds/xds_dependency_manager.h",
],
external_deps = [
"absl/container:flat_hash_map",
@@ -5922,7 +5922,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_xds",
srcs = [
- "ext/filters/client_channel/resolver/xds/xds_resolver.cc",
+ "resolver/xds/xds_resolver.cc",
],
external_deps = [
"absl/meta:type_traits",
@@ -5981,7 +5981,7 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_resolver_c2p",
srcs = [
- "ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc",
+ "resolver/google_c2p/google_c2p_resolver.cc",
],
external_deps = [
"absl/status:statusor",
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 47647a2da08..8fc6976560d 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -91,8 +91,6 @@
#include "src/core/lib/promise/poll.h"
#include "src/core/lib/promise/promise.h"
#include "src/core/lib/promise/try_seq.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/service_config/service_config_call_data.h"
#include "src/core/lib/service_config/service_config_impl.h"
@@ -106,6 +104,8 @@
#include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/subchannel_interface.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver_registry.h"
//
// Client channel filter
diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h
index 02f17796a19..6da29141bd3 100644
--- a/src/core/ext/filters/client_channel/client_channel.h
+++ b/src/core/ext/filters/client_channel/client_channel.h
@@ -62,7 +62,6 @@
#include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/promise/activity.h"
#include "src/core/lib/promise/arena_promise.h"
-#include "src/core/lib/resolver/resolver.h"
#include "src/core/lib/resource_quota/arena.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/slice/slice.h"
@@ -72,6 +71,7 @@
#include "src/core/lib/transport/transport.h"
#include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/resolver.h"
//
// Client channel filter
diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc
index 0774e95c232..f68ce1788c1 100644
--- a/src/core/ext/filters/logging/logging_filter.cc
+++ b/src/core/ext/filters/logging/logging_filter.cc
@@ -62,7 +62,6 @@
#include "src/core/lib/promise/context.h"
#include "src/core/lib/promise/map.h"
#include "src/core/lib/promise/pipe.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/resource_quota/arena.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_buffer.h"
@@ -70,6 +69,7 @@
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/transport.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/resolver_registry.h"
namespace grpc_core {
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 65fa3dc0bd0..19f72a4831d 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
@@ -38,7 +38,6 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.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/channel/context.h"
@@ -54,6 +53,7 @@
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/transport.h"
+#include "src/core/resolver/xds/xds_resolver_attributes.h"
namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
index 37e490458d1..17d7975dc6c 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
@@ -59,7 +59,6 @@
#include "src/core/lib/iomgr/endpoint.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/security/credentials/insecure/insecure_credentials.h"
#include "src/core/lib/security/security_connector/security_connector.h"
@@ -71,6 +70,7 @@
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/transport/tcp_connect_handshaker.h"
#include "src/core/lib/transport/transport.h"
+#include "src/core/resolver/resolver_registry.h"
#ifdef GPR_SUPPORT_CHANNELS_FROM_FD
diff --git a/src/core/ext/xds/xds_client_grpc.h b/src/core/ext/xds/xds_client_grpc.h
index 48029dc3d28..7093ec4017b 100644
--- a/src/core/ext/xds/xds_client_grpc.h
+++ b/src/core/ext/xds/xds_client_grpc.h
@@ -35,7 +35,7 @@
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/ext/xds/xds_client_stats.h b/src/core/ext/xds/xds_client_stats.h
index b7ffb1a3a15..77300f1b241 100644
--- a/src/core/ext/xds/xds_client_stats.h
+++ b/src/core/ext/xds/xds_client_stats.h
@@ -37,7 +37,7 @@
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/ext/xds/xds_endpoint.h b/src/core/ext/xds/xds_endpoint.h
index 369e0921a6c..faa33192c33 100644
--- a/src/core/ext/xds/xds_endpoint.h
+++ b/src/core/ext/xds/xds_endpoint.h
@@ -40,7 +40,7 @@
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/ext/xds/xds_health_status.h b/src/core/ext/xds/xds_health_status.h
index 73fbc3df4a3..2ad46f082f3 100644
--- a/src/core/ext/xds/xds_health_status.h
+++ b/src/core/ext/xds/xds_health_status.h
@@ -25,7 +25,7 @@
#include "absl/types/optional.h"
#include "absl/types/span.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
// Channel arg key for xDS health status.
// Value is an XdsHealthStatus::HealthStatus enum.
diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h
index d46138b7da4..327f9be8ce2 100644
--- a/src/core/lib/config/core_configuration.h
+++ b/src/core/lib/config/core_configuration.h
@@ -25,13 +25,13 @@
#include "src/core/lib/channel/channel_args_preconditioning.h"
#include "src/core/lib/handshaker/proxy_mapper_registry.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/channel_creds_registry.h"
#include "src/core/lib/service_config/service_config_parser.h"
#include "src/core/lib/surface/channel_init.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/resolver/resolver_registry.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h
index 1f39f5d6cc9..d81d5cacbbb 100644
--- a/src/core/load_balancing/address_filtering.h
+++ b/src/core/load_balancing/address_filtering.h
@@ -29,7 +29,7 @@
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/lib/gprpp/ref_counted_string.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
// The resolver returns a flat list of addresses. When a hierarchy of
// LB policies is in use, each leaf of the hierarchy will need a
diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc
index 10f5151ff94..73399d7e125 100644
--- a/src/core/load_balancing/endpoint_list.cc
+++ b/src/core/load_balancing/endpoint_list.cc
@@ -43,7 +43,7 @@
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h
index f56027f88f7..2c842fe32fb 100644
--- a/src/core/load_balancing/endpoint_list.h
+++ b/src/core/load_balancing/endpoint_list.h
@@ -39,7 +39,7 @@
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc
index 812658ccde8..d4697e5d465 100644
--- a/src/core/load_balancing/grpclb/grpclb.cc
+++ b/src/core/load_balancing/grpclb/grpclb.cc
@@ -94,12 +94,6 @@
#include
#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/load_balancing/child_policy_handler.h"
-#include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"
-#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
-#include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
-#include "src/core/load_balancing/grpclb/load_balancer_api.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h"
@@ -128,13 +122,6 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/load_balancing/delegating_helper.h"
-#include "src/core/load_balancing/lb_policy.h"
-#include "src/core/load_balancing/lb_policy_factory.h"
-#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_string_helpers.h"
@@ -143,6 +130,19 @@
#include "src/core/lib/surface/channel_stack_type.h"
#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/load_balancing/child_policy_handler.h"
+#include "src/core/load_balancing/delegating_helper.h"
+#include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"
+#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
+#include "src/core/load_balancing/grpclb/load_balancer_api.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/lb_policy_factory.h"
+#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/subchannel_interface.h"
+#include "src/core/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
#define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1
#define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h
index cb6614fd17f..bb9d67885d3 100644
--- a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h
+++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.h
@@ -22,7 +22,7 @@
#include
#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h
index 9224e1e61d2..54d30446ae5 100644
--- a/src/core/load_balancing/lb_policy.h
+++ b/src/core/load_balancing/lb_policy.h
@@ -51,7 +51,7 @@
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc
index 14da92d770e..5318356d39d 100644
--- a/src/core/load_balancing/outlier_detection/outlier_detection.cc
+++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc
@@ -65,13 +65,13 @@
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/json/json.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc
index 91a654f1ede..9d3733ddbed 100644
--- a/src/core/load_balancing/pick_first/pick_first.cc
+++ b/src/core/load_balancing/pick_first/pick_first.cc
@@ -60,11 +60,11 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/pick_first/pick_first.h b/src/core/load_balancing/pick_first/pick_first.h
index 0bbfee66c7a..5b40c0fa3a0 100644
--- a/src/core/load_balancing/pick_first/pick_first.h
+++ b/src/core/load_balancing/pick_first/pick_first.h
@@ -19,7 +19,7 @@
#include
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
// Internal channel arg to enable health checking in pick_first.
// Intended to be used by petiole policies (e.g., round_robin) that
diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc
index 4cbf19d9cd3..e6a77772ffc 100644
--- a/src/core/load_balancing/priority/priority.cc
+++ b/src/core/load_balancing/priority/priority.cc
@@ -56,12 +56,12 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc
index 7958e098290..f6b403b03dc 100644
--- a/src/core/load_balancing/ring_hash/ring_hash.cc
+++ b/src/core/load_balancing/ring_hash/ring_hash.cc
@@ -62,12 +62,12 @@
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/json/json.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc
index 62429272509..e5f895eae73 100644
--- a/src/core/load_balancing/rls/rls.cc
+++ b/src/core/load_balancing/rls/rls.cc
@@ -87,12 +87,6 @@
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
#include "src/core/lib/json/json_writer.h"
-#include "src/core/load_balancing/delegating_helper.h"
-#include "src/core/load_balancing/lb_policy.h"
-#include "src/core/load_balancing/lb_policy_factory.h"
-#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/lib/slice/slice.h"
@@ -101,6 +95,12 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/lib/transport/error_utils.h"
+#include "src/core/load_balancing/delegating_helper.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/lb_policy_factory.h"
+#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver_registry.h"
#include "src/proto/grpc/lookup/v1/rls.upb.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc
index 0f2863d6a20..66065aa06bf 100644
--- a/src/core/load_balancing/round_robin/round_robin.cc
+++ b/src/core/load_balancing/round_robin/round_robin.cc
@@ -48,12 +48,12 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/json/json.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/server_address.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/server_address.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/subchannel_list.h b/src/core/load_balancing/subchannel_list.h
index 71a59015787..da9e35272a6 100644
--- a/src/core/load_balancing/subchannel_list.h
+++ b/src/core/load_balancing/subchannel_list.h
@@ -40,11 +40,11 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/server_address.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/server_address.h"
// Code for maintaining a list of subchannels within an LB policy.
//
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 6cafea50c1c..d52e3d95908 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
@@ -71,12 +71,12 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/server_address.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/server_address.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc
index ca50b79bd66..fe951c308ca 100644
--- a/src/core/load_balancing/weighted_target/weighted_target.cc
+++ b/src/core/load_balancing/weighted_target/weighted_target.cc
@@ -57,12 +57,12 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
// IWYU pragma: no_include
diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc
index d30724fd275..61883499a33 100644
--- a/src/core/load_balancing/xds/cds.cc
+++ b/src/core/load_balancing/xds/cds.cc
@@ -40,7 +40,6 @@
#include "src/core/load_balancing/address_filtering.h"
#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
#include "src/core/ext/xds/xds_cluster.h"
#include "src/core/ext/xds/xds_common_types.h"
#include "src/core/ext/xds/xds_health_status.h"
@@ -64,6 +63,7 @@
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_channel_args.h b/src/core/load_balancing/xds/xds_channel_args.h
index 8f47a0796a9..bafc59ffd1d 100644
--- a/src/core/load_balancing/xds/xds_channel_args.h
+++ b/src/core/load_balancing/xds/xds_channel_args.h
@@ -19,7 +19,7 @@
#include
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
// Channel arg indicating the xDS cluster name.
// Set by xds_cluster_impl LB policy and used by GoogleDefaultCredentials.
diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc
index 5fab4494a80..8650f4de5e4 100644
--- a/src/core/load_balancing/xds/xds_cluster_impl.cc
+++ b/src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -41,7 +41,6 @@
#include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client.h"
@@ -62,14 +61,15 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/security/credentials/xds/xds_credentials.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/security/credentials/xds/xds_credentials.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc
index 2693c61c9fd..c52e464fd71 100644
--- a/src/core/load_balancing/xds/xds_cluster_manager.cc
+++ b/src/core/load_balancing/xds/xds_cluster_manager.cc
@@ -40,7 +40,6 @@
#include "src/core/ext/filters/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/child_policy_handler.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
@@ -55,12 +54,13 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/xds/xds_resolver_attributes.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc
index 698a2af62c0..ffe13949117 100644
--- a/src/core/load_balancing/xds/xds_override_host.cc
+++ b/src/core/load_balancing/xds/xds_override_host.cc
@@ -49,7 +49,6 @@
#include "src/core/ext/filters/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/child_policy_handler.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/address_utils/parse_address.h"
@@ -75,13 +74,14 @@
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_args.h"
#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/transport/connectivity_state.h"
#include "src/core/load_balancing/delegating_helper.h"
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
namespace grpc_core {
diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc
index cf32f2082f8..b5bb19172f8 100644
--- a/src/core/load_balancing/xds/xds_wrr_locality.cc
+++ b/src/core/load_balancing/xds/xds_wrr_locality.cc
@@ -50,7 +50,7 @@
#include "src/core/load_balancing/lb_policy.h"
#include "src/core/load_balancing/lb_policy_factory.h"
#include "src/core/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/.clang-format b/src/core/resolver/.clang-format
similarity index 100%
rename from src/core/ext/filters/client_channel/resolver/.clang-format
rename to src/core/resolver/.clang-format
diff --git a/src/core/ext/filters/client_channel/resolver/README.md b/src/core/resolver/README.md
similarity index 100%
rename from src/core/ext/filters/client_channel/resolver/README.md
rename to src/core/resolver/README.md
diff --git a/src/core/ext/filters/client_channel/resolver/binder/README.md b/src/core/resolver/binder/README.md
similarity index 100%
rename from src/core/ext/filters/client_channel/resolver/binder/README.md
rename to src/core/resolver/binder/README.md
diff --git a/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc
similarity index 96%
rename from src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
rename to src/core/resolver/binder/binder_resolver.cc
index 15d7ec1eaca..5f1916958a6 100644
--- a/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
+++ b/src/core/resolver/binder/binder_resolver.cc
@@ -42,9 +42,9 @@
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
similarity index 98%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
rename to src/core/resolver/dns/c_ares/dns_resolver_ares.cc
index 81d7eed6c76..400816bcabd 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -37,7 +37,7 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h"
+#include "src/core/resolver/dns/event_engine/service_config_helper.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/debug_location.h"
@@ -51,8 +51,8 @@
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/uri/uri_parser.h"
@@ -62,16 +62,16 @@
#include "absl/strings/str_cat.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
-#include "src/core/ext/filters/client_channel/resolver/polling_resolver.h"
#include "src/core/lib/backoff/backoff.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/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/polling_resolver.h"
#define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1
#define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
similarity index 76%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h
rename to src/core/resolver/dns/c_ares/dns_resolver_ares.h
index 5b80fe5db40..5660361545e 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
#include
@@ -27,4 +27,4 @@ void RegisterAresDnsResolver(CoreConfiguration::Builder*);
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
similarity index 90%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
rename to src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
index 5daa687d803..9627cef9ccd 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
@@ -16,8 +16,8 @@
//
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
#include
@@ -27,7 +27,7 @@
#include "absl/base/thread_annotations.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/closure.h"
#include "src/core/lib/iomgr/error.h"
@@ -87,4 +87,4 @@ std::unique_ptr NewGrpcPolledFdFactory(Mutex* mu);
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
similarity index 97%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
rename to src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
index 79deb800fb8..6e6c2bd62e6 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
@@ -40,8 +40,8 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/closure.h"
#include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
similarity index 99%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
rename to src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
index ad1d73fb45a..9969e95546f 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -37,8 +37,8 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/gprpp/crash.h"
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
similarity index 99%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
rename to src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
index 14dcc8814ed..e1abc64b95f 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
@@ -57,8 +57,8 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.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"
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
similarity index 94%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
rename to src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
index 3849579cebb..122e727b65f 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
@@ -16,8 +16,8 @@
//
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
#include
@@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/closure.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000
@@ -137,4 +137,4 @@ extern void (*grpc_ares_test_only_inject_config)(ares_channel* channel);
// Exposed in this header for C-core tests only
extern bool g_grpc_ares_test_only_force_tcp;
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
similarity index 91%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
rename to src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
index db9c30208c3..9f6290eba57 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
@@ -21,7 +21,7 @@
#include "src/core/lib/iomgr/port.h"
#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/iomgr/socket_utils_posix.h"
bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
similarity index 88%
rename from src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
rename to src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
index 6c8a0ea65ac..849c6b11ec3 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
@@ -24,11 +24,11 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/iomgr/socket_windows.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
diff --git a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc
similarity index 83%
rename from src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
rename to src/core/resolver/dns/dns_resolver_plugin.cc
index 790e393f6e0..81b411024d7 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
+++ b/src/core/resolver/dns/dns_resolver_plugin.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h"
+#include "src/core/resolver/dns/dns_resolver_plugin.h"
#include
@@ -21,13 +21,13 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.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"
+#include "src/core/resolver/dns/native/dns_resolver.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/experiments/experiments.h"
#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_factory.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h b/src/core/resolver/dns/dns_resolver_plugin.h
similarity index 77%
rename from src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h
rename to src/core/resolver/dns/dns_resolver_plugin.h
index 97318f12c6c..a9025f741f5 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h
+++ b/src/core/resolver/dns/dns_resolver_plugin.h
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
#include
#include "src/core/lib/config/core_configuration.h"
@@ -24,4 +24,4 @@ void RegisterDnsResolver(CoreConfiguration::Builder* builder);
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_DNS_RESOLVER_PLUGIN_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
similarity index 98%
rename from src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
rename to src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
index 309acf50a7c..14ef76734a0 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
+#include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
#include
#include
@@ -38,8 +38,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h"
-#include "src/core/ext/filters/client_channel/resolver/polling_resolver.h"
#include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/debug/trace.h"
@@ -51,12 +49,14 @@
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/resolver/dns/event_engine/service_config_helper.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/polling_resolver.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
// IWYU pragma: no_include
diff --git a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
similarity index 71%
rename from src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h
rename to src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
index 665b4781787..57492bf9677 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
@@ -11,15 +11,15 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
#include
#include "absl/strings/string_view.h"
#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
@@ -32,4 +32,4 @@ class EventEngineClientChannelDNSResolverFactory : public ResolverFactory {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc
similarity index 97%
rename from src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
rename to src/core/resolver/dns/event_engine/service_config_helper.cc
index fff78c86623..7d3dcb4d389 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
+++ b/src/core/resolver/dns/event_engine/service_config_helper.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h"
+#include "src/core/resolver/dns/event_engine/service_config_helper.h"
#include
diff --git a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h b/src/core/resolver/dns/event_engine/service_config_helper.h
similarity index 74%
rename from src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h
rename to src/core/resolver/dns/event_engine/service_config_helper.h
index cbb7f5e9aa6..5c89aa5e1e4 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h
+++ b/src/core/resolver/dns/event_engine/service_config_helper.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
#include
@@ -29,4 +29,4 @@ absl::StatusOr ChooseServiceConfig(
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/README.md b/src/core/resolver/dns/native/README.md
similarity index 100%
rename from src/core/ext/filters/client_channel/resolver/dns/native/README.md
rename to src/core/resolver/dns/native/README.md
diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc
similarity index 96%
rename from src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
rename to src/core/resolver/dns/native/dns_resolver.cc
index 158bd63c3f9..9ee003c81b9 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
+++ b/src/core/resolver/dns/native/dns_resolver.cc
@@ -32,7 +32,7 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/polling_resolver.h"
+#include "src/core/resolver/polling_resolver.h"
#include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
@@ -43,9 +43,9 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
#define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1
diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h b/src/core/resolver/dns/native/dns_resolver.h
similarity index 75%
rename from src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h
rename to src/core/resolver/dns/native/dns_resolver.h
index 5ab6fb4c8a7..84e13036020 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h
+++ b/src/core/resolver/dns/native/dns_resolver.h
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
+#define GRPC_SRC_CORE_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
#include
#include "src/core/lib/config/core_configuration.h"
@@ -21,4 +21,4 @@ namespace grpc_core {
void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder);
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_DNS_NATIVE_DNS_RESOLVER_H
diff --git a/src/core/lib/resolver/endpoint_addresses.cc b/src/core/resolver/endpoint_addresses.cc
similarity index 98%
rename from src/core/lib/resolver/endpoint_addresses.cc
rename to src/core/resolver/endpoint_addresses.cc
index 7b5f4c0a329..b474876020e 100644
--- a/src/core/lib/resolver/endpoint_addresses.cc
+++ b/src/core/resolver/endpoint_addresses.cc
@@ -18,7 +18,7 @@
#include
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include
diff --git a/src/core/lib/resolver/endpoint_addresses.h b/src/core/resolver/endpoint_addresses.h
similarity index 96%
rename from src/core/lib/resolver/endpoint_addresses.h
rename to src/core/resolver/endpoint_addresses.h
index 5746df19c5b..5c9fdf956dd 100644
--- a/src/core/lib/resolver/endpoint_addresses.h
+++ b/src/core/resolver/endpoint_addresses.h
@@ -16,8 +16,8 @@
//
//
-#ifndef GRPC_SRC_CORE_LIB_RESOLVER_ENDPOINT_ADDRESSES_H
-#define GRPC_SRC_CORE_LIB_RESOLVER_ENDPOINT_ADDRESSES_H
+#ifndef GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
+#define GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
#include
@@ -161,4 +161,4 @@ class SingleEndpointIterator : public EndpointAddressesIterator {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_LIB_RESOLVER_ENDPOINT_ADDRESSES_H
+#endif // GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc
similarity index 98%
rename from src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
rename to src/core/resolver/fake/fake_resolver.cc
index b054f6e4771..713df2ad595 100644
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
+++ b/src/core/resolver/fake/fake_resolver.cc
@@ -19,7 +19,7 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include
#include
@@ -35,7 +35,7 @@
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/work_serializer.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h
similarity index 94%
rename from src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
rename to src/core/resolver/fake/fake_resolver.h
index 0a39dd42354..3a878233f2a 100644
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+++ b/src/core/resolver/fake/fake_resolver.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
+#define GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
#include
@@ -33,7 +33,7 @@
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/resolver/resolver.h"
+#include "src/core/resolver/resolver.h"
#define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \
"grpc.fake_resolver.response_generator"
@@ -126,4 +126,4 @@ class FakeResolverResponseGenerator
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
diff --git a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc
similarity index 98%
rename from src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
rename to src/core/resolver/google_c2p/google_c2p_resolver.cc
index e868255570a..657ac27e35d 100644
--- a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc
@@ -46,9 +46,9 @@
#include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_registry.h"
#include "src/core/lib/resource_quota/resource_quota.h"
#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
#include "src/core/lib/uri/uri_parser.h"
diff --git a/src/core/ext/filters/client_channel/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc
similarity index 98%
rename from src/core/ext/filters/client_channel/resolver/polling_resolver.cc
rename to src/core/resolver/polling_resolver.cc
index e8d81e91808..01956a2c8e1 100644
--- a/src/core/ext/filters/client_channel/resolver/polling_resolver.cc
+++ b/src/core/resolver/polling_resolver.cc
@@ -16,7 +16,7 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/polling_resolver.h"
+#include "src/core/resolver/polling_resolver.h"
#include
@@ -38,7 +38,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/uri/uri_parser.h"
diff --git a/src/core/ext/filters/client_channel/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h
similarity index 92%
rename from src/core/ext/filters/client_channel/resolver/polling_resolver.h
rename to src/core/resolver/polling_resolver.h
index c214387c2cc..961ec493225 100644
--- a/src/core/ext/filters/client_channel/resolver/polling_resolver.h
+++ b/src/core/resolver/polling_resolver.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_POLLING_RESOLVER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_POLLING_RESOLVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
+#define GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
#include
@@ -34,8 +34,8 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
namespace grpc_core {
@@ -118,4 +118,4 @@ class PollingResolver : public Resolver {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_POLLING_RESOLVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
diff --git a/src/core/lib/resolver/resolver.cc b/src/core/resolver/resolver.cc
similarity index 95%
rename from src/core/lib/resolver/resolver.cc
rename to src/core/resolver/resolver.cc
index df303f3d337..c1135731ea8 100644
--- a/src/core/lib/resolver/resolver.cc
+++ b/src/core/resolver/resolver.cc
@@ -18,7 +18,7 @@
#include
-#include "src/core/lib/resolver/resolver.h"
+#include "src/core/resolver/resolver.h"
grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount(false,
"resolver_refcount");
diff --git a/src/core/lib/resolver/resolver.h b/src/core/resolver/resolver.h
similarity index 95%
rename from src/core/lib/resolver/resolver.h
rename to src/core/resolver/resolver.h
index bfd48d61c87..de6379c83e8 100644
--- a/src/core/lib/resolver/resolver.h
+++ b/src/core/resolver/resolver.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_H
-#define GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_H
+#define GRPC_SRC_CORE_RESOLVER_RESOLVER_H
#include
@@ -29,8 +29,8 @@
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/server_address.h" // IWYU pragma: keep
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/server_address.h" // IWYU pragma: keep
#include "src/core/lib/service_config/service_config.h"
extern grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount;
@@ -136,4 +136,4 @@ class Resolver : public InternallyRefCounted {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_H
+#endif // GRPC_SRC_CORE_RESOLVER_RESOLVER_H
diff --git a/src/core/lib/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h
similarity index 92%
rename from src/core/lib/resolver/resolver_factory.h
rename to src/core/resolver/resolver_factory.h
index ac002319ed9..889c50190a5 100644
--- a/src/core/lib/resolver/resolver_factory.h
+++ b/src/core/resolver/resolver_factory.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_FACTORY_H
-#define GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_FACTORY_H
+#ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
+#define GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
#include
@@ -28,7 +28,7 @@
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resolver/resolver.h"
+#include "src/core/resolver/resolver.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
@@ -75,4 +75,4 @@ class ResolverFactory {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_FACTORY_H
+#endif // GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
diff --git a/src/core/lib/resolver/resolver_registry.cc b/src/core/resolver/resolver_registry.cc
similarity index 98%
rename from src/core/lib/resolver/resolver_registry.cc
rename to src/core/resolver/resolver_registry.cc
index 821b71d4050..1edc210ccb9 100644
--- a/src/core/lib/resolver/resolver_registry.cc
+++ b/src/core/resolver/resolver_registry.cc
@@ -16,7 +16,7 @@
#include
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/resolver/resolver_registry.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
diff --git a/src/core/lib/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h
similarity index 94%
rename from src/core/lib/resolver/resolver_registry.h
rename to src/core/resolver/resolver_registry.h
index 3432f5edef5..75d4b6f5789 100644
--- a/src/core/lib/resolver/resolver_registry.h
+++ b/src/core/resolver/resolver_registry.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_REGISTRY_H
-#define GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_REGISTRY_H
+#ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
+#define GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
#include
@@ -29,8 +29,8 @@
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
@@ -120,4 +120,4 @@ class ResolverRegistry {
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_REGISTRY_H
+#endif // GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
diff --git a/src/core/lib/resolver/server_address.h b/src/core/resolver/server_address.h
similarity index 80%
rename from src/core/lib/resolver/server_address.h
rename to src/core/resolver/server_address.h
index a7d39481e63..b823064ef85 100644
--- a/src/core/lib/resolver/server_address.h
+++ b/src/core/resolver/server_address.h
@@ -16,12 +16,12 @@
//
//
-#ifndef GRPC_SRC_CORE_LIB_RESOLVER_SERVER_ADDRESS_H
-#define GRPC_SRC_CORE_LIB_RESOLVER_SERVER_ADDRESS_H
+#ifndef GRPC_SRC_CORE_RESOLVER_SERVER_ADDRESS_H
+#define GRPC_SRC_CORE_RESOLVER_SERVER_ADDRESS_H
#include
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
@@ -32,4 +32,4 @@ using ServerAddressList = EndpointAddressesList;
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_LIB_RESOLVER_SERVER_ADDRESS_H
+#endif // GRPC_SRC_CORE_RESOLVER_SERVER_ADDRESS_H
diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/README.md b/src/core/resolver/sockaddr/README.md
similarity index 100%
rename from src/core/ext/filters/client_channel/resolver/sockaddr/README.md
rename to src/core/resolver/sockaddr/README.md
diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc
similarity index 97%
rename from src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
rename to src/core/resolver/sockaddr/sockaddr_resolver.cc
index 8bfd6b233fc..e95652c8b28 100644
--- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc
@@ -33,9 +33,9 @@
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc
similarity index 99%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
rename to src/core/resolver/xds/xds_dependency_manager.cc
index 03e4e975e95..35e18addade 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/resolver/xds/xds_dependency_manager.cc
@@ -16,16 +16,16 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
#include "absl/strings/str_join.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h"
#include "src/core/ext/xds/xds_routing.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/match.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
+#include "src/core/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/xds/xds_resolver_trace.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h
similarity index 97%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h
rename to src/core/resolver/xds/xds_dependency_manager.h
index f834715b671..91db088fb71 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h
+++ b/src/core/resolver/xds/xds_dependency_manager.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
+#ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
+#define GRPC_SRC_CORE_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
#include
@@ -29,7 +29,7 @@
#include "src/core/ext/xds/xds_listener.h"
#include "src/core/ext/xds/xds_route_config.h"
#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/resolver/resolver.h"
+#include "src/core/resolver/resolver.h"
namespace grpc_core {
@@ -274,4 +274,4 @@ class XdsDependencyManager : public RefCounted,
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
+#endif // GRPC_SRC_CORE_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc
similarity index 99%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
rename to src/core/resolver/xds/xds_resolver.cc
index a94b8f53c2e..aff6f61f584 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
+++ b/src/core/resolver/xds/xds_resolver.cc
@@ -50,9 +50,6 @@
#include "src/core/ext/filters/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/client_channel/config_selector.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h"
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h"
#include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client_grpc.h"
@@ -82,9 +79,9 @@
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/promise/arena_promise.h"
#include "src/core/lib/promise/context.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/core/lib/resource_quota/arena.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/service_config/service_config_impl.h"
@@ -93,6 +90,9 @@
#include "src/core/lib/transport/transport.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/core/load_balancing/ring_hash/ring_hash.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/resolver/xds/xds_resolver_attributes.h"
+#include "src/core/resolver/xds/xds_resolver_trace.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h
similarity index 86%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h
rename to src/core/resolver/xds/xds_resolver_attributes.h
index f8b8c838f8e..cfe833db798 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h
+++ b/src/core/resolver/xds/xds_resolver_attributes.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
+#ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
+#define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
#include
@@ -59,4 +59,4 @@ class XdsRouteStateAttribute
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
+#endif // GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc b/src/core/resolver/xds/xds_resolver_trace.cc
similarity index 90%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
rename to src/core/resolver/xds/xds_resolver_trace.cc
index a56990484bb..a97ac81b010 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
+++ b/src/core/resolver/xds/xds_resolver_trace.cc
@@ -16,7 +16,7 @@
#include
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h"
+#include "src/core/resolver/xds/xds_resolver_trace.h"
namespace grpc_core {
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h b/src/core/resolver/xds/xds_resolver_trace.h
similarity index 75%
rename from src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h
rename to src/core/resolver/xds/xds_resolver_trace.h
index 63e3396639a..759b49f1bd2 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h
+++ b/src/core/resolver/xds/xds_resolver_trace.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
+#ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
+#define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
#include
@@ -27,4 +27,4 @@ extern TraceFlag grpc_xds_resolver_trace;
} // namespace grpc_core
-#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
+#endif // GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_TRACE_H
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 9d766455be7..886feca5dcc 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -33,24 +33,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
- 'src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc',
- 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/polling_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
@@ -677,9 +659,6 @@ CORE_SOURCE_FILES = [
'src/core/lib/promise/party.cc',
'src/core/lib/promise/sleep.cc',
'src/core/lib/promise/trace.cc',
- 'src/core/lib/resolver/endpoint_addresses.cc',
- 'src/core/lib/resolver/resolver.cc',
- 'src/core/lib/resolver/resolver_registry.cc',
'src/core/lib/resource_quota/api.cc',
'src/core/lib/resource_quota/arena.cc',
'src/core/lib/resource_quota/memory_quota.cc',
@@ -832,6 +811,27 @@ CORE_SOURCE_FILES = [
'src/core/load_balancing/xds/xds_wrr_locality.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
+ 'src/core/resolver/binder/binder_resolver.cc',
+ 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
+ 'src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
+ 'src/core/resolver/dns/dns_resolver_plugin.cc',
+ 'src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc',
+ 'src/core/resolver/dns/event_engine/service_config_helper.cc',
+ 'src/core/resolver/dns/native/dns_resolver.cc',
+ 'src/core/resolver/endpoint_addresses.cc',
+ 'src/core/resolver/fake/fake_resolver.cc',
+ 'src/core/resolver/google_c2p/google_c2p_resolver.cc',
+ 'src/core/resolver/polling_resolver.cc',
+ 'src/core/resolver/resolver.cc',
+ 'src/core/resolver/resolver_registry.cc',
+ 'src/core/resolver/sockaddr/sockaddr_resolver.cc',
+ 'src/core/resolver/xds/xds_dependency_manager.cc',
+ 'src/core/resolver/xds/xds_resolver.cc',
+ 'src/core/resolver/xds/xds_resolver_trace.cc',
'src/core/tsi/alts/crypt/aes_gcm.cc',
'src/core/tsi/alts/crypt/gsec.cc',
'src/core/tsi/alts/frame_protector/alts_counter.cc',
diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc
index c012dd46396..51cbf8f9aa1 100644
--- a/test/core/client_channel/client_channel_test.cc
+++ b/test/core/client_channel/client_channel_test.cc
@@ -27,7 +27,7 @@
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/util/test_config.h"
namespace grpc_core {
diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
index 9b0224a4b69..125f343e2d4 100644
--- a/test/core/client_channel/lb_policy/lb_policy_test_lib.h
+++ b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
@@ -73,7 +73,6 @@
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/service_config/service_config_call_data.h"
#include "src/core/lib/transport/connectivity_state.h"
@@ -85,6 +84,7 @@
#include "src/core/load_balancing/oob_backend_metric.h"
#include "src/core/load_balancing/oob_backend_metric_internal.h"
#include "src/core/load_balancing/subchannel_interface.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/event_engine/event_engine_test_utils.h"
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
diff --git a/test/core/client_channel/lb_policy/outlier_detection_test.cc b/test/core/client_channel/lb_policy/outlier_detection_test.cc
index 45515cf4e69..8e93de35f0f 100644
--- a/test/core/client_channel/lb_policy/outlier_detection_test.cc
+++ b/test/core/client_channel/lb_policy/outlier_detection_test.cc
@@ -40,9 +40,9 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/lb_policy/pick_first_test.cc b/test/core/client_channel/lb_policy/pick_first_test.cc
index bcb4aa935a6..b5cdf28801e 100644
--- a/test/core/client_channel/lb_policy/pick_first_test.cc
+++ b/test/core/client_channel/lb_policy/pick_first_test.cc
@@ -43,8 +43,8 @@
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/lb_policy/ring_hash_test.cc b/test/core/client_channel/lb_policy/ring_hash_test.cc
index c7e2ae09a92..a8739678e07 100644
--- a/test/core/client_channel/lb_policy/ring_hash_test.cc
+++ b/test/core/client_channel/lb_policy/ring_hash_test.cc
@@ -37,8 +37,8 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/xxhash_inline.h"
#include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/lb_policy/round_robin_test.cc b/test/core/client_channel/lb_policy/round_robin_test.cc
index d0e5229fd3f..ce49f7ef6b4 100644
--- a/test/core/client_channel/lb_policy/round_robin_test.cc
+++ b/test/core/client_channel/lb_policy/round_robin_test.cc
@@ -27,7 +27,7 @@
#include "src/core/lib/experiments/experiments.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
index 489e9a9eadf..a6cbcbe2c1a 100644
--- a/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
+++ b/test/core/client_channel/lb_policy/weighted_round_robin_test.cc
@@ -47,9 +47,9 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/lb_policy/xds_override_host_test.cc b/test/core/client_channel/lb_policy/xds_override_host_test.cc
index e634ccee399..de6ec9fb9bd 100644
--- a/test/core/client_channel/lb_policy/xds_override_host_test.cc
+++ b/test/core/client_channel/lb_policy/xds_override_host_test.cc
@@ -37,7 +37,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h"
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
#include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/channel/channel_args.h"
@@ -45,8 +44,9 @@
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
#include "test/core/client_channel/lb_policy/lb_policy_test_lib.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/client_channel/resolvers/binder_resolver_test.cc b/test/core/client_channel/resolvers/binder_resolver_test.cc
index 5c2c7d4fda3..4abae7ee1a6 100644
--- a/test/core/client_channel/resolvers/binder_resolver_test.cc
+++ b/test/core/client_channel/resolvers/binder_resolver_test.cc
@@ -25,10 +25,10 @@
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "test/core/util/test_config.h"
#ifdef GRPC_HAVE_UNIX_SOCKET
@@ -40,7 +40,7 @@
#include
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/resolver/resolver_registry.h"
// Registers the factory with `grpc_core::ResolverRegistry`. Defined in
// binder_resolver.cc
diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
index 08f7e161a8f..331e175898a 100644
--- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
@@ -38,7 +38,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.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"
@@ -57,11 +56,12 @@
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/test_config.h"
using ::grpc_event_engine::experimental::GetDefaultEventEngine;
diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc
index 41c22cc4b48..fff3e22495f 100644
--- a/test/core/client_channel/resolvers/dns_resolver_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_test.cc
@@ -34,10 +34,10 @@
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/test_config.h"
using ::grpc_event_engine::experimental::GetDefaultEventEngine;
diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc
index 97f6ec587e1..fdf7f66d58b 100644
--- a/test/core/client_channel/resolvers/fake_resolver_test.cc
+++ b/test/core/client_channel/resolvers/fake_resolver_test.cc
@@ -16,7 +16,7 @@
//
//
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include
#include
@@ -47,10 +47,10 @@
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/test_config.h"
namespace grpc_core {
diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
index 49cb0db9ac0..39f58d4fb14 100644
--- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
+++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc
@@ -32,10 +32,10 @@
#include "src/core/lib/gprpp/work_serializer.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/port.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/test_config.h"
static std::shared_ptr* g_work_serializer;
diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc
index a209b17d399..98dd58e7df5 100644
--- a/test/core/end2end/fuzzers/api_fuzzer.cc
+++ b/test/core/end2end/fuzzers/api_fuzzer.cc
@@ -41,7 +41,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/ext/transport/inproc/inproc_transport.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/channel/channel_args.h"
@@ -56,7 +55,8 @@
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "src/libfuzzer/libfuzzer_macro.h"
#include "test/core/end2end/data/ssl_test_data.h"
#include "test/core/end2end/fuzzers/api_fuzzer.pb.h"
diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc
index 06c5c483fb0..0359b71db11 100644
--- a/test/core/end2end/goaway_server_test.cc
+++ b/test/core/end2end/goaway_server_test.cc
@@ -42,7 +42,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/event_engine/default_event_engine.h"
#include "src/core/lib/experiments/experiments.h"
@@ -57,7 +56,8 @@
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/iomgr/socket_utils.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc
index 59e25efc9ab..9096408c145 100644
--- a/test/core/end2end/no_server_test.cc
+++ b/test/core/end2end/no_server_test.cc
@@ -32,13 +32,13 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
#include "src/core/lib/service_config/service_config.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/resolver.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/test_config.h"
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 e821730aaba..17a88792c4d 100644
--- a/test/core/event_engine/test_suite/tools/echo_client.cc
+++ b/test/core/event_engine/test_suite/tools/echo_client.cc
@@ -53,8 +53,8 @@
#include "src/core/lib/event_engine/default_event_engine.h"
#include "src/core/lib/event_engine/tcp_socket_utils.h"
#include "src/core/lib/gprpp/notification.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/resolver/resolver_registry.h"
extern absl::AnyInvocable<
std::unique_ptr(void)>
diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
index 97ed6eaa71c..3bb9afeb4d2 100644
--- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
+++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
@@ -30,7 +30,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/event_engine/default_event_engine.h"
#include "src/core/lib/event_engine/tcp_socket_utils.h"
@@ -38,9 +37,10 @@
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/work_serializer.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
#include "src/libfuzzer/libfuzzer_macro.h"
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc
index 07dfa88afdf..8ed555af61b 100644
--- a/test/core/http/httpcli_test.cc
+++ b/test/core/http/httpcli_test.cc
@@ -41,7 +41,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/gpr/subprocess.h"
#include "src/core/lib/gprpp/status_helper.h"
#include "src/core/lib/gprpp/time.h"
@@ -49,6 +48,7 @@
#include "src/core/lib/iomgr/pollset.h"
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/security/credentials/credentials.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "test/core/http/httpcli_test_util.h"
#include "test/core/util/fake_udp_and_tcp_server.h"
#include "test/core/util/port.h"
diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc
index 4dd7e04f08b..8e133934ccf 100644
--- a/test/core/iomgr/resolve_address_test.cc
+++ b/test/core/iomgr/resolve_address_test.cc
@@ -33,7 +33,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/gprpp/crash.h"
@@ -42,6 +41,7 @@
#include "src/core/lib/iomgr/executor.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/pollset.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "test/core/util/cmdline.h"
#include "test/core/util/fake_udp_and_tcp_server.h"
#include "test/core/util/test_config.h"
diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc
index 2665c5f6d0b..2a4f75c73d9 100644
--- a/test/core/resolver/endpoint_addresses_test.cc
+++ b/test/core/resolver/endpoint_addresses_test.cc
@@ -16,7 +16,7 @@
#include
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include
diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc
index f5d8565f95d..3477fe2041c 100644
--- a/test/core/transport/chttp2/too_many_pings_test.cc
+++ b/test/core/transport/chttp2/too_many_pings_test.cc
@@ -42,7 +42,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/channel/channel_args.h"
@@ -53,10 +52,11 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/resolver.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/resolve_localhost_ip46.h"
diff --git a/test/core/util/test_lb_policies.h b/test/core/util/test_lb_policies.h
index 842b4100d06..c3f8b473fad 100644
--- a/test/core/util/test_lb_policies.h
+++ b/test/core/util/test_lb_policies.h
@@ -29,8 +29,8 @@
#include "absl/strings/string_view.h"
#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/load_balancing/backend_metric_data.h"
+#include "src/core/resolver/endpoint_addresses.h"
namespace grpc_core {
diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
index b3939099304..08e95f9164f 100644
--- a/test/core/xds/xds_endpoint_resource_type_test.cc
+++ b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -49,7 +49,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
#include "src/proto/grpc/testing/xds/v3/address.pb.h"
#include "src/proto/grpc/testing/xds/v3/base.pb.h"
#include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
index 334b187458c..9eb7f201d0d 100644
--- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
+++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
@@ -37,16 +37,16 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/crash.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/thd.h"
#include "src/core/lib/iomgr/sockaddr.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index 4a2eb3f1d45..770d7879737 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -51,7 +51,6 @@
#include "src/core/ext/filters/client_channel/backup_poller.h"
#include "src/core/ext/filters/client_channel/config_selector.h"
#include "src/core/ext/filters/client_channel/global_subchannel_pool.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/backoff/backoff.h"
@@ -65,12 +64,13 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/tcp_client.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/service_config/service_config.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/health/v1/health.grpc.pb.h"
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc
index 2b051aae008..ef6f7610fe9 100644
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@@ -43,7 +43,6 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.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"
@@ -53,11 +52,12 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/sockaddr.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/load_balancing/grpclb/grpclb.h"
#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h"
diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc
index 7a2c4414457..eaa0c908cd1 100644
--- a/test/cpp/end2end/rls_end2end_test.cc
+++ b/test/cpp/end2end/rls_end2end_test.cc
@@ -40,7 +40,6 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.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"
@@ -51,6 +50,7 @@
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc
index 3f8cb8f3758..d2772bc13a8 100644
--- a/test/cpp/end2end/service_config_end2end_test.cc
+++ b/test/cpp/end2end/service_config_end2end_test.cc
@@ -46,7 +46,6 @@
#include "src/core/ext/filters/client_channel/backup_poller.h"
#include "src/core/ext/filters/client_channel/global_subchannel_pool.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h"
@@ -55,10 +54,11 @@
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/tcp_client.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/service_config/service_config_impl.h"
#include "src/core/lib/transport/error_utils.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/testing/echo.grpc.pb.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 f4f4f5a00d4..95a9fa1b68d 100644
--- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
@@ -24,12 +24,12 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/gprpp/env.h"
-#include "src/core/lib/resolver/endpoint_addresses.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"
#include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h"
#include "test/core/util/resolve_localhost_ip46.h"
#include "test/core/util/scoped_env_var.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index b6dde40a810..d6426220bcc 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -56,7 +56,6 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
#include "src/core/ext/xds/xds_api.h"
#include "src/core/ext/xds/xds_channel_args.h"
@@ -78,12 +77,13 @@
#include "src/core/lib/gprpp/time_util.h"
#include "src/core/lib/iomgr/load_file.h"
#include "src/core/lib/iomgr/sockaddr.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
#include "src/core/lib/security/authorization/audit_logging.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.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"
#include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/testing/echo.grpc.pb.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 4e1eca12ff1..7aad620437f 100644
--- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
@@ -30,11 +30,11 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/gprpp/env.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/pick_first.pb.h"
#include "test/core/util/test_config.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 6ce5076be59..534fc99595c 100644
--- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
@@ -25,11 +25,11 @@
#include
#include "src/core/ext/filters/client_channel/backup_poller.h"
-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/config/config_vars.h"
#include "src/core/lib/gprpp/env.h"
#include "src/core/load_balancing/xds/xds_channel_args.h"
+#include "src/core/resolver/fake/fake_resolver.h"
#include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
#include "test/core/util/resolve_localhost_ip46.h"
diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc
index 5dedf8c0835..3a768e2ad39 100644
--- a/test/cpp/naming/address_sorting_test.cc
+++ b/test/cpp/naming/address_sorting_test.cc
@@ -32,7 +32,6 @@
#include
#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.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"
@@ -43,9 +42,10 @@
#include "src/core/lib/iomgr/executor.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
#include "test/cpp/util/subprocess.h"
diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc
index 50f824251be..c2009ae970a 100644
--- a/test/cpp/naming/cancel_ares_query_test.cc
+++ b/test/cpp/naming/cancel_ares_query_test.cc
@@ -33,7 +33,6 @@
#include
#include
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.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"
@@ -50,8 +49,9 @@
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/pollset.h"
#include "src/core/lib/iomgr/pollset_set.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/cmdline.h"
#include "test/core/util/fake_udp_and_tcp_server.h"
@@ -460,7 +460,7 @@ TEST_F(CancelDuringAresQuery, TestQueryFailsBecauseTcpServerClosesSocket) {
// This test is meant to repro a bug noticed in internal issue b/297538255.
// The general issue is the loop in
-// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc#L371.
+// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc#L371.
// The problem with that loop is that c-ares *can* in certain situations stop
// caring about the fd being processed without reading all of the data out of
// the read buffer. In that case, we keep looping because
@@ -486,10 +486,10 @@ TEST_F(CancelDuringAresQuery, TestQueryFailsBecauseTcpServerClosesSocket) {
// 6) Because we overwrite the socket "close" method, c-ares attempt to close
// the socket in handle_error does nothing except for removing the socket
// from ARES_GETSOCK_READABLE:
-// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc#L156.
+// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc#L156.
// 7) Because there is still one byte left in the TCP read buffer,
// IsFdStillReadableLocked will keep returning true:
-// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc#L82.
+// https://github.com/grpc/grpc/blob/f6a994229e72bc771963706de7a0cd8aa9150bb6/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc#L82.
// But c-ares will never try to read from that socket again, so we have an
// infinite busy loop.
TEST_F(CancelDuringAresQuery, TestQueryFailsWithDataRemainingInReadBuffer) {
diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index 6505c0b0977..64155d3bc7e 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -41,7 +41,6 @@
#include
#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.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"
@@ -58,10 +57,11 @@
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/resolve_address.h"
#include "src/core/lib/iomgr/socket_utils.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_registry.h"
#include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
+#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_registry.h"
#include "test/core/util/fake_udp_and_tcp_server.h"
#include "test/core/util/port.h"
#include "test/core/util/socket_use_after_close_detector.h"
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 70c8d9c1a39..ecefda74720 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1117,36 +1117,6 @@ src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.h \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.h \
-src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
-src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc \
-src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h \
-src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h \
-src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h \
-src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc \
-src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
-src/core/ext/filters/client_channel/resolver/polling_resolver.h \
-src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter.h \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
@@ -2642,14 +2612,6 @@ src/core/lib/promise/trace.cc \
src/core/lib/promise/trace.h \
src/core/lib/promise/try_join.h \
src/core/lib/promise/try_seq.h \
-src/core/lib/resolver/endpoint_addresses.cc \
-src/core/lib/resolver/endpoint_addresses.h \
-src/core/lib/resolver/resolver.cc \
-src/core/lib/resolver/resolver.h \
-src/core/lib/resolver/resolver_factory.h \
-src/core/lib/resolver/resolver_registry.cc \
-src/core/lib/resolver/resolver_registry.h \
-src/core/lib/resolver/server_address.h \
src/core/lib/resource_quota/api.cc \
src/core/lib/resource_quota/api.h \
src/core/lib/resource_quota/arena.cc \
@@ -2947,6 +2909,44 @@ src/core/load_balancing/xds/xds_override_host.h \
src/core/load_balancing/xds/xds_wrr_locality.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+src/core/resolver/binder/binder_resolver.cc \
+src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
+src/core/resolver/dns/c_ares/dns_resolver_ares.h \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper.h \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
+src/core/resolver/dns/dns_resolver_plugin.cc \
+src/core/resolver/dns/dns_resolver_plugin.h \
+src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
+src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h \
+src/core/resolver/dns/event_engine/service_config_helper.cc \
+src/core/resolver/dns/event_engine/service_config_helper.h \
+src/core/resolver/dns/native/dns_resolver.cc \
+src/core/resolver/dns/native/dns_resolver.h \
+src/core/resolver/endpoint_addresses.cc \
+src/core/resolver/endpoint_addresses.h \
+src/core/resolver/fake/fake_resolver.cc \
+src/core/resolver/fake/fake_resolver.h \
+src/core/resolver/google_c2p/google_c2p_resolver.cc \
+src/core/resolver/polling_resolver.cc \
+src/core/resolver/polling_resolver.h \
+src/core/resolver/resolver.cc \
+src/core/resolver/resolver.h \
+src/core/resolver/resolver_factory.h \
+src/core/resolver/resolver_registry.cc \
+src/core/resolver/resolver_registry.h \
+src/core/resolver/server_address.h \
+src/core/resolver/sockaddr/sockaddr_resolver.cc \
+src/core/resolver/xds/xds_dependency_manager.cc \
+src/core/resolver/xds/xds_dependency_manager.h \
+src/core/resolver/xds/xds_resolver.cc \
+src/core/resolver/xds/xds_resolver_attributes.h \
+src/core/resolver/xds/xds_resolver_trace.cc \
+src/core/resolver/xds/xds_resolver_trace.h \
src/core/tsi/alts/crypt/aes_gcm.cc \
src/core/tsi/alts/crypt/gsec.cc \
src/core/tsi/alts/crypt/gsec.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 022958293f7..84df8476912 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -922,40 +922,6 @@ src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.h \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.h \
-src/core/ext/filters/client_channel/resolver/README.md \
-src/core/ext/filters/client_channel/resolver/binder/README.md \
-src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
-src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
-src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc \
-src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc \
-src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h \
-src/core/ext/filters/client_channel/resolver/dns/native/README.md \
-src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
-src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h \
-src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h \
-src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc \
-src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
-src/core/ext/filters/client_channel/resolver/polling_resolver.h \
-src/core/ext/filters/client_channel/resolver/sockaddr/README.md \
-src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc \
-src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter.h \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
@@ -2421,14 +2387,6 @@ src/core/lib/promise/trace.cc \
src/core/lib/promise/trace.h \
src/core/lib/promise/try_join.h \
src/core/lib/promise/try_seq.h \
-src/core/lib/resolver/endpoint_addresses.cc \
-src/core/lib/resolver/endpoint_addresses.h \
-src/core/lib/resolver/resolver.cc \
-src/core/lib/resolver/resolver.h \
-src/core/lib/resolver/resolver_factory.h \
-src/core/lib/resolver/resolver_registry.cc \
-src/core/lib/resolver/resolver_registry.h \
-src/core/lib/resolver/server_address.h \
src/core/lib/resource_quota/api.cc \
src/core/lib/resource_quota/api.h \
src/core/lib/resource_quota/arena.cc \
@@ -2728,6 +2686,48 @@ src/core/load_balancing/xds/xds_override_host.h \
src/core/load_balancing/xds/xds_wrr_locality.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+src/core/resolver/README.md \
+src/core/resolver/binder/README.md \
+src/core/resolver/binder/binder_resolver.cc \
+src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
+src/core/resolver/dns/c_ares/dns_resolver_ares.h \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
+src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper.h \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
+src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
+src/core/resolver/dns/dns_resolver_plugin.cc \
+src/core/resolver/dns/dns_resolver_plugin.h \
+src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
+src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h \
+src/core/resolver/dns/event_engine/service_config_helper.cc \
+src/core/resolver/dns/event_engine/service_config_helper.h \
+src/core/resolver/dns/native/README.md \
+src/core/resolver/dns/native/dns_resolver.cc \
+src/core/resolver/dns/native/dns_resolver.h \
+src/core/resolver/endpoint_addresses.cc \
+src/core/resolver/endpoint_addresses.h \
+src/core/resolver/fake/fake_resolver.cc \
+src/core/resolver/fake/fake_resolver.h \
+src/core/resolver/google_c2p/google_c2p_resolver.cc \
+src/core/resolver/polling_resolver.cc \
+src/core/resolver/polling_resolver.h \
+src/core/resolver/resolver.cc \
+src/core/resolver/resolver.h \
+src/core/resolver/resolver_factory.h \
+src/core/resolver/resolver_registry.cc \
+src/core/resolver/resolver_registry.h \
+src/core/resolver/server_address.h \
+src/core/resolver/sockaddr/README.md \
+src/core/resolver/sockaddr/sockaddr_resolver.cc \
+src/core/resolver/xds/xds_dependency_manager.cc \
+src/core/resolver/xds/xds_dependency_manager.h \
+src/core/resolver/xds/xds_resolver.cc \
+src/core/resolver/xds/xds_resolver_attributes.h \
+src/core/resolver/xds/xds_resolver_trace.cc \
+src/core/resolver/xds/xds_resolver_trace.h \
src/core/tsi/README.md \
src/core/tsi/alts/crypt/aes_gcm.cc \
src/core/tsi/alts/crypt/gsec.cc \
diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py
index 7421d3caedb..5340cc87ce1 100755
--- a/tools/run_tests/sanity/core_banned_functions.py
+++ b/tools/run_tests/sanity/core_banned_functions.py
@@ -79,7 +79,7 @@ BANNED_EXCEPT = {
# TODO(roth): Fix these callers to use the absl random library instead.
"std::random_device": [
"src/core/load_balancing/rls/rls.cc",
- "src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc",
+ "src/core/resolver/google_c2p/google_c2p_resolver.cc",
],
# use 'grpc_core::Crash' instead
"GPR_ASSERT(false": [],