grpc 1.45.0 → 1.47.0

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h

@@ -21,10 +21,17 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include <ares.h>
 
+#include "absl/base/thread_annotations.h"
+
 #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
-#include "src/core/lib/iomgr/pollset_set.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc

@@ -17,6 +17,16 @@
  */
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/memory/memory.h"
+
+#include "src/core/lib/gprpp/sync.h"
+#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/iomgr/port.h"
 #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
 
@@ -27,17 +37,9 @@
 
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#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/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/iomgr/ev_posix.h"
-#include "src/core/lib/iomgr/iomgr_internal.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc

@@ -17,7 +17,7 @@
  */
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/iomgr/port.h"
+#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
 #include <string.h>

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -18,34 +18,50 @@
 
 #include <grpc/support/port_platform.h>
 
+// IWYU pragma: no_include <arpa/nameser.h>
+// IWYU pragma: no_include <inttypes.h>
+// IWYU pragma: no_include <netdb.h>
+// IWYU pragma: no_include <netinet/in.h>
+// IWYU pragma: no_include <stdlib.h>
+// IWYU pragma: no_include <sys/socket.h>
+
 #if GRPC_ARES == 1
 
 #include <string.h>
-#include <sys/types.h>
+#include <sys/types.h>  // IWYU pragma: keep
+
+#include <string>
+#include <utility>
 
 #include <address_sorting/address_sorting.h>
 #include <ares.h>
 
 #include "absl/container/inlined_vector.h"
+#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
+#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
-#include <grpc/support/time.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/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/executor.h"
-#include "src/core/lib/iomgr/iomgr_internal.h"
-#include "src/core/lib/iomgr/nameser.h"
-#include "src/core/lib/iomgr/sockaddr.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/nameser.h"  // IWYU pragma: keep
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/timer.h"
 
 using grpc_core::ServerAddress;
@@ -526,12 +542,13 @@ static void log_address_sorting_list(const grpc_ares_request* r,
                                      const ServerAddressList& addresses,
                                      const char* input_output_str) {
   for (size_t i = 0; i < addresses.size(); i++) {
-    std::string addr_str =
-        grpc_sockaddr_to_string(&addresses[i].address(), true);
+    auto addr_str = grpc_sockaddr_to_string(&addresses[i].address(), true);
     gpr_log(GPR_INFO,
             "(c-ares resolver) request:%p c-ares address sorting: %s[%" PRIuPTR
             "]=%s",
-            r, input_output_str, i, addr_str.c_str());
+            r, input_output_str, i,
+            addr_str.ok() ? addr_str->c_str()
+                          : addr_str.status().ToString().c_str());
   }
 }
 

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h

@@ -21,12 +21,21 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
+#include <memory>
+
 #include <ares.h>
 
-#include "src/core/lib/iomgr/iomgr.h"
-#include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/iomgr/work_serializer.h"
+#include "absl/base/thread_annotations.h"
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/gprpp/sync.h"
+#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/server_address.h"
 
 #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc

@@ -18,7 +18,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/iomgr/port.h"
+#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
+
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
 #include <grpc/support/string_util.h>

data/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc

@@ -21,6 +21,8 @@
 
 #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h"
 
+#include "src/core/lib/gprpp/global_config.h"
+
 GPR_GLOBAL_CONFIG_DEFINE_STRING(
     grpc_dns_resolver, "",
     "Declares which DNS resolver to use. The default is ares if gRPC is built "

data/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h

@@ -21,7 +21,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/global_config.h"
+#include "src/core/lib/gprpp/global_config_generic.h"
+#include "src/core/lib/gprpp/memory.h"
 
 GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_dns_resolver);
 

data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc

@@ -16,29 +16,45 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <inttypes.h>
+#include <limits.h>
 
-#include <climits>
-#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "absl/container/inlined_vector.h"
 #include "absl/functional/bind_front.h"
+#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/support/log.h>
 
 #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.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/core_configuration.h"
+#include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gprpp/manual_constructor.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/global_config_generic.h"
+#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/iomgr/timer.h"
-#include "src/core/lib/iomgr/work_serializer.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/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
+#include "src/core/lib/uri/uri_parser.h"
 
 #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6
