grpc 1.72.0 → 1.78.1

data/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc

@@ -20,7 +20,6 @@
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
-#include <ares.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log_windows.h>
 #include <grpc/support/string_util.h>
@@ -31,9 +30,6 @@
 #include <memory>
 #include <unordered_set>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr_windows.h"
@@ -41,9 +37,14 @@
 #include "src/core/lib/iomgr/tcp_windows.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/strings/str_format.h"
+// We pull in ares.h transitively here, ares.h is not self-contained
+// w.r.t. windows headers though, so make sure pull them in above.
 #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/util/crash.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/string.h"
 
@@ -134,8 +135,8 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
         << "| ~GrpcPolledFdWindows shutdown_called_: " << shutdown_called_;
     CSliceUnref(read_buf_);
     CSliceUnref(write_buf_);
-    CHECK_EQ(read_closure_, nullptr);
-    CHECK_EQ(write_closure_, nullptr);
+    GRPC_CHECK_EQ(read_closure_, nullptr);
+    GRPC_CHECK_EQ(write_closure_, nullptr);
     if (!shutdown_called_) {
       // This can happen if the socket was never seen by grpc ares wrapper
       // code, i.e. if we never started I/O polling on it.
@@ -155,16 +156,16 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
   }
 
   void RegisterForOnReadableLocked(grpc_closure* read_closure) override {
-    CHECK_EQ(read_closure_, nullptr);
+    GRPC_CHECK_EQ(read_closure_, nullptr);
     read_closure_ = read_closure;
-    CHECK_EQ(GRPC_SLICE_LENGTH(read_buf_), 0);
+    GRPC_CHECK_EQ(GRPC_SLICE_LENGTH(read_buf_), 0);
     CSliceUnref(read_buf_);
-    CHECK(!read_buf_has_data_);
+    GRPC_CHECK(!read_buf_has_data_);
     read_buf_ = GRPC_SLICE_MALLOC(4192);
     if (connect_done_) {
       ContinueRegisterForOnReadableLocked();
     } else {
-      CHECK(pending_continue_register_for_on_readable_locked_ == false);
+      GRPC_CHECK(pending_continue_register_for_on_readable_locked_ == false);
       pending_continue_register_for_on_readable_locked_ = true;
     }
   }
@@ -174,7 +175,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
         << "(c-ares resolver) fd:|" << GetName()
         << "| ContinueRegisterForOnReadableLocked "
         << "wsa_connect_error_:" << wsa_connect_error_;
