grpc 1.70.1 → 1.71.0

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

@@ -61,54 +61,46 @@ namespace grpc_core {
 inline bool IsBackoffCapInitialAtMaxEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
 inline bool IsCallTracerInTransportEnabled() { return true; }
-inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; }
-inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS
-inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
-inline bool IsEventEngineCallbackCqEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_TRANSPORT_FIX
+inline bool IsCallTracerTransportFixEnabled() { return true; }
+inline bool IsCallv3ClientAuthFilterEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 inline bool IsEventEngineListenerEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
+inline bool IsEventEngineCallbackCqEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
+inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE
+inline bool IsMaxPingsWoDataThrottleEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPosixEeSkipGrpcInitEnabled() { return false; }
-inline bool IsPrioritizeFinishedRequestsEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 inline bool IsRqFastRejectEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER
+inline bool IsServerListenerEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY
-inline bool IsTimeCachingInPartyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
-inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
-inline bool IsWorkSerializerDispatchEnabled() { return true; }
-inline bool IsServerListenerEnabled() { return false; }
 
 #elif defined(GPR_WINDOWS)
 #define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX
 inline bool IsBackoffCapInitialAtMaxEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
 inline bool IsCallTracerInTransportEnabled() { return true; }
-inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; }
-inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS
-inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
-inline bool IsEventEngineCallbackCqEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_TRANSPORT_FIX
+inline bool IsCallTracerTransportFixEnabled() { return true; }
+inline bool IsCallv3ClientAuthFilterEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
@@ -116,44 +108,39 @@ inline bool IsEventEngineDnsEnabled() { return true; }
 inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
+inline bool IsEventEngineCallbackCqEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
+inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE
+inline bool IsMaxPingsWoDataThrottleEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPosixEeSkipGrpcInitEnabled() { return false; }
-inline bool IsPrioritizeFinishedRequestsEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 inline bool IsRqFastRejectEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER
+inline bool IsServerListenerEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY
-inline bool IsTimeCachingInPartyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
-inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
-inline bool IsWorkSerializerDispatchEnabled() { return true; }
-inline bool IsServerListenerEnabled() { return false; }
 
 #else
 #define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX
 inline bool IsBackoffCapInitialAtMaxEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
 inline bool IsCallTracerInTransportEnabled() { return true; }
-inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; }
-inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS
-inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
-inline bool IsEventEngineCallbackCqEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_TRANSPORT_FIX
+inline bool IsCallTracerTransportFixEnabled() { return true; }
+inline bool IsCallv3ClientAuthFilterEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
@@ -161,67 +148,61 @@ inline bool IsEventEngineDnsEnabled() { return true; }
 inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
+inline bool IsEventEngineCallbackCqEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
+inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE
+inline bool IsMaxPingsWoDataThrottleEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() { return true; }
 inline bool IsPosixEeSkipGrpcInitEnabled() { return false; }
-inline bool IsPrioritizeFinishedRequestsEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; }
 inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsRetryInCallv3Enabled() { return false; }
 inline bool IsRqFastRejectEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER
+inline bool IsServerListenerEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY
-inline bool IsTimeCachingInPartyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
-inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
-inline bool IsWorkSerializerDispatchEnabled() { return true; }
-inline bool IsServerListenerEnabled() { return false; }
 #endif
 
 #else
 enum ExperimentIds {
   kExperimentIdBackoffCapInitialAtMax,
   kExperimentIdCallTracerInTransport,
-  kExperimentIdChaoticGoodLegacyProtocol,
-  kExperimentIdDisableBufferHintOnHighMemoryPressure,
-  kExperimentIdEventEngineApplicationCallbacks,
-  kExperimentIdEventEngineCallbackCq,
+  kExperimentIdCallTracerTransportFix,
+  kExperimentIdCallv3ClientAuthFilter,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
   kExperimentIdEventEngineDnsNonClientChannel,
   kExperimentIdEventEngineListener,
+  kExperimentIdEventEngineCallbackCq,
   kExperimentIdFreeLargeAllocator,
+  kExperimentIdKeepAlivePingTimerBatch,
   kExperimentIdLocalConnectorSecure,
   kExperimentIdMaxPingsWoDataThrottle,
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
   kExperimentIdPickFirstNew,
   kExperimentIdPosixEeSkipGrpcInit,
-  kExperimentIdPrioritizeFinishedRequests,
   kExperimentIdPromiseBasedHttp2ClientTransport,
   kExperimentIdPromiseBasedHttp2ServerTransport,
   kExperimentIdPromiseBasedInprocTransport,
   kExperimentIdRetryInCallv3,
   kExperimentIdRqFastReject,
   kExperimentIdScheduleCancellationOverWrite,
+  kExperimentIdServerListener,
   kExperimentIdTcpFrameSizeTuning,
   kExperimentIdTcpRcvLowat,
-  kExperimentIdTimeCachingInParty,
-  kExperimentIdTraceRecordCallops,
   kExperimentIdUnconstrainedMaxQuotaBufferSize,
-  kExperimentIdWorkSerializerDispatch,
-  kExperimentIdServerListener,
   kNumExperiments
 };
 #define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX
