Merge branch 'fix3+1' into fix3+1-for-reals

10 months ago · cb3db8112e
parent 258f1fd6c2 852073944a
commit cb3db8112e
153 changed files with 1521 additions and 1656 deletions
--- a/.github/workflows/pr-auto-fix.yaml
+++ b/.github/workflows/pr-auto-fix.yaml
@ -22,7 +22,7 @@ jobs:
        with:
          format: YYYYWWd
      - name: Cache bazel
-        uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
        env:
          cache-name: bazel-cache
        with:
@ -38,7 +38,7 @@ jobs:
      # Cancel current runs if they're still running
      # (saves processing on fast pushes)
      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 # 0.12.0
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
        with:
          access_token: ${{ github.token }}
      # Allow opt-out for some users
@ -90,7 +90,7 @@ jobs:
        run: ANDROID_NDK_HOME= ${{ github.workspace }}/tools/distrib/sanitize.sh
      # Report back with a PR if things are broken
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
+        uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
        with:
          delete-branch: true
          branch-suffix: short-commit-hash
--- a/38
+++ b/38
@ -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",
--- 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
--- a/CONTRIBUTING_STEPS.md
+++ b/CONTRIBUTING_STEPS.md
@ -130,5 +130,8 @@ the submission process. When the submission happens:

 1.  A commit with your changes, along with a few additional formatting changes, will
    be committed to the `grpc/master` branch.
+![Copybara commit](doc/images/img/grpc-copybara-commit.png)
+
 1.  The pull request you originally created will be closed.
+![Pull request closed by copybara](doc/images/img/grpc-pr-closed-by-copybara.png)

--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@ -44,6 +44,7 @@ for general contribution guidelines.
 <!-- go/keep-sorted end -->

 ## Emeritus Maintainers (in alphabetical order)