@@ -49,247 +65,82 @@ namespace grpc_core {
 
 namespace {
 
-class NativeClientChannelDNSResolver : public Resolver {
- public:
-  explicit NativeClientChannelDNSResolver(ResolverArgs args);
-
-  void StartLocked() override;
-
-  void RequestReresolutionLocked() override;
-
-  void ResetBackoffLocked() override;
-
-  void ShutdownLocked() override;
+TraceFlag grpc_trace_dns_resolver(false, "dns_resolver");
 
- private:
+class NativeClientChannelDNSResolver : public PollingResolver {
+ public:
+  NativeClientChannelDNSResolver(ResolverArgs args,
+                                 const grpc_channel_args* channel_args);
   ~NativeClientChannelDNSResolver() override;
 
-  void MaybeStartResolvingLocked();
-  void StartResolvingLocked();
+  OrphanablePtr<Orphanable> StartRequest() override;
 
-  static void OnNextResolution(void* arg, grpc_error_handle error);
-  void OnNextResolutionLocked(grpc_error_handle error);
+ private:
   void OnResolved(
       absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or);
-  void OnResolvedLocked(
-      absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or);
-
-  /// name to resolve
-  std::string name_to_resolve_;
-  /// channel args
-  grpc_channel_args* channel_args_ = nullptr;
-  std::shared_ptr<WorkSerializer> work_serializer_;
-  std::unique_ptr<ResultHandler> result_handler_;
-  /// pollset_set to drive the name resolution process
-  grpc_pollset_set* interested_parties_ = nullptr;
-  /// are we shutting down?
-  bool shutdown_ = false;
-  /// are we currently resolving?
-  bool resolving_ = false;
-  /// next resolution timer
-  bool have_next_resolution_timer_ = false;
-  grpc_timer next_resolution_timer_;
-  grpc_closure on_next_resolution_;
-  /// min time between DNS requests
-  Duration min_time_between_resolutions_;
-  /// timestamp of last DNS request
-  absl::optional<Timestamp> last_resolution_timestamp_;
-  /// retry backoff state
-  BackOff backoff_;
-  /// tracks pending resolutions
-  OrphanablePtr<DNSResolver::Request> dns_request_;
 };
 
 NativeClientChannelDNSResolver::NativeClientChannelDNSResolver(
-    ResolverArgs args)
-    : name_to_resolve_(absl::StripPrefix(args.uri.path(), "/")),
-      channel_args_(grpc_channel_args_copy(args.args)),
-      work_serializer_(std::move(args.work_serializer)),
-      result_handler_(std::move(args.result_handler)),
-      interested_parties_(grpc_pollset_set_create()),
-      min_time_between_resolutions_(
+    ResolverArgs args, const grpc_channel_args* channel_args)
+    : PollingResolver(
+          std::move(args), channel_args,
           Duration::Milliseconds(grpc_channel_args_find_integer(
-              channel_args_, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS,
-              {1000 * 30, 0, INT_MAX}))),
-      backoff_(BackOff::Options()
-                   .set_initial_backoff(Duration::Seconds(
-                       GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS))
-                   .set_multiplier(GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER)
-                   .set_jitter(GRPC_DNS_RECONNECT_JITTER)
-                   .set_max_backoff(Duration::Seconds(
-                       GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS))) {
-  if (args.pollset_set != nullptr) {
-    grpc_pollset_set_add_pollset_set(interested_parties_, args.pollset_set);
+              channel_args, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS,
+              {1000 * 30, 0, INT_MAX})),
+          BackOff::Options()
+              .set_initial_backoff(Duration::Milliseconds(
+                  GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000))
+              .set_multiplier(GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER)
+              .set_jitter(GRPC_DNS_RECONNECT_JITTER)
+              .set_max_backoff(Duration::Milliseconds(
+                  GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS * 1000)),
+          &grpc_trace_dns_resolver) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_dns_resolver)) {
+    gpr_log(GPR_DEBUG, "[dns_resolver=%p] created", this);
   }
 }
 
 NativeClientChannelDNSResolver::~NativeClientChannelDNSResolver() {
-  grpc_channel_args_destroy(channel_args_);
-  grpc_pollset_set_destroy(interested_parties_);
-}
-
-void NativeClientChannelDNSResolver::StartLocked() {
-  MaybeStartResolvingLocked();
-}
-
-void NativeClientChannelDNSResolver::RequestReresolutionLocked() {
-  if (!resolving_) {
-    MaybeStartResolvingLocked();
-  }
-}
-
-void NativeClientChannelDNSResolver::ResetBackoffLocked() {
-  if (have_next_resolution_timer_) {
-    grpc_timer_cancel(&next_resolution_timer_);
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_dns_resolver)) {
+    gpr_log(GPR_DEBUG, "[dns_resolver=%p] destroyed", this);
   }
-  backoff_.Reset();
 }
 
