grpc 1.68.1 → 1.69.0.pre1

data/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefP
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ */

data/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */

data/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool *
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */
+#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */

data/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h

@@ -19,7 +19,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 // Set by the handshaker to indicate the local address of the endpoint.
 #define GRPC_ARG_ENDPOINT_LOCAL_ADDRESS "grpc.internal.endpoint_local_address"

data/src/core/handshaker/http_connect/http_connect_handshaker.cc

@@ -35,11 +35,11 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@@ -107,6 +107,12 @@ void HttpConnectHandshaker::HandshakeFailedLocked(absl::Status error) {
     // own error.
     error = GRPC_ERROR_CREATE("Handshaker shutdown");
   }
+  absl::string_view peer_string = "[unknown]";
+  if (args_ != nullptr && args_->endpoint != nullptr) {
+    peer_string = grpc_endpoint_get_peer(args_->endpoint.get());
+  }
+  LOG_EVERY_N_SEC(ERROR, 1)
+      << "HTTP proxy handshake with " << peer_string << " failed: " << error;
   // Invoke callback.
   FinishLocked(std::move(error));
 }

data/src/core/handshaker/http_connect/http_connect_handshaker.h

@@ -21,7 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 /// Channel arg indicating the server in HTTP CONNECT request (string).
 /// The presence of this arg triggers the use of HTTP CONNECT.

data/src/core/handshaker/http_connect/http_proxy_mapper.h