+<!-- go/keep-sorted start case=no -->
 - [adelez](https://github.com/adelez), Google LLC
 - [AspirinSJL](https://github.com/AspirinSJL), Google LLC
 - [billfeng327](https://github.com/billfeng327), Google LLC
@ -90,3 +91,4 @@ for general contribution guidelines.
 - [yihuazhang](https://github.com/yihuazhang), Google LLC
 - [zpencer](https://github.com/zpencer), Google LLC
 - [ZhenLian](https://github.com/ZhenLian), Google LLC
+<!-- go/keep-sorted end -->
--- a/84
+++ b/84
@ -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)
--- 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",
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -240,11 +240,11 @@ def grpc_deps():
            name = "boringssl",
            # Use github mirror instead of https://boringssl.googlesource.com/boringssl
            # to obtain a boringssl archive with consistent sha256
-            sha256 = "057f662b0e85931a84945b2e89ba201fd44b0583da827c948fe443593690fb83",
-            strip_prefix = "boringssl-ae72a4514c7afd150596b0a80947f3ca9b8363b5",
+            sha256 = "c21ac7356f885189959b7f8b3df5fcc65e54098bfae323396fbb467205c64030",
+            strip_prefix = "boringssl-311e6f6d8e77da1f64c3256b30bd1992a555ce6c",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
-                "https://github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz",
+                "https://github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz",
            ],
        )

--- 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
--- 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)
--- 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");
--- a/doc/images/img/grpc-copybara-commit.png
+++ b/doc/images/img/grpc-copybara-commit.png
--- a/doc/images/img/grpc-pr-closed-by-copybara.png
+++ b/doc/images/img/grpc-pr-closed-by-copybara.png
--- a/examples/python/observability/requirements.txt
+++ b/examples/python/observability/requirements.txt
@ -1,2 +1,3 @@
 grpcio>=1.62.0
 grpcio-observability>=1.62.0
+opentelemetry-sdk==1.21.0
--- 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',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -195,7 +195,7 @@ Pod::Spec.new do |s|
    ss.libraries = 'z'
    ss.dependency "#{s.name}/Interface", version
    ss.dependency "#{s.name}/Privacy", version
-    ss.dependency 'BoringSSL-GRPC', '0.0.32'
+    ss.dependency 'BoringSSL-GRPC', '0.0.33'
    ss.dependency 'abseil/algorithm/container', abseil_version
    ss.dependency 'abseil/base/base', abseil_version
    ss.dependency 'abseil/base/config', abseil_version
@ -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',
--- 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 )
--- 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',
--- a/package.xml
+++ b/package.xml
@ -139,36 +139,6 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/http_proxy_mapper.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/local_subchannel_pool.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/local_subchannel_pool.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/polling_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/polling_resolver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc" role="src" />
@ -1625,14 +1595,6 @@
    <file baseinstalldir="/" name="src/core/lib/promise/trace.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/promise/try_join.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/promise/try_seq.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/endpoint_addresses.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/endpoint_addresses.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/resolver.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/resolver_factory.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/resolver_registry.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/resolver_registry.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/resolver/server_address.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/resource_quota/api.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/resource_quota/api.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/resource_quota/arena.cc" role="src" />
@ -1930,6 +1892,44 @@
    <file baseinstalldir="/" name="src/core/load_balancing/xds/xds_wrr_locality.cc" role="src" />
    <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
    <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry_extra.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/binder/binder_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/dns_resolver_plugin.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/dns_resolver_plugin.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/event_engine/service_config_helper.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/event_engine/service_config_helper.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/native/dns_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/dns/native/dns_resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/endpoint_addresses.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/endpoint_addresses.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/fake/fake_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/fake/fake_resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/google_c2p/google_c2p_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/polling_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/polling_resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/resolver_factory.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/resolver_registry.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/resolver_registry.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/server_address.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/sockaddr/sockaddr_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_dependency_manager.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_dependency_manager.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_attributes.h" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_trace.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_trace.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/aes_gcm.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/gsec.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/gsec.h" role="src" />
--- a/src/boringssl/boringssl_prefix_symbols.h
+++ b/src/boringssl/boringssl_prefix_symbols.h
@ -1,4 +1,4 @@
-// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: ae72a4514c7afd150596b0a80947f3ca9b8363b5
+// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 311e6f6d8e77da1f64c3256b30bd1992a555ce6c

 // Copyright (c) 2018, Google Inc.
 //
@ -1285,12 +1285,17 @@
 #define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x)
 #define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3)
 #define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt)
+#define DES_ecb3_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt_ex)
 #define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt)
+#define DES_ecb_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt_ex)
 #define DES_ede2_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede2_cbc_encrypt)
 #define DES_ede3_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt)
+#define DES_ede3_cbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt_ex)
 #define DES_encrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_encrypt3)
 #define DES_ncbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt)
+#define DES_ncbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt_ex)
 #define DES_set_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key)
+#define DES_set_key_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_ex)
 #define DES_set_key_unchecked BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_unchecked)
 #define DES_set_odd_parity BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_odd_parity)
 #define DH_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DH_bits)
--- a/src/core/BUILD
+++ b/src/core/BUILD
@ -2188,6 +2188,7 @@ grpc_cc_library(
        "posix_event_engine_tcp_socket_utils",
        "socket_mutator",
        "status_helper",
+        "strerror",
        "time",
        "//:event_engine_base_hdrs",
        "//:exec_ctx",
@ -5655,10 +5656,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 +5691,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 +5716,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 +5759,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 +5781,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 +5817,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 +5841,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 +5867,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 +5881,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 +5896,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 +5923,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 +5982,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",
--- 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
--- 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
--- 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 {

--- 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 <grpc/support/log.h>

-#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 {

--- 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

--- 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 {

--- 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 {

--- 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 {

--- 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.
--- 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 {

--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@ -45,6 +45,7 @@
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/gprpp/status_helper.h"
+#include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/socket_mutator.h"

@ -173,7 +174,7 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::NotifyOnAccept(
          return;
        default:
          gpr_log(GPR_ERROR, "Closing acceptor. Failed accept4: %s",
-                  strerror(errno));
+                  grpc_core::StrError(errno).c_str());
          // Shutting down the acceptor. Unref the ref grabbed in
          // AsyncConnectionAcceptor::Start().
          Unref();
@ -189,15 +190,13 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::NotifyOnAccept(
        auto listener_addr_uri = ResolvedAddressToURI(socket_.addr);
        gpr_log(
            GPR_ERROR,
-            "Failed getpeername: %s. This is a critical failure, the "
-            "listener on %s:%d is shutting down.",
-            strerror(errno),
+            "Failed getpeername: %s. Dropping the connection, and continuing "
+            "to listen on %s:%d.",
+            grpc_core::StrError(errno).c_str(),
            listener_addr_uri.ok() ? listener_addr_uri->c_str() : "<unknown>",
            socket_.port);
        close(fd);
-        // Shutting down the acceptor. Unref the ref grabbed in
-        // AsyncConnectionAcceptor::Start().
-        Unref();
+        handle_->NotifyOnRead(notify_on_accept_);
        return;
      }
      addr = EventEngine::ResolvedAddress(addr.address(), len);
--- a/src/core/lib/iomgr/tcp_server_posix.cc
+++ b/src/core/lib/iomgr/tcp_server_posix.cc
@ -429,13 +429,13 @@ static void on_read(void* arg, grpc_error_handle err) {
        auto listener_addr_uri = grpc_sockaddr_to_uri(&sp->addr);
        gpr_log(
            GPR_ERROR,
-            "Failed getpeername: %s. This is a critical failure, the "
-            "listener on %s:%d is shutting down.",
+            "Failed getpeername: %s. Dropping the connection, and continuing "
+            "to listen on %s:%d.",
            grpc_core::StrError(errno).c_str(),
            listener_addr_uri.ok() ? listener_addr_uri->c_str() : "<unknown>",
            sp->port);
        close(fd);
-        goto error;
+        continue;
      }
    }

--- 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
--- 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 {

--- 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 {

--- a/src/core/load_balancing/grpclb/grpclb.cc
+++ b/src/core/load_balancing/grpclb/grpclb.cc
@ -94,12 +94,6 @@
 #include <grpc/support/log.h>

 #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
--- 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 <grpc/grpc.h>

 #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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 <grpc/support/port_platform.h>

-#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
--- 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 {

--- 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 {

--- 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 {
--- 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 {

--- 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.
 //
--- 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 {

--- 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 <type_traits>

--- 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 {

--- 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 <grpc/support/port_platform.h>

-#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.
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- a/src/core/ext/filters/client_channel/resolver/.clang-format
+++ b/src/core/ext/filters/client_channel/resolver/.clang-format
--- a/src/core/ext/filters/client_channel/resolver/README.md
+++ b/src/core/ext/filters/client_channel/resolver/README.md
--- a/src/core/ext/filters/client_channel/resolver/binder/README.md
+++ b/src/core/ext/filters/client_channel/resolver/binder/README.md
--- a/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
+++ b/src/core/ext/filters/client_channel/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 {
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@ -37,7 +37,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>

-#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
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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<GrpcPolledFdFactory> 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
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
@ -40,8 +40,8 @@

 #include <grpc/support/log.h>

-#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"
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@ -37,8 +37,8 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>

-#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"
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
@ -57,8 +57,8 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>

-#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"
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+++ b/src/core/ext/filters/client_channel/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(); }
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
@ -24,11 +24,11 @@

 #include <grpc/support/string_util.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/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(); }

--- a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.cc
@ -13,7 +13,7 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h"
+#include "src/core/resolver/dns/dns_resolver_plugin.h"

 #include <memory>

@ -21,13 +21,13 @@

 #include <grpc/support/log.h>

-#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 {

--- a/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_plugin.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

 #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
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
@ -13,7 +13,7 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>

-#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 <inttypes.h>
 #include <stddef.h>
@ -38,8 +38,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>

-#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 <ratio>

--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

 #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
--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc
@ -13,7 +13,7 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>

-#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 <stdlib.h>

--- a/src/core/ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -29,4 +29,4 @@ absl::StatusOr<std::string> 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
--- a/src/core/ext/filters/client_channel/resolver/dns/native/README.md
+++ b/src/core/ext/filters/client_channel/resolver/dns/native/README.md
--- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
@ -32,7 +32,7 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>

-#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
--- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

 #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
--- a/src/core/lib/resolver/endpoint_addresses.cc
+++ b/src/core/lib/resolver/endpoint_addresses.cc
@ -18,7 +18,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"

 #include <string.h>

--- a/src/core/lib/resolver/endpoint_addresses.h
+++ b/src/core/lib/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
@ -19,7 +19,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
+#include "src/core/resolver/fake/fake_resolver.h"

 #include <memory>
 #include <type_traits>
@ -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 {
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/ext/filters/client_channel/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"
--- a/src/core/ext/filters/client_channel/resolver/polling_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/polling_resolver.cc
@ -16,7 +16,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/resolver/polling_resolver.h"
+#include "src/core/resolver/polling_resolver.h"

 #include <inttypes.h>

@ -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"

--- a/src/core/ext/filters/client_channel/resolver/polling_resolver.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/lib/resolver/resolver.cc
+++ b/src/core/lib/resolver/resolver.cc
@ -18,7 +18,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/lib/resolver/resolver.h"
+#include "src/core/resolver/resolver.h"

 grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount(false,
                                                           "resolver_refcount");
--- a/src/core/lib/resolver/resolver.h
+++ b/src/core/lib/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 <grpc/support/port_platform.h>

@ -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<Resolver> {

 }  // namespace grpc_core

-#endif  // GRPC_SRC_CORE_LIB_RESOLVER_RESOLVER_H
+#endif  // GRPC_SRC_CORE_RESOLVER_RESOLVER_H
--- a/src/core/lib/resolver/resolver_factory.h
+++ b/src/core/lib/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/lib/resolver/resolver_registry.cc
+++ b/src/core/lib/resolver/resolver_registry.cc
@ -16,7 +16,7 @@

 #include <grpc/support/port_platform.h>

-#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"
--- a/src/core/lib/resolver/resolver_registry.h
+++ b/src/core/lib/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/lib/resolver/server_address.h
+++ b/src/core/lib/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 <grpc/support/port_platform.h>

-#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
--- a/src/core/ext/filters/client_channel/resolver/sockaddr/README.md
+++ b/src/core/ext/filters/client_channel/resolver/sockaddr/README.md
--- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/ext/filters/client_channel/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 {
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc
@ -16,16 +16,16 @@

 #include <grpc/support/port_platform.h>

-#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 {

--- a/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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<XdsDependencyManager>,

 }  // 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
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
+++ b/src/core/ext/filters/client_channel/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 {

--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_attributes.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
+++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc
@ -16,7 +16,7 @@

 #include <grpc/support/port_platform.h>

-#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 {

--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h
+++ b/src/core/ext/filters/client_channel/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 <grpc/support/port_platform.h>

@ -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
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
--- 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',
--- a/Show More
+++ b/Show More