-void NativeClientChannelDNSResolver::ShutdownLocked() {
-  shutdown_ = true;
-  if (have_next_resolution_timer_) {
-    grpc_timer_cancel(&next_resolution_timer_);
-  }
-  dns_request_.reset();
-}
-
-void NativeClientChannelDNSResolver::OnNextResolution(void* arg,
-                                                      grpc_error_handle error) {
-  NativeClientChannelDNSResolver* r =
-      static_cast<NativeClientChannelDNSResolver*>(arg);
-  (void)GRPC_ERROR_REF(error);  // ref owned by lambda
-  r->work_serializer_->Run([r, error]() { r->OnNextResolutionLocked(error); },
-                           DEBUG_LOCATION);
-}
-
-void NativeClientChannelDNSResolver::OnNextResolutionLocked(
-    grpc_error_handle error) {
-  have_next_resolution_timer_ = false;
-  if (error == GRPC_ERROR_NONE && !resolving_) {
-    StartResolvingLocked();
+OrphanablePtr<Orphanable> NativeClientChannelDNSResolver::StartRequest() {
+  Ref(DEBUG_LOCATION, "dns_request").release();
+  auto dns_request_handle = GetDNSResolver()->ResolveName(
+      name_to_resolve(), kDefaultSecurePort, interested_parties(),
+      absl::bind_front(&NativeClientChannelDNSResolver::OnResolved, this));
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_dns_resolver)) {
+    gpr_log(GPR_DEBUG, "[dns_resolver=%p] starting request=%p", this,
+            DNSResolver::HandleToString(dns_request_handle).c_str());
   }
-  Unref(DEBUG_LOCATION, "retry-timer");
-  GRPC_ERROR_UNREF(error);
+  // Not cancellable.
+  return nullptr;
 }
 
 void NativeClientChannelDNSResolver::OnResolved(
     absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or) {
-  work_serializer_->Run(
-      [this, addresses_or]() mutable {
-        OnResolvedLocked(std::move(addresses_or));
-      },
-      DEBUG_LOCATION);
-}
-
-void NativeClientChannelDNSResolver::OnResolvedLocked(
-    absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or) {
-  GPR_ASSERT(resolving_);
-  resolving_ = false;
-  dns_request_.reset();
-  if (shutdown_) {
-    Unref(DEBUG_LOCATION, "dns-resolving");
-    return;
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_dns_resolver)) {
+    gpr_log(GPR_DEBUG, "[dns_resolver=%p] request complete, status=\"%s\"",
+            this, addresses_or.status().ToString().c_str());
   }