@@ -25,9 +25,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {

data/src/core/handshaker/http_connect/xds_http_proxy_mapper.h

@@ -21,9 +21,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {

data/src/core/handshaker/security/security_handshaker.cc

@@ -42,12 +42,12 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/security/secure_endpoint.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"

data/src/core/handshaker/security/security_handshaker.h

@@ -23,9 +23,9 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/ref_counted_ptr.h"

data/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc

@@ -32,12 +32,12 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"

data/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h

@@ -19,7 +19,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 
 // Indicates the address that the tcp connect handshaker should connect to.
 #define GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS \

data/src/core/lib/channel/channel_args.h

@@ -677,7 +677,7 @@ typedef grpc_core::ChannelArgs (
     const char* target, const grpc_core::ChannelArgs& old_args,
     grpc_channel_stack_type type);
 
-// Should be called only once globaly before grpc is init'ed.
+// Should be called only once globally before grpc is init'ed.
 void grpc_channel_args_set_client_channel_creation_mutator(
     grpc_channel_args_client_channel_creation_mutator cb);
 // This will be called at the creation of each channel.

data/src/core/lib/channel/channel_args_preconditioning.h

@@ -27,7 +27,7 @@ namespace grpc_core {
 
 // Registry of mutators for channel args.
 // Surface APIs should call into this with channel args received from outside
-// of gRPC, in order to prepare those channel args for the expections of the
+// of gRPC, in order to prepare those channel args for the expectations of the
 // gRPC internals.
 class ChannelArgsPreconditioning {
  public:

data/src/core/lib/channel/connected_channel.cc

@@ -34,11 +34,11 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/call_combiner.h"

data/src/core/lib/channel/promise_based_filter.cc

@@ -2236,7 +2236,7 @@ ArenaPromise<ServerMetadataHandle> ServerCallData::MakeNextPromise(
 }
 
 // Wrapper to make it look like we're calling the next filter as a promise.
-// All polls: await sending the trailing metadata, then foward it down the
+// All polls: await sending the trailing metadata, then forward it down the
 // stack.
 Poll<ServerMetadataHandle> ServerCallData::PollTrailingMetadata() {
   GRPC_TRACE_LOG(channel, INFO)

data/src/core/lib/channel/promise_based_filter.h

@@ -179,7 +179,7 @@ class ChannelFilter {
 
 namespace promise_filter_detail {
 
-// Determine if a list of interceptors has any that need to asyncronously error
+// Determine if a list of interceptors has any that need to asynchronously error
 // the promise. If so, we need to allocate a latch for the generated promise for
 // the original promise stack polyfill code that's generated.
 
@@ -1502,7 +1502,7 @@ class ServerCallData : public BaseCallData {
   //   - return a wrapper around PollTrailingMetadata as the promise.
   ArenaPromise<ServerMetadataHandle> MakeNextPromise(CallArgs call_args);
   // Wrapper to make it look like we're calling the next filter as a promise.
-  // All polls: await sending the trailing metadata, then foward it down the
+  // All polls: await sending the trailing metadata, then forward it down the
   // stack.
   Poll<ServerMetadataHandle> PollTrailingMetadata();
   static void RecvInitialMetadataReadyCallback(void* arg,

data/src/core/lib/debug/trace.cc

@@ -31,7 +31,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/util/glob.h"
 
 int grpc_tracer_set_enabled(const char* name, int enabled);

data/src/core/lib/event_engine/ares_resolver.cc

@@ -60,9 +60,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/time_util.h"
@@ -834,7 +834,6 @@ bool ShouldUseAresDnsResolver() {
 
 absl::Status AresInit() {
   if (ShouldUseAresDnsResolver()) {
-    address_sorting_init();
     // ares_library_init and ares_library_cleanup are currently no-op except
     // under Windows. Calling them may cause race conditions when other parts of
     // the binary calls these functions concurrently.
@@ -850,7 +849,6 @@ absl::Status AresInit() {
 }
 void AresShutdown() {
   if (ShouldUseAresDnsResolver()) {
-    address_sorting_shutdown();
     // ares_library_init and ares_library_cleanup are currently no-op except
     // under Windows. Calling them may cause race conditions when other parts of
     // the binary calls these functions concurrently.

data/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc

@@ -143,7 +143,7 @@ void DNSServiceResolverImpl::ResolveCallback(
       << ", this: " << context;
 
   // no need to increase refcount here, since ResolveCallback and Shutdown is
-  // called from the serial queue and it is guarenteed that it won't be called
+  // called from the serial queue and it is guaranteed that it won't be called
   // after the sdRef is deallocated
   auto that = static_cast<DNSServiceResolverImpl*>(context);
 
@@ -221,8 +221,12 @@ void DNSServiceResolverImpl::Shutdown() {
   dispatch_async_f(queue_, Ref().release(), [](void* thatPtr) {
     grpc_core::RefCountedPtr<DNSServiceResolverImpl> that{
         static_cast<DNSServiceResolverImpl*>(thatPtr)};
-    grpc_core::MutexLock lock(&that->request_mu_);
-    for (auto& kv : that->requests_) {
+
+    grpc_core::ReleasableMutexLock lock(&that->request_mu_);
+    auto requests = std::exchange(that->requests_, {});
+    lock.Release();
+
+    for (auto& kv : requests) {
       auto& sdRef = kv.first;
       auto& request = kv.second;
       GRPC_TRACE_LOG(event_engine_dns, INFO)
@@ -232,7 +236,6 @@ void DNSServiceResolverImpl::Shutdown() {
           absl::CancelledError("DNSServiceResolverImpl::Shutdown"));
       DNSServiceRefDeallocate(static_cast<DNSServiceRef>(sdRef));
     }
-    that->requests_.clear();
   });
 }
 

data/src/core/lib/event_engine/default_event_engine.cc

@@ -21,8 +21,8 @@
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine_factory.h"
 #include "src/core/util/debug_location.h"

data/src/core/lib/event_engine/default_event_engine.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/util/debug_location.h"
 
 namespace grpc_event_engine {

data/src/core/lib/event_engine/forkable.cc

@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 
 namespace grpc_event_engine {

data/src/core/lib/event_engine/nameser.h

@@ -78,7 +78,7 @@ typedef enum __ns_type {
   ns_t_cert = 37,      // Certification record
   ns_t_a6 = 38,        // IPv6 address (deprecates AAAA)
   ns_t_dname = 39,     // Non-terminal DNAME (for IPv6)
-  ns_t_sink = 40,      // Kitchen sink (experimentatl)
+  ns_t_sink = 40,      // Kitchen sink (experimental)
   ns_t_opt = 41,       // EDNS0 option (meta-RR)
   ns_t_apl = 42,       // Address prefix list (RFC3123)
   ns_t_ds = 43,        // Delegation Signer (RFC4034)

data/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc

@@ -356,7 +356,7 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler)
   CHECK_GE(g_epoll_set_.epfd, 0);
   GRPC_TRACE_LOG(event_engine_poller, INFO)
       << "grpc epoll fd: " << g_epoll_set_.epfd;
-  struct epoll_event ev {};
+  struct epoll_event ev{};
   ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLET);
   ev.data.ptr = wakeup_fd_.get();
   CHECK(epoll_ctl(g_epoll_set_.epfd, EPOLL_CTL_ADD, wakeup_fd_->ReadFd(),

data/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc

@@ -376,7 +376,7 @@ void PollEventHandle::OrphanHandle(PosixEngineClosure* on_done, int* release_fd,
     if (!IsWatched()) {
       CloseFd();
     } else {
-      // It is watched i.e we cannot take action wihout breaking from the
+      // It is watched i.e we cannot take action without breaking from the
       // blocking poll. Mark it as Unwatched and kick the thread executing
       // Work(...). That thread should proceed with the cleanup.
       SetWatched(-1);
@@ -447,7 +447,7 @@ void PollEventHandle::ShutdownHandle(absl::Status why) {
       SetReadyLocked(&write_closure_);
     }
   }
-  // For the Ref() taken at the begining of this function.
+  // For the Ref() taken at the beginning of this function.
   Unref();
 }
 
@@ -469,7 +469,7 @@ void PollEventHandle::NotifyOnRead(PosixEngineClosure* on_read) {
       poller_->KickExternal(false);
     }
   }
-  // For the Ref() taken at the begining of this function.
+  // For the Ref() taken at the beginning of this function.
   Unref();
 }
 
@@ -491,7 +491,7 @@ void PollEventHandle::NotifyOnWrite(PosixEngineClosure* on_write) {
       poller_->KickExternal(false);
     }
   }
-  // For the Ref() taken at the begining of this function.
+  // For the Ref() taken at the beginning of this function.
   Unref();
 }
 

data/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc

@@ -19,7 +19,7 @@
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
 #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h"

data/src/core/lib/event_engine/posix_engine/posix_endpoint.cc

@@ -1214,7 +1214,7 @@ bool PosixEndpointImpl::Write(
   // Write succeeded immediately. Return true and don't run the on_writable
   // callback.
   GRPC_TRACE_LOG(event_engine_endpoint, INFO)
-      << "Endpoint[" << this << "]: Write succeded immediately";
+      << "Endpoint[" << this << "]: Write succeeded immediately";
   return true;
 }
 

data/src/core/lib/event_engine/posix_engine/posix_engine.cc

@@ -607,7 +607,7 @@ bool PosixEventEngine::CancelConnect(EventEngine::ConnectionHandle handle) {
     // Shutdown the fd. This would cause OnWritable to run as soon as
     // possible. We dont need to pass a custom error here because it wont be
     // used since the on_connect_closure is not run if connect cancellation is
-    // successfull.
+    // successful.
     ac->fd_->ShutdownHandle(
         absl::FailedPreconditionError("Connection cancelled"));
   }

data/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc

@@ -291,7 +291,7 @@ absl::Status PosixEngineListenerImpl::HandleExternalConnection(
 }
 
 void PosixEngineListenerImpl::AsyncConnectionAcceptor::Shutdown() {
-  // The ShutdownHandle whould trigger any waiting notify_on_accept_ to get
+  // The ShutdownHandle would trigger any waiting notify_on_accept_ to get
   // scheduled with the not-OK status.
   handle_->ShutdownHandle(absl::InternalError("Shutting down acceptor"));
   Unref();

data/src/core/lib/event_engine/posix_engine/timer_heap.cc

@@ -50,7 +50,7 @@ void TimerHeap::AdjustUpwards(size_t i, Timer* t) {
 // position.
 void TimerHeap::AdjustDownwards(size_t i, Timer* t) {
   for (;;) {
-    size_t left_child = 1 + 2 * i;
+    size_t left_child = 1 + (2 * i);
     if (left_child >= timers_.size()) break;
     size_t right_child = left_child + 1;
     size_t next_i =

data/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc

@@ -45,7 +45,7 @@ void FillGprFromTimestamp(gpr_timespec* gts, const struct timespec* ts) {
 }
 
 void DefaultTimestampsCallback(void* /*arg*/, Timestamps* /*ts*/,
-                               absl::Status /*shudown_err*/) {
+                               absl::Status /*shutdown_err*/) {
   VLOG(2) << "Timestamps callback has not been registered";
 }
 

data/src/core/lib/event_engine/tcp_socket_utils.cc

@@ -141,12 +141,6 @@ absl::StatusOr<std::string> ResolvedAddrToUriUnixIfPossible(
   return uri->ToString();
 }
 #else
-
-absl::StatusOr<std::string> ResolvedAddrToUnixPathIfPossible(
-    const EventEngine::ResolvedAddress* /*resolved_addr*/) {
-  return absl::InvalidArgumentError("Unix socket is not supported.");
-}
-
 absl::StatusOr<std::string> ResolvedAddrToUriUnixIfPossible(
     const EventEngine::ResolvedAddress* /*resolved_addr*/) {
   return absl::InvalidArgumentError("Unix socket is not supported.");

data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -116,7 +116,7 @@ namespace {
 constexpr auto kIdleThreadLimit = std::chrono::seconds(20);
 // Rate at which "Waiting for ..." logs should be printed while quiescing.
 constexpr size_t kBlockingQuiesceLogRateSeconds = 3;
-// Minumum time between thread creations.
+// Minimum time between thread creations.
 constexpr grpc_core::Duration kTimeBetweenThrottledThreadStarts =
     grpc_core::Duration::Seconds(1);
 // Minimum time a worker thread should sleep between checking for new work. Used

data/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc

@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : 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_);
+      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_;
     }

data/src/core/lib/event_engine/windows/windows_endpoint.cc

@@ -42,7 +42,8 @@ void DumpSliceBuffer(SliceBuffer* buffer, absl::string_view context_string) {
   for (size_t i = 0; i < buffer->Count(); i++) {
     auto str = buffer->MutableSliceAt(i).as_string_view();
     GRPC_TRACE_LOG(event_engine_endpoint, INFO)
-        << context_string << ": " << str;
+        << context_string << " [" << i + 1 << "/" << buffer->Count()
+        << "]: " << str;
   }
 }
 
@@ -78,7 +79,7 @@ WindowsEndpoint::~WindowsEndpoint() {
 
 void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) {
   GRPC_TRACE_LOG(event_engine_endpoint, INFO)
-      << "WindowsEndpoint::" << endpoint << " reading";
+      << "WindowsEndpoint::" << endpoint << " attempting a read";
   if (socket->IsShutdown()) {
     socket->read_info()->SetErrorStatus(
         absl::InternalError("Socket is shutting down."));
@@ -120,7 +121,7 @@ void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) {
     // The async read attempt returned an error immediately.
     socket->UnregisterReadCallback();
     socket->read_info()->SetResult(
-        wsa_error, 0, absl::StrFormat("WindowsEndpont::%p Read failed", this));
+        wsa_error, 0, absl::StrFormat("WindowsEndpoint::%p Read failed", this));
     thread_pool->Run(&handle_read_event);
   }
 }
@@ -294,15 +295,23 @@ void WindowsEndpoint::HandleReadClosure::Run() {
     return ResetAndReturnCallback()(status);
   }
   if (result.bytes_transferred == 0) {
+    DCHECK_GT(io_state.use_count(), 0);
     // Either the endpoint is shut down or we've seen the end of the stream
     if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) {
-      DumpSliceBuffer(buffer_, absl::StrFormat("WindowsEndpoint::%p READ",
-                                               io_state->endpoint));
+      LOG(INFO) << "WindowsEndpoint::" << this << " read 0 bytes.";
+      DumpSliceBuffer(
+          &last_read_buffer_,
+          absl::StrFormat("WindowsEndpoint::%p READ last_read_buffer_: ",
+                          io_state->endpoint));
     }
-    status = absl::InternalError("End of TCP stream");
-    grpc_core::StatusSetInt(&status, grpc_core::StatusIntProperty::kRpcStatus,
-                            GRPC_STATUS_UNAVAILABLE);
     buffer_->Swap(last_read_buffer_);
+    if (buffer_->Length() == 0) {
+      // Only send an error if there is no more data to consume. If the endpoint
+      // or socket is shut down, the next read will discover that.
+      status = absl::InternalError("End of TCP stream");
+      grpc_core::StatusSetInt(&status, grpc_core::StatusIntProperty::kRpcStatus,
+                              GRPC_STATUS_UNAVAILABLE);
+    }
     return ResetAndReturnCallback()(status);
   }
   DCHECK_GT(result.bytes_transferred, 0);
@@ -320,8 +329,13 @@ void WindowsEndpoint::HandleReadClosure::Run() {
 
 bool WindowsEndpoint::HandleReadClosure::MaybeFinishIfDataHasAlreadyBeenRead() {
   if (last_read_buffer_.Length() > 0) {
+    GRPC_TRACE_LOG(event_engine_endpoint, INFO)
+        << "WindowsEndpoint::" << io_state_->endpoint
+        << " finishing a synchronous read";
     buffer_->Swap(last_read_buffer_);
-    // Captures io_state_ to ensure it remains alive until the callback is run.
+    if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) {
+      DumpSliceBuffer(buffer_, "finishing synchronous read");
+    }
     io_state_->thread_pool->Run(
         [cb = ResetAndReturnCallback()]() mutable { cb(absl::OkStatus()); });
     return true;

data/src/core/lib/event_engine/windows/windows_engine.h

@@ -125,7 +125,7 @@ class WindowsEventEngine : public EventEngine,
     // runs once.
     OnConnectCallback TakeCallback() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
 
-    // Create an Endpoint, transfering held object ownership to the endpoint.
+    // Create an Endpoint, transferring held object ownership to the endpoint.
     //
     // This can only be called once, and the connection state is no longer valid
     // after an endpoint has been created. Callers must guarantee that the

data/src/core/lib/experiments/config.cc

@@ -31,7 +31,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 #include "src/core/util/no_destruct.h"