@@ -232,22 +213,13 @@ inline bool IsBackoffCapInitialAtMaxEnabled() {
 inline bool IsCallTracerInTransportEnabled() {
   return IsExperimentEnabled<kExperimentIdCallTracerInTransport>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHAOTIC_GOOD_LEGACY_PROTOCOL
-inline bool IsChaoticGoodLegacyProtocolEnabled() {
-  return IsExperimentEnabled<kExperimentIdChaoticGoodLegacyProtocol>();
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_TRANSPORT_FIX
+inline bool IsCallTracerTransportFixEnabled() {
+  return IsExperimentEnabled<kExperimentIdCallTracerTransportFix>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_DISABLE_BUFFER_HINT_ON_HIGH_MEMORY_PRESSURE
-inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() {
-  return IsExperimentEnabled<
-      kExperimentIdDisableBufferHintOnHighMemoryPressure>();
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS
-inline bool IsEventEngineApplicationCallbacksEnabled() {
-  return IsExperimentEnabled<kExperimentIdEventEngineApplicationCallbacks>();
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
-inline bool IsEventEngineCallbackCqEnabled() {
-  return IsExperimentEnabled<kExperimentIdEventEngineCallbackCq>();
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALLV3_CLIENT_AUTH_FILTER
+inline bool IsCallv3ClientAuthFilterEnabled() {
+  return IsExperimentEnabled<kExperimentIdCallv3ClientAuthFilter>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
 inline bool IsEventEngineClientEnabled() {
@@ -265,10 +237,18 @@ inline bool IsEventEngineDnsNonClientChannelEnabled() {
 inline bool IsEventEngineListenerEnabled() {
   return IsExperimentEnabled<kExperimentIdEventEngineListener>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ
+inline bool IsEventEngineCallbackCqEnabled() {
+  return IsExperimentEnabled<kExperimentIdEventEngineCallbackCq>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR
 inline bool IsFreeLargeAllocatorEnabled() {
   return IsExperimentEnabled<kExperimentIdFreeLargeAllocator>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_KEEP_ALIVE_PING_TIMER_BATCH
+inline bool IsKeepAlivePingTimerBatchEnabled() {
+  return IsExperimentEnabled<kExperimentIdKeepAlivePingTimerBatch>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_LOCAL_CONNECTOR_SECURE
 inline bool IsLocalConnectorSecureEnabled() {
   return IsExperimentEnabled<kExperimentIdLocalConnectorSecure>();
@@ -293,10 +273,6 @@ inline bool IsPickFirstNewEnabled() {
 inline bool IsPosixEeSkipGrpcInitEnabled() {
   return IsExperimentEnabled<kExperimentIdPosixEeSkipGrpcInit>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PRIORITIZE_FINISHED_REQUESTS
-inline bool IsPrioritizeFinishedRequestsEnabled() {
-  return IsExperimentEnabled<kExperimentIdPrioritizeFinishedRequests>();
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_HTTP2_CLIENT_TRANSPORT
 inline bool IsPromiseBasedHttp2ClientTransportEnabled() {
   return IsExperimentEnabled<kExperimentIdPromiseBasedHttp2ClientTransport>();
@@ -321,6 +297,10 @@ inline bool IsRqFastRejectEnabled() {
 inline bool IsScheduleCancellationOverWriteEnabled() {
   return IsExperimentEnabled<kExperimentIdScheduleCancellationOverWrite>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER
+inline bool IsServerListenerEnabled() {
+  return IsExperimentEnabled<kExperimentIdServerListener>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING
 inline bool IsTcpFrameSizeTuningEnabled() {
   return IsExperimentEnabled<kExperimentIdTcpFrameSizeTuning>();
@@ -329,26 +309,10 @@ inline bool IsTcpFrameSizeTuningEnabled() {
 inline bool IsTcpRcvLowatEnabled() {
   return IsExperimentEnabled<kExperimentIdTcpRcvLowat>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TIME_CACHING_IN_PARTY
-inline bool IsTimeCachingInPartyEnabled() {
-  return IsExperimentEnabled<kExperimentIdTimeCachingInParty>();
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
-inline bool IsTraceRecordCallopsEnabled() {
-  return IsExperimentEnabled<kExperimentIdTraceRecordCallops>();
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
   return IsExperimentEnabled<kExperimentIdUnconstrainedMaxQuotaBufferSize>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
-inline bool IsWorkSerializerDispatchEnabled() {
-  return IsExperimentEnabled<kExperimentIdWorkSerializerDispatch>();
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER
-inline bool IsServerListenerEnabled() {
-  return IsExperimentEnabled<kExperimentIdServerListener>();
-}
 
 extern const ExperimentMetadata g_experiment_metadata[kNumExperiments];
 

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

@@ -22,7 +22,8 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
-#include "absl/types/optional.h"
+#include <optional>
+
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
@@ -32,52 +33,52 @@ namespace grpc_core {
 
 struct ConnectionMetrics {
   // Delivery rate in Bytes/s.
-  absl::optional<uint64_t> delivery_rate;
+  std::optional<uint64_t> delivery_rate;
   // If the delivery rate is limited by the application, this is set to true.
-  absl::optional<bool> is_delivery_rate_app_limited;
+  std::optional<bool> is_delivery_rate_app_limited;
   // Total packets retransmitted.
-  absl::optional<uint32_t> packet_retx;
+  std::optional<uint32_t> packet_retx;
   // Total packets retransmitted spuriously. This metric is smaller than or
   // equal to packet_retx.
-  absl::optional<uint32_t> packet_spurious_retx;
+  std::optional<uint32_t> packet_spurious_retx;
   // Total packets sent.
-  absl::optional<uint32_t> packet_sent;
+  std::optional<uint32_t> packet_sent;
   // Total packets delivered.
-  absl::optional<uint32_t> packet_delivered;
+  std::optional<uint32_t> packet_delivered;
   // Total packets delivered with ECE marked. This metric is smaller than or
   // equal to packet_delivered.
-  absl::optional<uint32_t> packet_delivered_ce;
+  std::optional<uint32_t> packet_delivered_ce;
   // Total bytes lost so far.
-  absl::optional<uint64_t> data_retx;
+  std::optional<uint64_t> data_retx;
   // Total bytes sent so far.
-  absl::optional<uint64_t> data_sent;
+  std::optional<uint64_t> data_sent;
   // Total bytes in write queue but not sent.
-  absl::optional<uint64_t> data_notsent;
+  std::optional<uint64_t> data_notsent;
   // Pacing rate of the connection in Bps
-  absl::optional<uint64_t> pacing_rate;
+  std::optional<uint64_t> pacing_rate;
   // Minimum RTT observed in usec.
-  absl::optional<uint32_t> min_rtt;
+  std::optional<uint32_t> min_rtt;
   // Smoothed RTT in usec
-  absl::optional<uint32_t> srtt;
+  std::optional<uint32_t> srtt;
   // Send congestion window.
-  absl::optional<uint32_t> congestion_window;
+  std::optional<uint32_t> congestion_window;
   // Slow start threshold in packets.
-  absl::optional<uint32_t> snd_ssthresh;
+  std::optional<uint32_t> snd_ssthresh;
   // Maximum degree of reordering (i.e., maximum number of packets reodered)
   // on the connection.
-  absl::optional<uint32_t> reordering;
+  std::optional<uint32_t> reordering;
   // Represents the number of recurring retransmissions of the first sequence
   // that is not acknowledged yet.
-  absl::optional<uint8_t> recurring_retrans;
+  std::optional<uint8_t> recurring_retrans;
   // The cumulative time (in usec) that the transport protocol was busy
   // sending data.
-  absl::optional<uint64_t> busy_usec;
+  std::optional<uint64_t> busy_usec;
   // The cumulative time (in usec) that the transport protocol was limited by
   // the receive window size.
-  absl::optional<uint64_t> rwnd_limited_usec;
+  std::optional<uint64_t> rwnd_limited_usec;
   // The cumulative time (in usec) that the transport protocol was limited by
   // the send buffer size.
-  absl::optional<uint64_t> sndbuf_limited_usec;
+  std::optional<uint64_t> sndbuf_limited_usec;
 };
 
 struct BufferTimestamp {

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

@@ -58,7 +58,6 @@ CFStreamHandle* CFStreamHandle::CreateStreamHandle(
 void CFStreamHandle::ReadCallback(CFReadStreamRef stream,
                                   CFStreamEventType type,
                                   void* client_callback_info) {
-  grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
   grpc_core::ExecCtx exec_ctx;
   grpc_error_handle error;
   CFErrorRef stream_error;
@@ -91,7 +90,6 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream,
 void CFStreamHandle::WriteCallback(CFWriteStreamRef stream,
                                    CFStreamEventType type,
                                    void* clientCallBackInfo) {
-  grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
   grpc_core::ExecCtx exec_ctx;
   grpc_error_handle error;
   CFErrorRef stream_error;

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

@@ -211,10 +211,7 @@ inline grpc_closure* grpc_closure_create(grpc_iomgr_cb_func cb, void* cb_arg) {
   grpc_closure_create(cb, cb_arg)
 #endif
 
-#define GRPC_CLOSURE_LIST_INIT \
-  {                            \
-    nullptr, nullptr           \
-  }
+#define GRPC_CLOSURE_LIST_INIT {nullptr, nullptr}
 
 inline void grpc_closure_list_init(grpc_closure_list* closure_list) {
   closure_list->head = closure_list->tail = nullptr;

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

@@ -160,7 +160,6 @@ static void queue_offload(grpc_core::Combiner* lock) {
   gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 1);
   GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " queue_offload";
   lock->event_engine->Run([lock] {
-    grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
     grpc_core::ExecCtx exec_ctx(0);
     push_last_on_exec_ctx(lock);
     exec_ctx.Flush();

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

@@ -120,7 +120,7 @@ grpc_error_handle grpc_error_set_int(grpc_error_handle src,
 
 bool grpc_error_get_int(grpc_error_handle error,
                         grpc_core::StatusIntProperty which, intptr_t* p) {
-  absl::optional<intptr_t> value = grpc_core::StatusGetInt(error, which);
+  std::optional<intptr_t> value = grpc_core::StatusGetInt(error, which);
   if (value.has_value()) {
     *p = *value;
     return true;
@@ -181,7 +181,7 @@ bool grpc_error_get_str(grpc_error_handle error,
       return true;
     }
   } else {
-    absl::optional<std::string> value = grpc_core::StatusGetStr(error, which);
+    std::optional<std::string> value = grpc_core::StatusGetStr(error, which);
     if (value.has_value()) {
       *s = std::move(*value);
       return true;

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

@@ -30,7 +30,6 @@ void RunEventEngineClosure(grpc_closure* closure, grpc_error_handle error) {
   if (closure == nullptr) {
     return;
   }
-  grpc_core::ApplicationCallbackExecCtx app_ctx;
   grpc_core::ExecCtx exec_ctx;
 #ifndef NDEBUG
   closure->scheduled = false;

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

@@ -132,7 +132,6 @@ class EventEngineEndpointWrapper {
     grpc_closure* cb = pending_read_cb_;
     pending_read_cb_ = nullptr;
     if (grpc_core::ExecCtx::Get() == nullptr) {
-      grpc_core::ApplicationCallbackExecCtx app_ctx;
       grpc_core::ExecCtx exec_ctx;
       grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, status);
     } else {
@@ -178,7 +177,6 @@ class EventEngineEndpointWrapper {
     grpc_closure* cb = pending_write_cb_;
     pending_write_cb_ = nullptr;
     if (grpc_core::ExecCtx::Get() == nullptr) {
-      grpc_core::ApplicationCallbackExecCtx app_ctx;
       grpc_core::ExecCtx exec_ctx;
       grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, status);
     } else {

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

@@ -53,7 +53,6 @@ int64_t event_engine_tcp_client_connect(
   EventEngine::ConnectionHandle handle = engine_ptr->Connect(
       [on_connect,
        endpoint](absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> ep) {
-        grpc_core::ApplicationCallbackExecCtx app_ctx;
         grpc_core::ExecCtx exec_ctx;
         absl::Status conn_status = ep.ok() ? absl::OkStatus() : ep.status();
         if (ep.ok()) {

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

@@ -54,18 +54,12 @@ namespace grpc_core {
 
 #if !defined(_WIN32) || !defined(_DLL)
 thread_local ExecCtx* ExecCtx::exec_ctx_;
-thread_local ApplicationCallbackExecCtx*
-    ApplicationCallbackExecCtx::callback_exec_ctx_;
-#else   // _WIN32
+#else  // _WIN32
 ExecCtx*& ExecCtx::exec_ctx() {
   static thread_local ExecCtx* exec_ctx;
   return exec_ctx;
 }
 
-ApplicationCallbackExecCtx*& ApplicationCallbackExecCtx::callback_exec_ctx() {
-  static thread_local ApplicationCallbackExecCtx* callback_exec_ctx;
-  return callback_exec_ctx;
-}
 #endif  // _WIN32
 
 bool ExecCtx::Flush() {

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

@@ -115,11 +115,6 @@ class GRPC_DLL ExecCtx : public latent_see::ParentScope {
   ExecCtx()
       : latent_see::ParentScope(GRPC_LATENT_SEE_METADATA("ExecCtx")),
         flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) {
-#if !TARGET_OS_IPHONE
-    if (!IsTimeCachingInPartyEnabled()) {
-      time_cache_.emplace();
-    }
-#endif
     Fork::IncExecCtxCount();
     Set(this);
   }
@@ -130,11 +125,6 @@ class GRPC_DLL ExecCtx : public latent_see::ParentScope {
 
   explicit ExecCtx(uintptr_t fl, latent_see::Metadata* latent_see_metadata)
       : latent_see::ParentScope(latent_see_metadata), flags_(fl) {
-#if !TARGET_OS_IPHONE
-    if (!IsTimeCachingInPartyEnabled()) {
-      time_cache_.emplace();
-    }
-#endif
     if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
       Fork::IncExecCtxCount();
     }
@@ -241,7 +231,7 @@ class GRPC_DLL ExecCtx : public latent_see::ParentScope {
   CombinerData combiner_data_ = {nullptr, nullptr};
   uintptr_t flags_;
 
-  absl::optional<ScopedTimeCache> time_cache_;
+  std::optional<ScopedTimeCache> time_cache_;
 
 #if !defined(_WIN32) || !defined(_DLL)
   static thread_local ExecCtx* exec_ctx_;
@@ -252,130 +242,9 @@ class GRPC_DLL ExecCtx : public latent_see::ParentScope {
   ExecCtx* last_exec_ctx_ = Get();
 };
 
-/// Application-callback execution context.
-/// A bag of data that collects information along a callstack.
-/// It is created on the stack at core entry points, and stored internally
-/// as a thread-local variable.
-///
-/// There are three key differences between this structure and ExecCtx:
-///   1. ApplicationCallbackExecCtx builds a list of application-level
-///      callbacks, but ExecCtx builds a list of internal callbacks to invoke.
-///   2. ApplicationCallbackExecCtx invokes its callbacks only at destruction;
-///      there is no explicit Flush method.
-///   3. If more than one ApplicationCallbackExecCtx is created on the thread's
-///      stack, only the one closest to the base of the stack is actually
-///      active and this is the only one that enqueues application callbacks.
-///      (Unlike ExecCtx, it is not feasible to prevent multiple of these on the
-///      stack since the executing application callback may itself enter core.
-///      However, the new one created will just pass callbacks through to the
-///      base one and those will not be executed until the return to the
-///      destructor of the base one, preventing unlimited stack growth.)
-///
-/// This structure exists because application callbacks may themselves cause a
-/// core re-entry (e.g., through a public API call) and if that call in turn
-/// causes another application-callback, there could be arbitrarily growing
-/// stacks of core re-entries. Instead, any application callbacks instead should
-/// not be invoked until other core work is done and other application callbacks
-/// have completed. To accomplish this, any application callback should be
-/// enqueued using ApplicationCallbackExecCtx::Enqueue .
-///
-/// CONVENTIONS:
-/// - Instances of this must ALWAYS be constructed on the stack, never
-///   heap allocated.
-/// - Instances of this are generally constructed before ExecCtx when needed.
-///   The only exception is for ExecCtx's that are explicitly flushed and
-///   that survive beyond the scope of the function that can cause application
-///   callbacks to be invoked (e.g., in the timer thread).
-///
-/// Generally, core entry points that may trigger application-level callbacks
-/// will have the following declarations:
-///
-/// ApplicationCallbackExecCtx callback_exec_ctx;
-/// ExecCtx exec_ctx;
-///
-/// This ordering is important to make sure that the ApplicationCallbackExecCtx
-/// is destroyed after the ExecCtx (to prevent the re-entry problem described
-/// above, as well as making sure that ExecCtx core callbacks are invoked first)
-///
-///
-
-class GRPC_DLL ApplicationCallbackExecCtx {
- public:
-  /// Default Constructor
-  ApplicationCallbackExecCtx() { Set(this, flags_); }
-
-  /// Parameterised Constructor
-  explicit ApplicationCallbackExecCtx(uintptr_t fl) : flags_(fl) {
-    Set(this, flags_);
-  }
-
-  ~ApplicationCallbackExecCtx() {
-    if (Get() == this) {
-      while (head_ != nullptr) {
-        auto* f = head_;
-        head_ = f->internal_next;
-        if (f->internal_next == nullptr) {
-          tail_ = nullptr;
-        }
-        (*f->functor_run)(f, f->internal_success);
-      }
-      CALLBACK_EXEC_CTX = nullptr;
-      if (!(GRPC_APP_CALLBACK_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
-        Fork::DecExecCtxCount();
-      }
-    } else {
-      DCHECK_EQ(head_, nullptr);
-      DCHECK_EQ(tail_, nullptr);
-    }
-  }
-
-  uintptr_t Flags() { return flags_; }
-
-  static ApplicationCallbackExecCtx* Get() { return CALLBACK_EXEC_CTX; }
-
-  static void Set(ApplicationCallbackExecCtx* exec_ctx, uintptr_t flags) {
-    if (Get() == nullptr) {
-      if (!(GRPC_APP_CALLBACK_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags)) {
-        Fork::IncExecCtxCount();
-      }
-      CALLBACK_EXEC_CTX = exec_ctx;
-    }
-  }
-
-  static void Enqueue(grpc_completion_queue_functor* functor, int is_success) {
-    functor->internal_success = is_success;
-    functor->internal_next = nullptr;
-
-    ApplicationCallbackExecCtx* ctx = Get();
-
-    if (ctx->head_ == nullptr) {
-      ctx->head_ = functor;
-    }
-    if (ctx->tail_ != nullptr) {
-      ctx->tail_->internal_next = functor;
-    }
-    ctx->tail_ = functor;
-  }
-
-  static bool Available() { return Get() != nullptr; }
-
- private:
-  uintptr_t flags_{0u};
-  grpc_completion_queue_functor* head_{nullptr};
-  grpc_completion_queue_functor* tail_{nullptr};
-
-#if !defined(_WIN32) || !defined(_DLL)
-  static thread_local ApplicationCallbackExecCtx* callback_exec_ctx_;
-#else
-  // cannot be thread_local data member (e.g. callback_exec_ctx_) on windows
-  static ApplicationCallbackExecCtx*& callback_exec_ctx();
-#endif
-};
-
 template <typename F>
 void EnsureRunInExecCtx(F f) {
   if (ExecCtx::Get() == nullptr) {
-    ApplicationCallbackExecCtx app_ctx;
     ExecCtx exec_ctx;
     f();
   } else {