-    CHECK(connect_done_);
+    GRPC_CHECK(connect_done_);
     if (wsa_connect_error_ != 0) {
       ScheduleAndNullReadClosure(GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
       return;
@@ -211,16 +212,16 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
           << "(c-ares resolver) fd:|" << GetName()
           << "| RegisterForOnWriteableLocked called";
     } else {
-      CHECK(socket_type_ == SOCK_STREAM);
+      GRPC_CHECK(socket_type_ == SOCK_STREAM);
       GRPC_TRACE_VLOG(cares_resolver, 2)
           << "(c-ares resolver) fd:|" << GetName()
           << "| RegisterForOnWriteableLocked called tcp_write_state_: "
           << tcp_write_state_ << " connect_done_: " << connect_done_;
     }
-    CHECK_EQ(write_closure_, nullptr);
+    GRPC_CHECK_EQ(write_closure_, nullptr);
     write_closure_ = write_closure;
     if (!connect_done_) {
-      CHECK(!pending_continue_register_for_on_writeable_locked_);
+      GRPC_CHECK(!pending_continue_register_for_on_writeable_locked_);
       pending_continue_register_for_on_writeable_locked_ = true;
       // Register an async OnTcpConnect callback here rather than when the
       // connect was initiated, since we are now guaranteed to hold a ref of the
@@ -236,7 +237,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
         << "(c-ares resolver) fd:|" << GetName()
         << "| ContinueRegisterForOnWriteableLocked "
         << "wsa_connect_error_:" << wsa_connect_error_;
-    CHECK(connect_done_);
+    GRPC_CHECK(connect_done_);
     if (wsa_connect_error_ != 0) {
       ScheduleAndNullWriteClosure(
           GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
@@ -245,7 +246,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
     if (socket_type_ == SOCK_DGRAM) {
       ScheduleAndNullWriteClosure(absl::OkStatus());
     } else {
-      CHECK(socket_type_ == SOCK_STREAM);
+      GRPC_CHECK(socket_type_ == SOCK_STREAM);
       int wsa_error_code = 0;
       switch (tcp_write_state_) {
         case WRITE_IDLE:
@@ -271,7 +272,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
   bool IsFdStillReadableLocked() override { return read_buf_has_data_; }
 
   void ShutdownLocked(grpc_error_handle /* error */) override {
-    CHECK(!shutdown_called_);
+    GRPC_CHECK(!shutdown_called_);
     shutdown_called_ = true;
     on_shutdown_locked_();
     grpc_winsocket_shutdown(winsocket_);
@@ -307,7 +308,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
     // c-ares overloads this recv_from virtual socket function to receive
     // data on both UDP and TCP sockets, and from is nullptr for TCP.
     if (from != nullptr) {
-      CHECK(*from_len >= recv_from_source_addr_len_);
+      GRPC_CHECK(*from_len >= recv_from_source_addr_len_);
       memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
       *from_len = recv_from_source_addr_len_;
     }
@@ -378,7 +379,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
     // to write everything inline.
     GRPC_TRACE_VLOG(cares_resolver, 2)
         << "(c-ares resolver) fd:" << GetName() << " SendVUDP called";
-    CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0);
+    GRPC_CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0);
     CSliceUnref(write_buf_);
     write_buf_ = FlattenIovec(iov, iov_count);
     DWORD bytes_sent = 0;
@@ -413,7 +414,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
     switch (tcp_write_state_) {
       case WRITE_IDLE:
         tcp_write_state_ = WRITE_REQUESTED;
-        CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0);
+        GRPC_CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0);
         CSliceUnref(write_buf_);
         write_buf_ = FlattenIovec(iov, iov_count);
         wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
@@ -429,12 +430,12 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
         // send again. If c-ares still needs to send even more data, we'll get
         // to it eventually.
         grpc_slice currently_attempted = FlattenIovec(iov, iov_count);
-        CHECK(GRPC_SLICE_LENGTH(currently_attempted) >=
-              GRPC_SLICE_LENGTH(write_buf_));
+        GRPC_CHECK(GRPC_SLICE_LENGTH(currently_attempted) >=
+                   GRPC_SLICE_LENGTH(write_buf_));
         ares_ssize_t total_sent = 0;
         for (size_t i = 0; i < GRPC_SLICE_LENGTH(write_buf_); i++) {
-          CHECK(GRPC_SLICE_START_PTR(currently_attempted)[i] ==
-                GRPC_SLICE_START_PTR(write_buf_)[i]);
+          GRPC_CHECK(GRPC_SLICE_START_PTR(currently_attempted)[i] ==
+                     GRPC_SLICE_START_PTR(write_buf_)[i]);
           total_sent++;
         }
         CSliceUnref(currently_attempted);
@@ -459,9 +460,9 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
         << pending_continue_register_for_on_readable_locked_
         << " pending_register_for_writeable:"
         << pending_continue_register_for_on_writeable_locked_;
-    CHECK(!connect_done_);
+    GRPC_CHECK(!connect_done_);
     connect_done_ = true;
-    CHECK_EQ(wsa_connect_error_, 0);
+    GRPC_CHECK_EQ(wsa_connect_error_, 0);
     if (!error.ok() || shutdown_called_) {
       wsa_connect_error_ = WSA_OPERATION_ABORTED;
     } else {
@@ -471,7 +472,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
           WSAGetOverlappedResult(grpc_winsocket_wrapped_socket(winsocket_),
                                  &winsocket_->write_info.overlapped,
                                  &transferred_bytes, FALSE, &flags);
-      CHECK_EQ(transferred_bytes, 0);
+      GRPC_CHECK_EQ(transferred_bytes, 0);
       if (!wsa_success) {
         wsa_connect_error_ = WSAGetLastError();
         char* msg = gpr_format_message(wsa_connect_error_);
@@ -506,8 +507,8 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
                  ares_socklen_t target_len) {
     GRPC_TRACE_VLOG(cares_resolver, 2)
         << "(c-ares resolver) fd:" << GetName() << " ConnectUDP";
-    CHECK(!connect_done_);
-    CHECK_EQ(wsa_connect_error_, 0);
+    GRPC_CHECK(!connect_done_);
+    GRPC_CHECK_EQ(wsa_connect_error_, 0);
     SOCKET s = grpc_winsocket_wrapped_socket(winsocket_);
     int out =
         WSAConnect(s, target, target_len, nullptr, nullptr, nullptr, nullptr);
@@ -651,7 +652,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
   void OnIocpWriteableLocked(grpc_error_handle error) {
     GRPC_TRACE_VLOG(cares_resolver, 2)
         << "(c-ares resolver) OnIocpWriteableInner. fd:|" << GetName() << "|";
-    CHECK(socket_type_ == SOCK_STREAM);
+    GRPC_CHECK(socket_type_ == SOCK_STREAM);
     if (error.ok()) {
       if (winsocket_->write_info.wsa_error != 0) {
         error = GRPC_WSA_ERROR(winsocket_->write_info.wsa_error,
@@ -664,7 +665,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
             << StatusToString(error) << "|";
       }
     }
-    CHECK(tcp_write_state_ == WRITE_PENDING);
+    GRPC_CHECK(tcp_write_state_ == WRITE_PENDING);
     if (error.ok()) {
       tcp_write_state_ = WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY;
       write_buf_ = grpc_slice_sub_no_ref(
@@ -725,7 +726,7 @@ class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
   GrpcPolledFd* NewGrpcPolledFdLocked(
       ares_socket_t as, grpc_pollset_set* /* driver_pollset_set */) override {
     auto it = sockets_.find(as);
-    CHECK(it != sockets_.end());
+    GRPC_CHECK(it != sockets_.end());
     return it->second;
   }
 
@@ -776,7 +777,7 @@ class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
         << "(c-ares resolver) fd:" << polled_fd->GetName()
         << " created with params af:" << af << " type:" << type
         << " protocol:" << protocol;
-    CHECK(self->sockets_.insert({s, polled_fd}).second);
+    GRPC_CHECK(self->sockets_.insert({s, polled_fd}).second);
     return s;
   }
 
@@ -786,7 +787,7 @@ class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
     GrpcPolledFdFactoryWindows* self =
         static_cast<GrpcPolledFdFactoryWindows*>(user_data);
     auto it = self->sockets_.find(as);
-    CHECK(it != self->sockets_.end());
+    GRPC_CHECK(it != self->sockets_.end());
     return it->second->Connect(&wsa_error_ctx, target, target_len);
   }
 
@@ -796,7 +797,7 @@ class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
     GrpcPolledFdFactoryWindows* self =
         static_cast<GrpcPolledFdFactoryWindows*>(user_data);
     auto it = self->sockets_.find(as);
-    CHECK(it != self->sockets_.end());
+    GRPC_CHECK(it != self->sockets_.end());
     return it->second->SendV(&wsa_error_ctx, iov, iovec_count);
   }
 
@@ -807,7 +808,7 @@ class GrpcPolledFdFactoryWindows final : public GrpcPolledFdFactory {
     GrpcPolledFdFactoryWindows* self =
         static_cast<GrpcPolledFdFactoryWindows*>(user_data);
     auto it = self->sockets_.find(as);
-    CHECK(it != self->sockets_.end());
+    GRPC_CHECK(it != self->sockets_.end());
     return it->second->RecvFrom(&wsa_error_ctx, data, data_len, flags, from,
                                 from_len);
   }

data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -22,9 +22,9 @@
 #include <algorithm>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/status_helper.h"
+#include "absl/strings/string_view.h"
 
 // IWYU pragma: no_include <arpa/inet.h>
 // IWYU pragma: no_include <arpa/nameser.h>
@@ -47,12 +47,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.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"
@@ -64,9 +58,15 @@
 #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/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/string.h"
 #include "src/core/util/time.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 
 using grpc_core::EndpointAddresses;
 using grpc_core::EndpointAddressesList;
@@ -215,7 +215,7 @@ static void grpc_ares_ev_driver_unref(grpc_ares_ev_driver* ev_driver)
     GRPC_TRACE_VLOG(cares_resolver, 2)
         << "(c-ares resolver) request:" << ev_driver->request
         << " destroy ev_driver " << ev_driver;
-    CHECK_EQ(ev_driver->fds, nullptr);
+    GRPC_CHECK_EQ(ev_driver->fds, nullptr);
     ares_destroy(ev_driver->channel);
     grpc_ares_complete_request_locked(ev_driver->request);
     delete ev_driver;
@@ -227,9 +227,9 @@ static void fd_node_destroy_locked(fd_node* fdn)
   GRPC_TRACE_VLOG(cares_resolver, 2)
       << "(c-ares resolver) request:" << fdn->ev_driver->request
       << " delete fd: " << fdn->grpc_polled_fd->GetName();
-  CHECK(!fdn->readable_registered);
-  CHECK(!fdn->writable_registered);
-  CHECK(fdn->already_shutdown);
+  GRPC_CHECK(!fdn->readable_registered);
+  GRPC_CHECK(!fdn->writable_registered);
+  GRPC_CHECK(fdn->already_shutdown);
   delete fdn->grpc_polled_fd;
   delete fdn;
 }
@@ -369,7 +369,7 @@ static void on_ares_backup_poll_alarm(void* arg, grpc_error_handle error) {
 static void on_readable(void* arg, grpc_error_handle error) {
   fd_node* fdn = static_cast<fd_node*>(arg);
   grpc_core::MutexLock lock(&fdn->ev_driver->request->mu);
-  CHECK(fdn->readable_registered);
+  GRPC_CHECK(fdn->readable_registered);
   grpc_ares_ev_driver* ev_driver = fdn->ev_driver;
   const ares_socket_t as = fdn->grpc_polled_fd->GetWrappedAresSocketLocked();
   fdn->readable_registered = false;
@@ -394,7 +394,7 @@ static void on_readable(void* arg, grpc_error_handle error) {
 static void on_writable(void* arg, grpc_error_handle error) {
   fd_node* fdn = static_cast<fd_node*>(arg);
   grpc_core::MutexLock lock(&fdn->ev_driver->request->mu);
-  CHECK(fdn->writable_registered);
+  GRPC_CHECK(fdn->writable_registered);
   grpc_ares_ev_driver* ev_driver = fdn->ev_driver;
   const ares_socket_t as = fdn->grpc_polled_fd->GetWrappedAresSocketLocked();
   fdn->writable_registered = false;
@@ -484,14 +484,17 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver)
       }
     }
   }
-  // Any remaining fds in ev_driver->fds were not returned by ares_getsock() and
-  // are therefore no longer in use, so they can be shut down and removed from
-  // the list.
+  // We may be shutting down to completion of all requests, or due to a timeout
+  // or explicit caller-triggered cancellation. In any of these cases, shut
+  // down and destroy any remaining fds.
   while (ev_driver->fds != nullptr) {
     fd_node* cur = ev_driver->fds;
     ev_driver->fds = ev_driver->fds->next;
-    fd_node_shutdown_locked(cur, "c-ares fd shutdown");
-    if (!cur->readable_registered && !cur->writable_registered) {
+    if (ev_driver->shutting_down) {
+      fd_node_shutdown_locked(cur, "grpc_ares_notify_on_event_locked");
+    }
+    if (cur->already_shutdown && !cur->readable_registered &&
+        !cur->writable_registered) {
       fd_node_destroy_locked(cur);
     } else {
       cur->next = new_list;
@@ -946,7 +949,7 @@ static bool inner_resolve_as_ip_literal_locked(
                                false /* log errors */) ||
       grpc_parse_ipv6_hostport(hostport->c_str(), &addr,
                                false /* log errors */)) {
-    CHECK(*addrs == nullptr);
+    GRPC_CHECK(*addrs == nullptr);
     *addrs = std::make_unique<EndpointAddressesList>();
     (*addrs)->emplace_back(addr, grpc_core::ChannelArgs());
     return true;
@@ -1000,7 +1003,7 @@ static bool inner_maybe_resolve_localhost_manually_locked(
     *port = default_port;
   }
   if (gpr_stricmp(host->c_str(), "localhost") == 0) {
-    CHECK(*addrs == nullptr);
+    GRPC_CHECK(*addrs == nullptr);
     *addrs = std::make_unique<grpc_core::EndpointAddressesList>();
     uint16_t numeric_port = grpc_strhtons(port->c_str());
     grpc_resolved_address address;
@@ -1199,7 +1202,7 @@ grpc_ares_request* (*grpc_dns_lookup_txt_ares)(
     int query_timeout_ms) = grpc_dns_lookup_txt_ares_impl;
 
 static void grpc_cancel_ares_request_impl(grpc_ares_request* r) {
-  CHECK_NE(r, nullptr);
+  GRPC_CHECK_NE(r, nullptr);
   grpc_core::MutexLock lock(&r->mu);
   GRPC_TRACE_VLOG(cares_resolver, 2)
       << "(c-ares resolver) request:" << r

data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h

@@ -19,23 +19,24 @@
 #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 <ares.h>
 #include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.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/resolver/endpoint_addresses.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
 
 #if GRPC_ARES == 1
 
+#include <ares.h>
+
 #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000
 
 typedef struct grpc_ares_ev_driver grpc_ares_ev_driver;

data/src/core/resolver/dns/dns_resolver_plugin.cc

@@ -17,8 +17,6 @@
 
 #include <memory>
 
-#include "absl/log/log.h"
-#include "absl/strings/match.h"
 #include "src/core/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h"
@@ -26,6 +24,8 @@
 #include "src/core/resolver/dns/native/dns_resolver.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/util/crash.h"
+#include "absl/log/log.h"
+#include "absl/strings/match.h"
 
 namespace grpc_core {
 
@@ -36,14 +36,17 @@ void RegisterDnsResolver(CoreConfiguration::Builder* builder) {
       std::make_unique<EventEngineClientChannelDNSResolverFactory>());
   return;
 #endif
-#ifndef GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER
-  if (IsEventEngineDnsEnabled()) {
+#ifdef GRPC_PYTHON_BUILD
+  bool use_ee = IsEventEnginePollerForPythonEnabled();
+#else   // GRPC_PYTHON_BUILD
+  bool use_ee = true;
+#endif  // GRPC_PYTHON_BUILD
+  if (use_ee && IsEventEngineDnsEnabled()) {
     VLOG(2) << "Using EventEngine dns resolver";
     builder->resolver_registry()->RegisterResolverFactory(
         std::make_unique<EventEngineClientChannelDNSResolverFactory>());
     return;
   }
-#endif
   auto resolver = ConfigVars::Get().DnsResolver();
   // ---- Ares resolver ----
   if (ShouldUseAresDnsResolver(resolver)) {

data/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc

@@ -27,15 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/cleanup/cleanup.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/strip.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
@@ -51,10 +42,19 @@
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/cleanup/cleanup.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/strip.h"
 
 // IWYU pragma: no_include <ratio>
 
@@ -421,7 +421,7 @@ void EventEngineClientChannelDNSResolver::EventEngineDNSRequestWrapper::
     // Make sure field destroys before cleanup.
     ValidationErrors::ScopedField field(&errors_, "txt lookup");
     if (orphaned_) return;
-    CHECK(is_txt_inflight_);
+    GRPC_CHECK(is_txt_inflight_);
     is_txt_inflight_ = false;
     if (!service_config.ok()) {
       errors_.AddError(service_config.status().message());

data/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h

@@ -15,11 +15,11 @@
 #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/resolver/resolver.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/uri.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/resolver/dns/event_engine/service_config_helper.cc

@@ -19,8 +19,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/util/gethostname.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
@@ -28,6 +26,8 @@
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/status_helper.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/resolver/dns/native/dns_resolver.cc

@@ -23,13 +23,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/functional/bind_front.h"
-#include "absl/log/log.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 "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
@@ -45,6 +38,13 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/util/uri.h"
+#include "absl/functional/bind_front.h"
+#include "absl/log/log.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"
 
 #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6

data/src/core/resolver/endpoint_addresses.cc

@@ -25,14 +25,14 @@
 #include <utility>
 #include <vector>
 
-#include "absl/log/check.h"
+#include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/util/grpc_check.h"
+#include "src/core/util/useful.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/util/useful.h"
 
 // IWYU pragma: no_include <sys/socket.h>
 
@@ -45,7 +45,7 @@ EndpointAddresses::EndpointAddresses(const grpc_resolved_address& address,
 EndpointAddresses::EndpointAddresses(
     std::vector<grpc_resolved_address> addresses, const ChannelArgs& args)
     : addresses_(std::move(addresses)), args_(args) {
-  CHECK(!addresses_.empty());
+  GRPC_CHECK(!addresses_.empty());
 }
 
 EndpointAddresses::EndpointAddresses(const EndpointAddresses& other)
@@ -108,7 +108,7 @@ bool EndpointAddressSet::operator==(const EndpointAddressSet& other) const {
   if (addresses_.size() != other.addresses_.size()) return false;
   auto other_it = other.addresses_.begin();
   for (auto it = addresses_.begin(); it != addresses_.end(); ++it) {
-    CHECK(other_it != other.addresses_.end());
+    GRPC_CHECK(other_it != other.addresses_.end());
     if (it->len != other_it->len ||
         memcmp(it->addr, other_it->addr, it->len) != 0) {
       return false;

data/src/core/resolver/endpoint_addresses.h

@@ -26,9 +26,9 @@
 #include <utility>
 #include <vector>
 
-#include "absl/functional/function_ref.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "absl/functional/function_ref.h"
 
 // A channel arg key prefix used for args that are intended to be used
 // only internally to resolvers and LB policies and should not be part
@@ -42,6 +42,9 @@
 // Name associated with individual address, if available (e.g., DNS name).
 #define GRPC_ARG_ADDRESS_NAME "grpc.address_name"
 
+// Backend service name associated with the addresses.
+#define GRPC_ARG_BACKEND_SERVICE "grpc.internal.backend_service"
+
 namespace grpc_core {
 
 // A list of addresses for a given endpoint with an associated set of channel

data/src/core/resolver/fake/fake_resolver.cc

@@ -25,16 +25,16 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/uri.h"
 #include "src/core/util/useful.h"
 #include "src/core/util/work_serializer.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -94,7 +94,7 @@ void FakeResolver::StartLocked() {
 
 void FakeResolver::RequestReresolutionLocked() {
   // Re-resolution can't happen until after we return an initial result.
-  CHECK(response_generator_ != nullptr);
+  GRPC_CHECK(response_generator_ != nullptr);
   response_generator_->ReresolutionRequested();
 }
 

data/src/core/resolver/fake/fake_resolver.h

@@ -23,15 +23,15 @@
 #include <optional>
 #include <utility>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/useful.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/time.h"
 
 #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \
   "grpc.fake_resolver.response_generator"