+  // Convert result from iomgr DNS API into Resolver::Result.
+  Result result;
   if (addresses_or.ok()) {
     ServerAddressList addresses;
     for (auto& addr : *addresses_or) {
       addresses.emplace_back(addr, nullptr /* args */);
     }
-    Result result;
     result.addresses = std::move(addresses);
-    result.args = grpc_channel_args_copy(channel_args_);
-    result_handler_->ReportResult(std::move(result));
-    // Reset backoff state so that we start from the beginning when the
-    // next request gets triggered.
-    backoff_.Reset();
   } else {
-    std::string error_message = addresses_or.status().ToString();
-    gpr_log(GPR_INFO, "dns resolution failed (will retry): %s",
-            error_message.c_str());
-    // Return transient error.
-    Result result;
-    result.addresses = absl::UnavailableError(absl::StrCat(
-        "DNS resolution failed for ", name_to_resolve_, ": ", error_message));
-    result.args = grpc_channel_args_copy(channel_args_);
-    result_handler_->ReportResult(std::move(result));
-    // Set up for retry.
-    // InvalidateNow to avoid getting stuck re-initializing this timer
-    // in a loop while draining the currently-held WorkSerializer.
-    // Also see https://github.com/grpc/grpc/issues/26079.
-    ExecCtx::Get()->InvalidateNow();
-    Timestamp next_try = backoff_.NextAttemptTime();
-    Duration timeout = next_try - ExecCtx::Get()->Now();
-    GPR_ASSERT(!have_next_resolution_timer_);
-    have_next_resolution_timer_ = true;
-    // TODO(roth): We currently deal with this ref manually.  Once the
-    // new closure API is done, find a way to track this ref with the timer
-    // callback as part of the type system.
-    Ref(DEBUG_LOCATION, "next_resolution_timer").release();
-    if (timeout > Duration::Zero()) {
-      gpr_log(GPR_DEBUG, "retrying in %" PRId64 " milliseconds",
-              timeout.millis());
-    } else {
-      gpr_log(GPR_DEBUG, "retrying immediately");
-    }
-    GRPC_CLOSURE_INIT(&on_next_resolution_,
-                      NativeClientChannelDNSResolver::OnNextResolution, this,
-                      grpc_schedule_on_exec_ctx);
-    grpc_timer_init(&next_resolution_timer_, next_try, &on_next_resolution_);
-  }
-  Unref(DEBUG_LOCATION, "dns-resolving");
-}
-
-void NativeClientChannelDNSResolver::MaybeStartResolvingLocked() {
-  // If there is an existing timer, the time it fires is the earliest time we
-  // can start the next resolution.
-  if (have_next_resolution_timer_) return;
-  if (last_resolution_timestamp_.has_value()) {
-    // InvalidateNow to avoid getting stuck re-initializing this timer
-    // in a loop while draining the currently-held WorkSerializer.
-    // Also see https://github.com/grpc/grpc/issues/26079.
-    ExecCtx::Get()->InvalidateNow();
-    const Timestamp earliest_next_resolution =
-        *last_resolution_timestamp_ + min_time_between_resolutions_;
-    const Duration time_until_next_resolution =
-        earliest_next_resolution - ExecCtx::Get()->Now();
-    if (time_until_next_resolution > Duration::Zero()) {
-      const Duration last_resolution_ago =
-          ExecCtx::Get()->Now() - *last_resolution_timestamp_;
-      gpr_log(GPR_DEBUG,
-              "In cooldown from last resolution (from %" PRId64
-              " ms ago). Will resolve again in %" PRId64 " ms",
-              last_resolution_ago.millis(),
-              time_until_next_resolution.millis());
-      have_next_resolution_timer_ = true;
-      // TODO(roth): We currently deal with this ref manually.  Once the
-      // new closure API is done, find a way to track this ref with the timer
-      // callback as part of the type system.
-      Ref(DEBUG_LOCATION, "next_resolution_timer_cooldown").release();
-      GRPC_CLOSURE_INIT(&on_next_resolution_,
-                        NativeClientChannelDNSResolver::OnNextResolution, this,
-                        grpc_schedule_on_exec_ctx);
-      grpc_timer_init(&next_resolution_timer_,
-                      ExecCtx::Get()->Now() + time_until_next_resolution,
-                      &on_next_resolution_);
-      return;
-    }
+    result.addresses = absl::UnavailableError(
+        absl::StrCat("DNS resolution failed for ", name_to_resolve(), ": ",
+                     addresses_or.status().ToString()));
   }
-  StartResolvingLocked();
-}
-
-void NativeClientChannelDNSResolver::StartResolvingLocked() {
-  gpr_log(GPR_DEBUG, "Start resolving.");
-  // TODO(roth): We currently deal with this ref manually.  Once the
-  // new closure API is done, find a way to track this ref with the timer
-  // callback as part of the type system.
-  Ref(DEBUG_LOCATION, "dns-resolving").release();
-  GPR_ASSERT(!resolving_);
-  resolving_ = true;
-  dns_request_ = GetDNSResolver()->ResolveName(
-      name_to_resolve_, kDefaultSecurePort, interested_parties_,
-      absl::bind_front(&NativeClientChannelDNSResolver::OnResolved, this));
-  dns_request_->Start();
-  last_resolution_timestamp_ = ExecCtx::Get()->Now();
+  result.args = grpc_channel_args_copy(channel_args());
+  OnRequestComplete(std::move(result));
+  Unref(DEBUG_LOCATION, "dns_request");
 }
 
 //
@@ -314,7 +165,9 @@ class NativeClientChannelDNSResolverFactory : public ResolverFactory {
 
   OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override {
     if (!IsValidUri(args.uri)) return nullptr;
-    return MakeOrphanable<NativeClientChannelDNSResolver>(std::move(args));
+    const grpc_channel_args* channel_args = args.args;
+    return MakeOrphanable<NativeClientChannelDNSResolver>(std::move(args),
+                                                          channel_args);
   }
 };
 

data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc

@@ -21,28 +21,27 @@
 
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 
-#include <limits.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <memory>
+#include <utility>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
+#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+
+#include <grpc/support/log.h>
 
-#include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/iomgr/unix_sockets_posix.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/work_serializer.h"
+#include "src/core/lib/resolver/resolver_factory.h"
 #include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
-#include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/slice/slice_string_helpers.h"
+#include "src/core/lib/service_config/service_config.h"
+#include "src/core/lib/uri/uri_parser.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h

@@ -19,10 +19,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/channel_args.h"
+#include "absl/base/thread_annotations.h"
+
+#include <grpc/impl/codegen/grpc_types.h>
+
 #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/iomgr/error.h"
 #include "src/core/lib/resolver/resolver.h"
 
 #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \