grpc 1.84.0 → 1.85.0.pre1

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

@@ -102,6 +102,8 @@ const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
+const char* const description_internal_fix = "Gate for the internal fix.";
+const char* const additional_constraints_internal_fix = "{}";
 const char* const description_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -110,6 +112,10 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
+const char* const description_map_host_header_to_authority =
+    "Map the HTTP host header directly to HttpAuthorityMetadata and reject "
+    "duplicate host/authority headers.";
+const char* const additional_constraints_map_host_header_to_authority = "{}";
 const char* const description_memory_optimization_01 = "Memory Optimization";
 const char* const additional_constraints_memory_optimization_01 = "{}";
 const char* const description_memory_optimization_02 = "Memory Optimization 02";
@@ -204,6 +210,9 @@ const char* const additional_constraints_retry_in_callv3 = "{}";
 const char* const description_return_preexisting_errors =
     "Return errors that exist before the start of the call in RunHandler.";
 const char* const additional_constraints_return_preexisting_errors = "{}";
+const char* const description_ring_hash_update_cleanup =
+    "Clean up update logic in ring_hash LB policy.";
+const char* const additional_constraints_ring_hash_update_cleanup = "{}";
 const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
@@ -332,11 +341,16 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
+    {"internal_fix", description_internal_fix,
+     additional_constraints_internal_fix, nullptr, 0, false, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
      additional_constraints_keep_alive_ping_timer_batch, nullptr, 0, false,
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
+    {"map_host_header_to_authority", description_map_host_header_to_authority,
+     additional_constraints_map_host_header_to_authority, nullptr, 0, false,
+     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
@@ -409,6 +423,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
      additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
+    {"ring_hash_update_cleanup", description_ring_hash_update_cleanup,
+     additional_constraints_ring_hash_update_cleanup, nullptr, 0, false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
@@ -546,6 +562,8 @@ const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
+const char* const description_internal_fix = "Gate for the internal fix.";
+const char* const additional_constraints_internal_fix = "{}";
 const char* const description_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -554,6 +572,10 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
+const char* const description_map_host_header_to_authority =
+    "Map the HTTP host header directly to HttpAuthorityMetadata and reject "
+    "duplicate host/authority headers.";
+const char* const additional_constraints_map_host_header_to_authority = "{}";
 const char* const description_memory_optimization_01 = "Memory Optimization";
 const char* const additional_constraints_memory_optimization_01 = "{}";
 const char* const description_memory_optimization_02 = "Memory Optimization 02";
@@ -648,6 +670,9 @@ const char* const additional_constraints_retry_in_callv3 = "{}";
 const char* const description_return_preexisting_errors =
     "Return errors that exist before the start of the call in RunHandler.";
 const char* const additional_constraints_return_preexisting_errors = "{}";
+const char* const description_ring_hash_update_cleanup =
+    "Clean up update logic in ring_hash LB policy.";
+const char* const additional_constraints_ring_hash_update_cleanup = "{}";
 const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
@@ -776,11 +801,16 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
+    {"internal_fix", description_internal_fix,
+     additional_constraints_internal_fix, nullptr, 0, false, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
      additional_constraints_keep_alive_ping_timer_batch, nullptr, 0, false,
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
+    {"map_host_header_to_authority", description_map_host_header_to_authority,
+     additional_constraints_map_host_header_to_authority, nullptr, 0, false,
+     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
@@ -853,6 +883,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
      additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
+    {"ring_hash_update_cleanup", description_ring_hash_update_cleanup,
+     additional_constraints_ring_hash_update_cleanup, nullptr, 0, false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
@@ -990,6 +1022,8 @@ const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
+const char* const description_internal_fix = "Gate for the internal fix.";
+const char* const additional_constraints_internal_fix = "{}";
 const char* const description_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -998,6 +1032,10 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
+const char* const description_map_host_header_to_authority =
+    "Map the HTTP host header directly to HttpAuthorityMetadata and reject "
+    "duplicate host/authority headers.";
+const char* const additional_constraints_map_host_header_to_authority = "{}";
 const char* const description_memory_optimization_01 = "Memory Optimization";
 const char* const additional_constraints_memory_optimization_01 = "{}";
 const char* const description_memory_optimization_02 = "Memory Optimization 02";
@@ -1092,6 +1130,9 @@ const char* const additional_constraints_retry_in_callv3 = "{}";
 const char* const description_return_preexisting_errors =
     "Return errors that exist before the start of the call in RunHandler.";
 const char* const additional_constraints_return_preexisting_errors = "{}";
+const char* const description_ring_hash_update_cleanup =
+    "Clean up update logic in ring_hash LB policy.";
+const char* const additional_constraints_ring_hash_update_cleanup = "{}";
 const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
@@ -1220,11 +1261,16 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
+    {"internal_fix", description_internal_fix,
+     additional_constraints_internal_fix, nullptr, 0, false, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
      additional_constraints_keep_alive_ping_timer_batch, nullptr, 0, false,
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
+    {"map_host_header_to_authority", description_map_host_header_to_authority,
+     additional_constraints_map_host_header_to_authority, nullptr, 0, false,
+     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
@@ -1297,6 +1343,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
      additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
+    {"ring_hash_update_cleanup", description_ring_hash_update_cleanup,
+     additional_constraints_ring_hash_update_cleanup, nullptr, 0, false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,

data/src/core/lib/experiments/experiments.h

@@ -94,8 +94,10 @@ inline bool IsH2MaxDeallocatingStreamsHeadroomEnabled() { return false; }
 inline bool IsHeaderDataFrameEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_INPROC_CANCEL_STREAM
 inline bool IsInprocCancelStreamEnabled() { return true; }
+inline bool IsInternalFixEnabled() { return false; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
+inline bool IsMapHostHeaderToAuthorityEnabled() { return false; }
 inline bool IsMemoryOptimization01Enabled() { return false; }
 inline bool IsMemoryOptimization02Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MESSAGE_SIZE_REFACTORING
@@ -133,6 +135,7 @@ inline bool IsRecvMessageFilterBypassFixEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_RETURN_PREEXISTING_ERRORS
 inline bool IsReturnPreexistingErrorsEnabled() { return true; }
+inline bool IsRingHashUpdateCleanupEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeReadsEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeWritesEnabled() { return false; }
@@ -188,8 +191,10 @@ inline bool IsH2MaxDeallocatingStreamsHeadroomEnabled() { return false; }
 inline bool IsHeaderDataFrameEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_INPROC_CANCEL_STREAM
 inline bool IsInprocCancelStreamEnabled() { return true; }
+inline bool IsInternalFixEnabled() { return false; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
+inline bool IsMapHostHeaderToAuthorityEnabled() { return false; }
 inline bool IsMemoryOptimization01Enabled() { return false; }
 inline bool IsMemoryOptimization02Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MESSAGE_SIZE_REFACTORING
@@ -227,6 +232,7 @@ inline bool IsRecvMessageFilterBypassFixEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_RETURN_PREEXISTING_ERRORS
 inline bool IsReturnPreexistingErrorsEnabled() { return true; }
+inline bool IsRingHashUpdateCleanupEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeReadsEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeWritesEnabled() { return false; }
@@ -282,8 +288,10 @@ inline bool IsH2MaxDeallocatingStreamsHeadroomEnabled() { return false; }
 inline bool IsHeaderDataFrameEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_INPROC_CANCEL_STREAM
 inline bool IsInprocCancelStreamEnabled() { return true; }
+inline bool IsInternalFixEnabled() { return false; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
+inline bool IsMapHostHeaderToAuthorityEnabled() { return false; }
 inline bool IsMemoryOptimization01Enabled() { return false; }
 inline bool IsMemoryOptimization02Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MESSAGE_SIZE_REFACTORING
@@ -321,6 +329,7 @@ inline bool IsRecvMessageFilterBypassFixEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_RETURN_PREEXISTING_ERRORS
 inline bool IsReturnPreexistingErrorsEnabled() { return true; }
+inline bool IsRingHashUpdateCleanupEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeReadsEnabled() { return false; }
 inline bool IsSecureEndpointOffloadLargeWritesEnabled() { return false; }
@@ -361,8 +370,10 @@ enum ExperimentIds {
   kExperimentIdH2MaxDeallocatingStreamsHeadroom,
   kExperimentIdHeaderDataFrame,
   kExperimentIdInprocCancelStream,
+  kExperimentIdInternalFix,
   kExperimentIdKeepAlivePingTimerBatch,
   kExperimentIdLocalConnectorSecure,
+  kExperimentIdMapHostHeaderToAuthority,
   kExperimentIdMemoryOptimization01,
   kExperimentIdMemoryOptimization02,
   kExperimentIdMessageSizeRefactoring,
@@ -390,6 +401,7 @@ enum ExperimentIds {
   kExperimentIdRecvMessageFilterBypassFix,
   kExperimentIdRetryInCallv3,
   kExperimentIdReturnPreexistingErrors,
+  kExperimentIdRingHashUpdateCleanup,
   kExperimentIdScheduleCancellationOverWrite,
   kExperimentIdSecureEndpointOffloadLargeReads,
   kExperimentIdSecureEndpointOffloadLargeWrites,
@@ -488,6 +500,10 @@ inline bool IsHeaderDataFrameEnabled() {
 inline bool IsInprocCancelStreamEnabled() {
   return IsExperimentEnabled<kExperimentIdInprocCancelStream>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_INTERNAL_FIX
+inline bool IsInternalFixEnabled() {
+  return IsExperimentEnabled<kExperimentIdInternalFix>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_KEEP_ALIVE_PING_TIMER_BATCH
 inline bool IsKeepAlivePingTimerBatchEnabled() {
   return IsExperimentEnabled<kExperimentIdKeepAlivePingTimerBatch>();
@@ -496,6 +512,10 @@ inline bool IsKeepAlivePingTimerBatchEnabled() {
 inline bool IsLocalConnectorSecureEnabled() {
   return IsExperimentEnabled<kExperimentIdLocalConnectorSecure>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MAP_HOST_HEADER_TO_AUTHORITY
+inline bool IsMapHostHeaderToAuthorityEnabled() {
+  return IsExperimentEnabled<kExperimentIdMapHostHeaderToAuthority>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_MEMORY_OPTIMIZATION_01
 inline bool IsMemoryOptimization01Enabled() {
   return IsExperimentEnabled<kExperimentIdMemoryOptimization01>();
@@ -604,6 +624,10 @@ inline bool IsRetryInCallv3Enabled() {
 inline bool IsReturnPreexistingErrorsEnabled() {
   return IsExperimentEnabled<kExperimentIdReturnPreexistingErrors>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_RING_HASH_UPDATE_CLEANUP
+inline bool IsRingHashUpdateCleanupEnabled() {
+  return IsExperimentEnabled<kExperimentIdRingHashUpdateCleanup>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE
 inline bool IsScheduleCancellationOverWriteEnabled() {
   return IsExperimentEnabled<kExperimentIdScheduleCancellationOverWrite>();

data/src/core/lib/iomgr/buffer_list.cc

@@ -214,7 +214,7 @@ void TracedBufferList::AddNewEntry(int32_t seq_no, int fd, void* arg) {
                                &(new_elem->ts_.info));
   }
   new_elem->last_timestamp_ = new_elem->ts_.sendmsg_time.time;
-  MutexLock lock(&mu_);
+  MutexLock lock(mu_);
   if (!head_) {
     head_ = tail_ = new_elem;
   } else {
@@ -226,7 +226,7 @@ void TracedBufferList::AddNewEntry(int32_t seq_no, int fd, void* arg) {
 void TracedBufferList::ProcessTimestamp(struct sock_extended_err* serr,
                                         struct cmsghdr* opt_stats,
                                         struct scm_timestamping* tss) {
-  MutexLock lock(&mu_);
+  MutexLock lock(mu_);
   TracedBuffer* elem = head_;
   TracedBuffer* prev = nullptr;
   while (elem != nullptr) {
@@ -293,7 +293,7 @@ void TracedBufferList::ProcessTimestamp(struct sock_extended_err* serr,
 }
 
 void TracedBufferList::Shutdown(void* remaining, absl::Status shutdown_err) {
-  MutexLock lock(&mu_);
+  MutexLock lock(mu_);
   while (head_) {
     TracedBuffer* elem = head_;
     g_timestamps_callback(elem->arg_, &(elem->ts_), shutdown_err);

data/src/core/lib/iomgr/buffer_list.h

@@ -123,7 +123,7 @@ class TracedBufferList {
                         struct scm_timestamping* tss);
   // The Size() operation is slow and is used only in tests.
   int Size() {
-    MutexLock lock(&mu_);
+    MutexLock lock(mu_);
     int size = 0;
     TracedBuffer* curr = head_;
     while (curr) {

data/src/core/lib/iomgr/combiner.cc

@@ -217,7 +217,6 @@ bool grpc_combiner_continue_exec_ctx() {
     cl->cb(cl->cb_arg, std::move(cl_err));
   } else {
     grpc_closure* c = lock->final_list.head;
-    CHECK_NE(c, nullptr);
     grpc_closure_list_init(&lock->final_list);
     int loops = 0;
     while (c != nullptr) {

data/src/core/lib/iomgr/ev_apple.cc

@@ -109,7 +109,7 @@ static void grpc_apple_register_read_stream_run_loop(
     CFReadStreamRef read_stream, dispatch_queue_t /*dispatch_queue*/) {
   GRPC_TRACE_VLOG(apple_polling, 2)
       << "(polling) Register read stream: " << read_stream;
-  grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu);
+  grpc_core::MutexLock lock(gGlobalRunLoopContext->mu);
   CFReadStreamScheduleWithRunLoop(read_stream, gGlobalRunLoopContext->run_loop,
                                   kCFRunLoopDefaultMode);
   gGlobalRunLoopContext->input_source_registered = true;
@@ -123,7 +123,7 @@ static void grpc_apple_register_write_stream_run_loop(
     CFWriteStreamRef write_stream, dispatch_queue_t /*dispatch_queue*/) {
   GRPC_TRACE_VLOG(apple_polling, 2)
       << "(polling) Register write stream: " << write_stream;
-  grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu);
+  grpc_core::MutexLock lock(gGlobalRunLoopContext->mu);
   CFWriteStreamScheduleWithRunLoop(
       write_stream, gGlobalRunLoopContext->run_loop, kCFRunLoopDefaultMode);
   gGlobalRunLoopContext->input_source_registered = true;
@@ -183,7 +183,7 @@ static void pollset_global_init(void) {
   grpc_apple_register_write_stream_impl =
       grpc_apple_register_write_stream_run_loop;
 
-  grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu);
+  grpc_core::MutexLock lock(gGlobalRunLoopContext->mu);
   gGlobalRunLoopThread =
       new grpc_core::Thread("apple_ev", GlobalRunLoopFunc, nullptr);
   gGlobalRunLoopThread->Start();
@@ -193,7 +193,7 @@ static void pollset_global_init(void) {
 
 static void pollset_global_shutdown(void) {
   {
-    grpc_core::MutexLock lock(&gGlobalRunLoopContext->mu);
+    grpc_core::MutexLock lock(gGlobalRunLoopContext->mu);
     gGlobalRunLoopContext->is_shutdown = true;
     CFRunLoopStop(gGlobalRunLoopContext->run_loop);
   }

data/src/core/lib/iomgr/event_engine_shims/endpoint.cc

@@ -75,7 +75,7 @@ class EventEngineEndpointWrapper {
   }
 
   int Fd() {
-    grpc_core::MutexLock lock(&mu_);
+    grpc_core::MutexLock lock(mu_);
     return fd_;
   }
 
@@ -264,7 +264,7 @@ class EventEngineEndpointWrapper {
  private:
   void OnShutdownInternal() {
     {
-      grpc_core::MutexLock lock(&mu_);
+      grpc_core::MutexLock lock(mu_);
       fd_ = -1;
     }
     endpoint_.reset();

data/src/core/lib/iomgr/tcp_client_posix.cc

@@ -258,7 +258,7 @@ finish:
     int shard_number = ac->connection_handle % (*g_connection_shards).size();
     struct ConnectionShard* shard = &(*g_connection_shards)[shard_number];
     {
-      grpc_core::MutexLock lock(&shard->mu);
+      grpc_core::MutexLock lock(shard->mu);
       shard->pending_connections.erase(ac->connection_handle);
     }
   }
@@ -387,7 +387,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
   int shard_number = connection_id % (*g_connection_shards).size();
   struct ConnectionShard* shard = &(*g_connection_shards)[shard_number];
   {
-    grpc_core::MutexLock lock(&shard->mu);
+    grpc_core::MutexLock lock(shard->mu);
     shard->pending_connections.insert_or_assign(connection_id, ac);
   }
 
@@ -434,7 +434,7 @@ static bool tcp_cancel_connect(int64_t connection_handle) {
   struct ConnectionShard* shard = &(*g_connection_shards)[shard_number];
   async_connect* ac = nullptr;
   {
-    grpc_core::MutexLock lock(&shard->mu);
+    grpc_core::MutexLock lock(shard->mu);
     auto it = shard->pending_connections.find(connection_handle);
     if (it != shard->pending_connections.end()) {
       ac = it->second;

data/src/core/lib/iomgr/tcp_posix.cc

@@ -244,7 +244,7 @@ class TcpZerocopySendCtx {
   void NoteSend(TcpZerocopySendRecord* record) {
     record->Ref();
     {
-      MutexLock guard(&lock_);
+      MutexLock guard(lock_);
       is_in_write_ = true;
       AssociateSeqWithSendRecordLocked(last_send_, record);
     }
@@ -275,7 +275,7 @@ class TcpZerocopySendCtx {
 
   // Get a send record for a send that we wish to do with zerocopy.
   TcpZerocopySendRecord* GetSendRecord() {
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     return TryGetSendRecordLocked();
   }
 
@@ -289,7 +289,7 @@ class TcpZerocopySendCtx {
   // buffers for this sendmsg()) is received from the kernel - or, in case
   // sendmsg() was unsuccessful to begin with.
   TcpZerocopySendRecord* ReleaseSendRecord(uint32_t seq) {
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     return ReleaseSendRecordLocked(seq);
   }
 
@@ -300,7 +300,7 @@ class TcpZerocopySendCtx {
   void PutSendRecord(TcpZerocopySendRecord* record) {
     GRPC_DCHECK(record >= send_records_);
     GRPC_DCHECK(record < send_records_ + max_sends_);
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     PutSendRecordLocked(record);
   }
 
@@ -311,7 +311,7 @@ class TcpZerocopySendCtx {
   // Indicates that there are no inflight tcp_write() instances with zerocopy
   // enabled.
   bool AllSendRecordsEmpty() {
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     return free_send_records_size_ == max_sends_;
   }
 
@@ -351,7 +351,7 @@ class TcpZerocopySendCtx {
   // Please refer to the STATE TRANSITION DIAGRAM below for more details.
   //
   bool UpdateZeroCopyOMemStateAfterFree() {
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     if (is_in_write_) {
       zcopy_enobuf_state_ = OMemState::CHECK;
       return false;
@@ -391,7 +391,7 @@ class TcpZerocopySendCtx {
   // Please refer to the STATE TRANSITION DIAGRAM below for more details.
   //
   bool UpdateZeroCopyOMemStateAfterSend(bool seen_enobuf) {
-    MutexLock guard(&lock_);
+    MutexLock guard(lock_);
     is_in_write_ = false;
     if (seen_enobuf) {
       if (zcopy_enobuf_state_ == OMemState::CHECK) {

data/src/core/lib/promise/activity.cc

@@ -106,7 +106,7 @@ class FreestandingActivity::Handle final : public Wakeable {
   void Drop(WakeupMask) override { Unref(); }
 
   std::string ActivityDebugTag(WakeupMask) const override {
-    MutexLock lock(&mu_);
+    MutexLock lock(mu_);
     return activity_ == nullptr ? "<unknown>" : activity_->DebugTag();
   }
 

data/src/core/lib/promise/activity.h

@@ -533,7 +533,7 @@ class PromiseActivity final
     }
     bool was_done;
     {
-      MutexLock lock(mu());
+      MutexLock lock(*mu());
       // Check if we were done, and flag done.
       was_done = done_;
       if (!done_) {

data/src/core/lib/promise/arena_promise.h

@@ -187,8 +187,8 @@ struct ChooseImplForCallable;
 template <typename T, typename Callable>
 struct ChooseImplForCallable<
     T, Callable,
-    absl::enable_if_t<!std::is_empty<Callable>::value &&
-                      (sizeof(Callable) > sizeof(ArgType))>> {
+    std::enable_if_t<!std::is_empty<Callable>::value &&
+                     (sizeof(Callable) > sizeof(ArgType))>> {
   static void Make(Callable&& callable, VtableAndArg<T>* out) {
     out->vtable = &AllocatedCallable<T, Callable>::vtable;
     ArgAsPtr<Callable>(&out->arg) = GetContext<Arena>()->template New<Callable>(
@@ -199,8 +199,8 @@ struct ChooseImplForCallable<
 template <typename T, typename Callable>
 struct ChooseImplForCallable<
     T, Callable,
-    absl::enable_if_t<!std::is_empty<Callable>::value &&
-                      (sizeof(Callable) <= sizeof(ArgType))>> {
+    std::enable_if_t<!std::is_empty<Callable>::value &&
+                     (sizeof(Callable) <= sizeof(ArgType))>> {
   static void Make(Callable&& callable, VtableAndArg<T>* out) {
     out->vtable = &Inlined<T, Callable>::vtable;
     Construct(reinterpret_cast<Callable*>(&out->arg),
@@ -209,8 +209,8 @@ struct ChooseImplForCallable<
 };
 
 template <typename T, typename Callable>
-struct ChooseImplForCallable<
-    T, Callable, absl::enable_if_t<std::is_empty<Callable>::value>> {
+struct ChooseImplForCallable<T, Callable,
+                             std::enable_if_t<std::is_empty<Callable>::value>> {
   static void Make(Callable&&, VtableAndArg<T>* out) {
     out->vtable = &SharedCallable<T, Callable>::vtable;
   }
@@ -235,7 +235,7 @@ class ArenaPromise {
   // Construct an ArenaPromise that will call the given callable when polled.
   template <typename Callable,
             typename Ignored =
-                absl::enable_if_t<!std::is_same<Callable, ArenaPromise>::value>>
+                std::enable_if_t<!std::is_same<Callable, ArenaPromise>::value>>
   // NOLINTNEXTLINE(google-explicit-constructor)
   ArenaPromise(Callable&& callable) {
     arena_promise_detail::MakeImplForCallable(std::forward<Callable>(callable),

data/src/core/lib/promise/detail/promise_factory.h

@@ -127,8 +127,8 @@ struct OnceToken {};
 // capturing A.
 template <typename Token, typename A, typename F>
 GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION
-    absl::enable_if_t<!IsVoidCallable<ResultOf<F(A)>>::value,
-                      PromiseLike<Curried<RemoveCVRef<F>, A>>>
+    std::enable_if_t<!IsVoidCallable<ResultOf<F(A)>>::value,
+                     PromiseLike<Curried<RemoveCVRef<F>, A>>>
     PromiseFactoryImpl(Token, F&& f, A&& arg) {
   return PromiseLike<Curried<RemoveCVRef<F>, A>>(
       std::in_place,
@@ -142,7 +142,7 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION
 // Promote a callable() -> T|Poll<T> to a PromiseFactory(A) -> Promise<T>
 // by dropping the argument passed to the factory.
 template <typename A, typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     !IsVoidCallable<ResultOf<F()>>::value, PromiseLike<RemoveCVRef<F>>>
 PromiseFactoryImpl(OnceToken, F&& f, A&&) {
   return PromiseLike<F>(std::forward<RemoveCVRef<F>>(f));
@@ -150,7 +150,7 @@ PromiseFactoryImpl(OnceToken, F&& f, A&&) {
 
 // Promote a callable() -> Poll<T> to a PromiseFactory() -> Promise<T>
 template <typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     !IsVoidCallable<ResultOf<F()>>::value &&
         PollTraits<ResultOf<F()>>::is_poll(),
     PromiseLike<RemoveCVRef<F>>>
@@ -183,7 +183,7 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline auto PromiseFactoryImpl(
 
 // Given a callable(A) -> Promise<T>, name it a PromiseFactory and use it.
 template <typename Token, typename A, typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     IsVoidCallable<ResultOf<F(A)>>::value,
     PromiseLike<decltype(std::declval<F>()(std::declval<A>()))>>
 PromiseFactoryImpl(Token, F&& f, A&& arg) {
@@ -193,7 +193,7 @@ PromiseFactoryImpl(Token, F&& f, A&& arg) {
 
 // Given a callable(A) -> Promise<T>, name it a PromiseFactory and use it.
 template <typename Token, typename A, typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     IsVoidCallable<ResultOf<F(A)>>::value,
     PromiseLike<decltype(std::declval<F>()(std::declval<A>()))>>
 PromiseFactoryImpl(Token, F& f, A&& arg) {
@@ -204,7 +204,7 @@ PromiseFactoryImpl(Token, F& f, A&& arg) {
 // Given a callable() -> Promise<T>, promote it to a
 // PromiseFactory(A) -> Promise<T> by dropping the first argument.
 template <typename Token, typename A, typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     IsVoidCallable<ResultOf<F()>>::value,
     PromiseLike<decltype(std::declval<F>()())>>
 PromiseFactoryImpl(Token, F&& f, A&&) {
@@ -214,7 +214,7 @@ PromiseFactoryImpl(Token, F&& f, A&&) {
 
 // Given a callable() -> Promise<T>, name it a PromiseFactory and use it.
 template <typename Token, typename F>
-GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::enable_if_t<
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline std::enable_if_t<
     IsVoidCallable<ResultOf<F()>>::value,
     PromiseLike<decltype(std::declval<F>()())>>
 PromiseFactoryImpl(Token, F&& f) {

data/src/core/lib/promise/detail/promise_like.h

@@ -18,6 +18,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <cstddef>
+#include <type_traits>
 #include <utility>
 
 #include "src/core/channelz/property_list.h"
@@ -27,7 +28,6 @@
 #include "src/proto/grpc/channelz/v2/promise.upb.h"
 #include "src/proto/grpc/channelz/v2/promise.upbdefs.h"
 #include "upb/reflection/def.hpp"
-#include "absl/meta/type_traits.h"
 
 // A Promise is a callable object that returns Poll<T> for some T.
 // Often when we're writing code that uses promises, we end up wanting to also
@@ -192,7 +192,7 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline auto WrapInPoll(T&& x)
 
 // T -> T, const T& -> T
 template <typename T>
-using RemoveCVRef = absl::remove_cv_t<absl::remove_reference_t<T>>;
+using RemoveCVRef = std::remove_cv_t<std::remove_reference_t<T>>;
 
 template <typename F, typename SfinaeVoid = void>
 class PromiseLike;
@@ -202,7 +202,7 @@ class PromiseLike<void>;
 
 template <typename F>
 class PromiseLike<
-    F, absl::enable_if_t<!std::is_void<std::invoke_result_t<F>>::value>> {
+    F, std::enable_if_t<!std::is_void<std::invoke_result_t<F>>::value>> {
  private:
   GPR_NO_UNIQUE_ADDRESS RemoveCVRef<F> f_;
   using OriginalResult = decltype(f_());
@@ -241,7 +241,7 @@ class PromiseLike<
 
 template <typename F>
 class PromiseLike<
-    F, absl::enable_if_t<std::is_void<std::invoke_result_t<F>>::value>> {
+    F, std::enable_if_t<std::is_void<std::invoke_result_t<F>>::value>> {
  private:
   GPR_NO_UNIQUE_ADDRESS RemoveCVRef<F> f_;