grpc 1.58.3 → 1.59.0

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

@@ -15,6 +15,8 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_APPLE
+#include <AvailabilityMacros.h>
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include "absl/strings/str_format.h"
 
@@ -144,17 +146,22 @@ void DNSServiceResolverImpl::ResolveCallback(
   grpc_core::ReleasableMutexLock lock(&that->request_mu_);
   auto request_it = that->requests_.find(sdRef);
   GPR_ASSERT(request_it != that->requests_.end());
-  auto& request = request_it->second;
 
   if (errorCode != kDNSServiceErr_NoError &&
       errorCode != kDNSServiceErr_NoSuchRecord) {
+    // extrace request and release lock before calling on_resolve
+    auto request_node = that->requests_.extract(request_it);
+    lock.Release();
+
+    auto& request = request_node.mapped();
     request.on_resolve(absl::UnknownError(absl::StrFormat(
         "address lookup failed for %s: errorCode: %d", hostname, errorCode)));
-    that->requests_.erase(request_it);
     DNSServiceRefDeallocate(sdRef);
     return;
   }
 
+  auto& request = request_it->second;
+
   // set received ipv4 or ipv6 response, even for kDNSServiceErr_NoSuchRecord to
   // mark that the response for the stack is received, it is possible that the
   // one stack receives some results and the other stack gets
@@ -192,13 +199,17 @@ void DNSServiceResolverImpl::ResolveCallback(
   // with the collected results.
   if (!(flags & kDNSServiceFlagsMoreComing) && request.has_ipv4_response &&
       request.has_ipv6_response) {
+    // extrace request and release lock before calling on_resolve
+    auto request_node = that->requests_.extract(request_it);
+    lock.Release();
+
+    auto& request = request_node.mapped();
     if (request.result.empty()) {
       request.on_resolve(absl::NotFoundError(absl::StrFormat(
           "address lookup failed for %s: Domain name not found", hostname)));
     } else {
       request.on_resolve(std::move(request.result));
     }
-    that->requests_.erase(request_it);
     DNSServiceRefDeallocate(sdRef);
   }
 }
@@ -226,4 +237,5 @@ void DNSServiceResolverImpl::Shutdown() {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
+#endif  // AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #endif  // GPR_APPLE

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

@@ -16,6 +16,8 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_APPLE
+#include <AvailabilityMacros.h>
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <dns_sd.h>
@@ -112,6 +114,7 @@ class DNSServiceResolver : public EventEngine::DNSResolver {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
+#endif  // AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #endif  // GPR_APPLE
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_CF_ENGINE_DNS_SERVICE_RESOLVER_H

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

@@ -749,7 +749,7 @@ absl::StatusOr<PosixSocketWrapper> PosixSocketWrapper::CreateDualStackSocket(
     }
     // If this isn't an IPv4 address, then return whatever we've got.
     if (!ResolvedAddressIsV4Mapped(addr, nullptr)) {
-      if (newfd <= 0) {
+      if (newfd < 0) {
         return ErrorForFd(newfd, addr);
       }
       dsmode = PosixSocketWrapper::DSMode::DSMODE_IPV6;

data/src/core/lib/event_engine/thread_pool/thread_count.h

@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <cstddef>
+#include <cstdint>
 #include <numeric>
 #include <utility>
 #include <vector>
@@ -88,9 +89,23 @@ class BusyThreadCount {
   size_t NextIndex() { return next_idx_.fetch_add(1) % shards_.size(); }
 
  private:
+// We want to ensure that this data structure lands on different cachelines per
+// cpu. With C++17 we can do so explicitly with an `alignas` specifier. Prior
+// versions we can at best approximate it by padding the structure. It'll
+// probably work out ok, but it's not guaranteed across allocators.
+// TODO(ctiller): When we move to C++17 delete the duplicate definition.
+#if __cplusplus >= 201703L
   struct ShardedData {
     std::atomic<size_t> busy_count{0};
   } GPR_ALIGN_STRUCT(GPR_CACHELINE_SIZE);
+#else
+  struct ShardedDataHeader {
+    std::atomic<size_t> busy_count{0};
+  };
+  struct ShardedData : public ShardedDataHeader {
+    uint8_t padding[GPR_CACHELINE_SIZE - sizeof(ShardedDataHeader)];
+  };
+#endif
 
   std::vector<ShardedData> shards_;
   std::atomic<size_t> next_idx_{0};

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

@@ -19,28 +19,16 @@
 
 #include <grpc/support/cpu.h>
 
-#include "src/core/lib/event_engine/thread_pool/original_thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
-#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gpr/useful.h"
 
 namespace grpc_event_engine {
 namespace experimental {
 
-std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads) {
-// TODO(hork): remove when the listener flake is identified
-#ifdef GPR_WINDOWS
-  if (grpc_core::IsEventEngineListenerEnabled()) {
-    return std::make_shared<WorkStealingThreadPool>(
-        grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
-  }
-#endif
-  if (grpc_core::IsWorkStealingEnabled()) {
-    return std::make_shared<WorkStealingThreadPool>(
-        grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
-  }
-  return std::make_shared<OriginalThreadPool>(reserve_threads);
+std::shared_ptr<ThreadPool> MakeThreadPool(size_t /* reserve_threads */) {
+  return std::make_shared<WorkStealingThreadPool>(
+      grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
 }
 
 }  // namespace experimental

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

@@ -23,6 +23,7 @@
 #include <inttypes.h>
 
 #include <atomic>
+#include <chrono>
 #include <memory>
 #include <utility>
 
@@ -86,10 +87,15 @@ namespace grpc_event_engine {
 namespace experimental {
 
 namespace {
+// TODO(ctiller): grpc_core::Timestamp, Duration have very specific contracts
+// around time caching and around when the underlying gpr_now call can be
+// substituted out.
+// We should probably move all usage here to std::chrono to avoid weird bugs in
+// the future.
+
 // Maximum amount of time an extra thread is allowed to idle before being
 // reclaimed.
-constexpr grpc_core::Duration kIdleThreadLimit =
-    grpc_core::Duration::Seconds(20);
+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.
@@ -424,7 +430,7 @@ bool WorkStealingThreadPool::ThreadState::Step() {
   // * the global queue is empty
   // * the steal pool returns nullptr
   bool should_run_again = false;
-  grpc_core::Timestamp start_time{grpc_core::Timestamp::Now()};
+  auto start_time = std::chrono::steady_clock::now();
   // Wait until work is available or until shut down.
   while (!pool_->IsForking()) {
     // Pull from the global queue next
@@ -452,7 +458,7 @@ bool WorkStealingThreadPool::ThreadState::Step() {
     // has been idle long enough.
     if (timed_out &&
         pool_->living_thread_count()->count() > pool_->reserve_threads() &&
-        grpc_core::Timestamp::Now() - start_time > kIdleThreadLimit) {
+        std::chrono::steady_clock::now() - start_time > kIdleThreadLimit) {
       return false;
     }
   }

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

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <map>
 #include <string>
 #include <utility>
 
@@ -166,11 +167,18 @@ bool IsTestExperimentEnabled(size_t experiment_id) {
 
 void PrintExperimentsList() {
   size_t max_experiment_length = 0;
+  // Populate visitation order into a std::map so that iteration results in a
+  // lexical ordering of experiment names.
+  // The lexical ordering makes it nice and easy to find the experiment you're
+  // looking for in the output spam that we generate.
+  std::map<absl::string_view, size_t> visitation_order;
   for (size_t i = 0; i < kNumExperiments; i++) {
     max_experiment_length =
         std::max(max_experiment_length, strlen(g_experiment_metadata[i].name));
+    visitation_order[g_experiment_metadata[i].name] = i;
   }
-  for (size_t i = 0; i < kNumExperiments; i++) {
+  for (auto name_index : visitation_order) {
+    const size_t i = name_index.second;
     gpr_log(
         GPR_DEBUG, "%s",
         absl::StrCat(

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

@@ -60,11 +60,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_transport_supplies_client_latency =
-    "If set, use the transport represented value for client latency in "
-    "opencensus";
-const char* const additional_constraints_transport_supplies_client_latency =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -78,9 +73,6 @@ const char* const additional_constraints_trace_record_callops = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_work_stealing =
-    "If set, use a work stealing thread pool implementation in EventEngine";
-const char* const additional_constraints_work_stealing = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
 const char* const description_canary_client_privacy =
@@ -88,11 +80,6 @@ const char* const description_canary_client_privacy =
 const char* const additional_constraints_canary_client_privacy = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_unique_metadata_strings =
-    "Ensure a unique copy of strings from parsed metadata are taken. The "
-    "hypothesis here is that ref counting these are causing read buffer "
-    "lifetimes to be extended leading to memory bloat.";
-const char* const additional_constraints_unique_metadata_strings = "{}";
 const char* const description_keepalive_fix =
     "Allows overriding keepalive_permit_without_calls. Refer "
     "https://github.com/grpc/grpc/pull/33428 for more information.";
@@ -101,6 +88,37 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
+const char* const description_work_serializer_dispatch =
+    "Have the work serializer dispatch work to event engine for every "
+    "callback, instead of running things inline in the first thread that "
+    "successfully enqueues work.";
+const char* const additional_constraints_work_serializer_dispatch = "{}";
+const char* const description_lazier_stream_updates =
+    "Allow streams to consume up to 50% of the incoming window before we force "
+    "send a flow control update.";
+const char* const additional_constraints_lazier_stream_updates = "{}";
+const char* const description_jitter_max_idle =
+    "Enable jitter on connection max idle times. Historically this jitter was "
+    "only on max connection age, but it seems like this could smooth out some "
+    "herding problems.";
+const char* const additional_constraints_jitter_max_idle = "{}";
+const char* const description_round_robin_delegate_to_pick_first =
+    "Change round_robin code to delegate to pick_first as per dualstack "
+    "backend design.";
+const char* const additional_constraints_round_robin_delegate_to_pick_first =
+    "{}";
+const char* const description_wrr_delegate_to_pick_first =
+    "Change WRR code to delegate to pick_first as per dualstack backend "
+    "design.";
+const char* const additional_constraints_wrr_delegate_to_pick_first = "{}";
+const char* const description_combiner_offload_to_event_engine =
+    "Offload Combiner work onto the EventEngine instead of the Executor.";
+const char* const additional_constraints_combiner_offload_to_event_engine =
+    "{}";
+const char* const description_registered_method_lookup_in_transport =
+    "Change registered method's lookup point to transport";
+const char* const additional_constraints_registered_method_lookup_in_transport =
+    "{}";
 }  // namespace
 
 namespace grpc_core {
@@ -127,9 +145,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_free_large_allocator, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, false, true},
-    {"transport_supplies_client_latency",
-     description_transport_supplies_client_latency,
-     additional_constraints_transport_supplies_client_latency, false, true},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, false, true},
     {"schedule_cancellation_over_write",
@@ -139,20 +154,33 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_trace_record_callops, false, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, false, false},
-    {"work_stealing", description_work_stealing,
-     additional_constraints_work_stealing, false, false},
     {"client_privacy", description_client_privacy,
      additional_constraints_client_privacy, false, false},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, false, false},
     {"server_privacy", description_server_privacy,
      additional_constraints_server_privacy, false, false},
-    {"unique_metadata_strings", description_unique_metadata_strings,
-     additional_constraints_unique_metadata_strings, true, true},
     {"keepalive_fix", description_keepalive_fix,
      additional_constraints_keepalive_fix, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, false, false},
+    {"work_serializer_dispatch", description_work_serializer_dispatch,
+     additional_constraints_work_serializer_dispatch, false, true},
+    {"lazier_stream_updates", description_lazier_stream_updates,
+     additional_constraints_lazier_stream_updates, true, true},
+    {"jitter_max_idle", description_jitter_max_idle,
+     additional_constraints_jitter_max_idle, true, true},
+    {"round_robin_delegate_to_pick_first",
+     description_round_robin_delegate_to_pick_first,
+     additional_constraints_round_robin_delegate_to_pick_first, true, true},
+    {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
+     additional_constraints_wrr_delegate_to_pick_first, true, true},
+    {"combiner_offload_to_event_engine",
+     description_combiner_offload_to_event_engine,
+     additional_constraints_combiner_offload_to_event_engine, true, true},
+    {"registered_method_lookup_in_transport",
+     description_registered_method_lookup_in_transport,
+     additional_constraints_registered_method_lookup_in_transport, true, true},
 };
 
 }  // namespace grpc_core
@@ -197,11 +225,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_transport_supplies_client_latency =
-    "If set, use the transport represented value for client latency in "
-    "opencensus";
-const char* const additional_constraints_transport_supplies_client_latency =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -215,9 +238,6 @@ const char* const additional_constraints_trace_record_callops = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_work_stealing =
-    "If set, use a work stealing thread pool implementation in EventEngine";
-const char* const additional_constraints_work_stealing = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
 const char* const description_canary_client_privacy =
@@ -225,11 +245,6 @@ const char* const description_canary_client_privacy =
 const char* const additional_constraints_canary_client_privacy = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_unique_metadata_strings =
-    "Ensure a unique copy of strings from parsed metadata are taken. The "
-    "hypothesis here is that ref counting these are causing read buffer "
-    "lifetimes to be extended leading to memory bloat.";
-const char* const additional_constraints_unique_metadata_strings = "{}";
 const char* const description_keepalive_fix =
     "Allows overriding keepalive_permit_without_calls. Refer "
     "https://github.com/grpc/grpc/pull/33428 for more information.";
@@ -238,6 +253,37 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
+const char* const description_work_serializer_dispatch =
+    "Have the work serializer dispatch work to event engine for every "
+    "callback, instead of running things inline in the first thread that "
+    "successfully enqueues work.";
+const char* const additional_constraints_work_serializer_dispatch = "{}";
+const char* const description_lazier_stream_updates =
+    "Allow streams to consume up to 50% of the incoming window before we force "
+    "send a flow control update.";
+const char* const additional_constraints_lazier_stream_updates = "{}";
+const char* const description_jitter_max_idle =
+    "Enable jitter on connection max idle times. Historically this jitter was "
+    "only on max connection age, but it seems like this could smooth out some "
+    "herding problems.";
+const char* const additional_constraints_jitter_max_idle = "{}";
+const char* const description_round_robin_delegate_to_pick_first =
+    "Change round_robin code to delegate to pick_first as per dualstack "
+    "backend design.";
+const char* const additional_constraints_round_robin_delegate_to_pick_first =
+    "{}";
+const char* const description_wrr_delegate_to_pick_first =
+    "Change WRR code to delegate to pick_first as per dualstack backend "
+    "design.";
+const char* const additional_constraints_wrr_delegate_to_pick_first = "{}";
+const char* const description_combiner_offload_to_event_engine =
+    "Offload Combiner work onto the EventEngine instead of the Executor.";
+const char* const additional_constraints_combiner_offload_to_event_engine =
+    "{}";
+const char* const description_registered_method_lookup_in_transport =
+    "Change registered method's lookup point to transport";
+const char* const additional_constraints_registered_method_lookup_in_transport =
+    "{}";
 }  // namespace
 
 namespace grpc_core {
@@ -264,9 +310,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_free_large_allocator, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, false, true},
-    {"transport_supplies_client_latency",
-     description_transport_supplies_client_latency,
-     additional_constraints_transport_supplies_client_latency, false, true},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, false, true},
     {"schedule_cancellation_over_write",
@@ -276,20 +319,33 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_trace_record_callops, false, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, false, false},
-    {"work_stealing", description_work_stealing,
-     additional_constraints_work_stealing, false, false},
     {"client_privacy", description_client_privacy,
      additional_constraints_client_privacy, false, false},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, false, false},
     {"server_privacy", description_server_privacy,
      additional_constraints_server_privacy, false, false},
-    {"unique_metadata_strings", description_unique_metadata_strings,
-     additional_constraints_unique_metadata_strings, true, true},
     {"keepalive_fix", description_keepalive_fix,
      additional_constraints_keepalive_fix, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, false, false},
+    {"work_serializer_dispatch", description_work_serializer_dispatch,
+     additional_constraints_work_serializer_dispatch, false, true},
+    {"lazier_stream_updates", description_lazier_stream_updates,
+     additional_constraints_lazier_stream_updates, true, true},
+    {"jitter_max_idle", description_jitter_max_idle,
+     additional_constraints_jitter_max_idle, true, true},
+    {"round_robin_delegate_to_pick_first",
+     description_round_robin_delegate_to_pick_first,
+     additional_constraints_round_robin_delegate_to_pick_first, true, true},
+    {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
+     additional_constraints_wrr_delegate_to_pick_first, true, true},
+    {"combiner_offload_to_event_engine",
+     description_combiner_offload_to_event_engine,
+     additional_constraints_combiner_offload_to_event_engine, true, true},
+    {"registered_method_lookup_in_transport",
+     description_registered_method_lookup_in_transport,
+     additional_constraints_registered_method_lookup_in_transport, true, true},
 };
 
 }  // namespace grpc_core
@@ -334,11 +390,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_transport_supplies_client_latency =
-    "If set, use the transport represented value for client latency in "
-    "opencensus";
-const char* const additional_constraints_transport_supplies_client_latency =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -352,9 +403,6 @@ const char* const additional_constraints_trace_record_callops = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_work_stealing =
-    "If set, use a work stealing thread pool implementation in EventEngine";
-const char* const additional_constraints_work_stealing = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
 const char* const description_canary_client_privacy =
@@ -362,11 +410,6 @@ const char* const description_canary_client_privacy =
 const char* const additional_constraints_canary_client_privacy = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_unique_metadata_strings =
-    "Ensure a unique copy of strings from parsed metadata are taken. The "
-    "hypothesis here is that ref counting these are causing read buffer "
-    "lifetimes to be extended leading to memory bloat.";
-const char* const additional_constraints_unique_metadata_strings = "{}";
 const char* const description_keepalive_fix =
     "Allows overriding keepalive_permit_without_calls. Refer "
     "https://github.com/grpc/grpc/pull/33428 for more information.";
@@ -375,6 +418,37 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
+const char* const description_work_serializer_dispatch =
+    "Have the work serializer dispatch work to event engine for every "
+    "callback, instead of running things inline in the first thread that "
+    "successfully enqueues work.";
+const char* const additional_constraints_work_serializer_dispatch = "{}";
+const char* const description_lazier_stream_updates =
+    "Allow streams to consume up to 50% of the incoming window before we force "
+    "send a flow control update.";
+const char* const additional_constraints_lazier_stream_updates = "{}";
+const char* const description_jitter_max_idle =
+    "Enable jitter on connection max idle times. Historically this jitter was "
+    "only on max connection age, but it seems like this could smooth out some "
+    "herding problems.";
+const char* const additional_constraints_jitter_max_idle = "{}";
+const char* const description_round_robin_delegate_to_pick_first =
+    "Change round_robin code to delegate to pick_first as per dualstack "
+    "backend design.";
+const char* const additional_constraints_round_robin_delegate_to_pick_first =
+    "{}";
+const char* const description_wrr_delegate_to_pick_first =
+    "Change WRR code to delegate to pick_first as per dualstack backend "
+    "design.";
+const char* const additional_constraints_wrr_delegate_to_pick_first = "{}";
+const char* const description_combiner_offload_to_event_engine =
+    "Offload Combiner work onto the EventEngine instead of the Executor.";
+const char* const additional_constraints_combiner_offload_to_event_engine =
+    "{}";
+const char* const description_registered_method_lookup_in_transport =
+    "Change registered method's lookup point to transport";
+const char* const additional_constraints_registered_method_lookup_in_transport =
+    "{}";
 }  // namespace
 
 namespace grpc_core {
@@ -401,9 +475,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_free_large_allocator, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, false, true},
-    {"transport_supplies_client_latency",
-     description_transport_supplies_client_latency,
-     additional_constraints_transport_supplies_client_latency, false, true},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, false, true},
     {"schedule_cancellation_over_write",
@@ -413,20 +484,33 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_trace_record_callops, false, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, false, false},
-    {"work_stealing", description_work_stealing,
-     additional_constraints_work_stealing, false, false},
     {"client_privacy", description_client_privacy,
      additional_constraints_client_privacy, false, false},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, false, false},
     {"server_privacy", description_server_privacy,
      additional_constraints_server_privacy, false, false},
-    {"unique_metadata_strings", description_unique_metadata_strings,
-     additional_constraints_unique_metadata_strings, true, true},
     {"keepalive_fix", description_keepalive_fix,
      additional_constraints_keepalive_fix, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, false, false},
+    {"work_serializer_dispatch", description_work_serializer_dispatch,
+     additional_constraints_work_serializer_dispatch, false, true},
+    {"lazier_stream_updates", description_lazier_stream_updates,
+     additional_constraints_lazier_stream_updates, true, true},
+    {"jitter_max_idle", description_jitter_max_idle,
+     additional_constraints_jitter_max_idle, true, true},
+    {"round_robin_delegate_to_pick_first",
+     description_round_robin_delegate_to_pick_first,
+     additional_constraints_round_robin_delegate_to_pick_first, true, true},
+    {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
+     additional_constraints_wrr_delegate_to_pick_first, true, true},
+    {"combiner_offload_to_event_engine",
+     description_combiner_offload_to_event_engine,
+     additional_constraints_combiner_offload_to_event_engine, true, true},
+    {"registered_method_lookup_in_transport",
+     description_registered_method_lookup_in_transport,
+     additional_constraints_registered_method_lookup_in_transport, true, true},
 };
 
 }  // namespace grpc_core