grpc 1.81.1 → 1.83.0

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

@@ -41,6 +41,9 @@ const char* const
 const char* const
     additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation =
         "{}";
+const char* const description_callv3_batch_validation =
+    "If enabled, perform validations on receiving a new batch.";
+const char* const additional_constraints_callv3_batch_validation = "{}";
 const char* const description_chaotic_good_framing_layer =
     "Enable the chaotic good framing layer.";
 const char* const additional_constraints_chaotic_good_framing_layer = "{}";
@@ -48,9 +51,9 @@ const char* const description_chaotic_good_send_supported_features =
     "Send supported features in chaotic good settings frames.";
 const char* const additional_constraints_chaotic_good_send_supported_features =
     "{}";
-const char* const description_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
+const char* const description_custom_frame_check =
+    "Adding checks to custom HTTP2 frame.";
+const char* const additional_constraints_custom_frame_check = "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -86,9 +89,6 @@ const uint8_t required_experiments_event_engine_for_all_other_endpoints[] = {
     static_cast<uint8_t>(
         grpc_core::kExperimentIdEventEngineDnsNonClientChannel),
     static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
-const char* const description_event_engine_poller_for_python =
-    "Enable event engine poller in gRPC Python";
-const char* const additional_constraints_event_engine_poller_for_python = "{}";
 const char* const description_fail_recv_metadata_on_deadline_exceeded =
     "Fail recv initial metadata when the deadline is exceeded.";
 const char* const
@@ -103,6 +103,9 @@ const char* const description_h2_max_deallocating_streams_headroom =
     "Separate allocated max concurrent streams.";
 const char* const additional_constraints_h2_max_deallocating_streams_headroom =
     "{}";
+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_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -111,13 +114,17 @@ 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_max_inflight_pings_strict_limit =
-    "If set, the max inflight pings limit is strictly enforced.";
-const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
 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";
 const char* const additional_constraints_memory_optimization_02 = "{}";
+const char* const description_message_size_refactoring =
+    "Refactoring the message size config parsing.";
+const char* const additional_constraints_message_size_refactoring = "{}";
+const char* const description_metadata_outstanding_token_refactor =
+    "Refactor ClientInitialMetadataOutstandingToken.";
+const char* const additional_constraints_metadata_outstanding_token_refactor =
+    "{}";
 const char* const description_metadata_publish_to_app_tag =
     "Publish metadata to the app using the kPublishToApp metadata field.";
 const char* const additional_constraints_metadata_publish_to_app_tag = "{}";
@@ -131,12 +138,39 @@ const char* const description_optimization_01 = "Optimization";
 const char* const additional_constraints_optimization_01 = "{}";
 const char* const description_optimization_02 = "Optimization";
 const char* const additional_constraints_optimization_02 = "{}";
+const char* const description_optimization_03 = "Optimization";
+const char* const additional_constraints_optimization_03 = "{}";
+const char* const description_optimization_04 = "Optimization";
+const char* const additional_constraints_optimization_04 = "{}";
+const char* const description_optimization_05 = "Optimization";
+const char* const additional_constraints_optimization_05 = "{}";
+const char* const description_optimization_06 = "Optimization";
+const char* const additional_constraints_optimization_06 = "{}";
 const char* const description_otel_export_telemetry_domains =
     "Export telemetry domains in OpenTelemetry metrics.";
 const char* const additional_constraints_otel_export_telemetry_domains = "{}";
+const char* const description_ph2_client =
+    "Use promises for the http2 client transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test PH2 Client "
+    "with CHTTP2 Server.";
+const char* const additional_constraints_ph2_client = "{}";
+const char* const description_ph2_client_server =
+    "This is a combination of ph2_server and ph2_client experiments. When this "
+    "flag is enabled for the test suites, it would test PH2 Client with PH2 "
+    "Server. We will NEVER be rolling out this experiment, because the roll "
+    "out would be done using ph2_server and ph2_client. This experiment MUST "
+    "be deleted when either ph2_server or ph2_client experiments are deleted.";
+const char* const additional_constraints_ph2_client_server = "{}";
 const char* const description_ph2_perf_01 =
     "Different performance experiments for PH2 Transport";
 const char* const additional_constraints_ph2_perf_01 = "{}";
+const char* const description_ph2_server =
+    "Use promises for the http2 server transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test CHTTP2 "
+    "Client with PH2 Server.";
+const char* const additional_constraints_ph2_server = "{}";
 const char* const description_pick_first_ignore_empty_updates =
     "Ignore empty resolutions in pick_first (delete)";
 const char* const additional_constraints_pick_first_ignore_empty_updates = "{}";
@@ -157,18 +191,6 @@ const char* const description_prioritize_finished_requests =
     "Prioritize flushing out finished requests over other in-flight requests "
     "during transport writes.";
 const char* const additional_constraints_prioritize_finished_requests = "{}";
-const char* const description_promise_based_http2_client_transport =
-    "Use promises for the http2 client transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_client_transport =
-    "{}";
-const char* const description_promise_based_http2_server_transport =
-    "Use promises for the http2 server transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_server_transport =
-    "{}";
 const char* const description_promise_based_inproc_transport =
     "Use call-v3 for the in-process transport.";
 const char* const additional_constraints_promise_based_inproc_transport = "{}";
@@ -215,11 +237,6 @@ const char* const additional_constraints_skip_clear_peer_on_cancellation = "{}";
 const char* const description_subchannel_connection_scaling =
     "Subchannel connection scaling support.";
 const char* const additional_constraints_subchannel_connection_scaling = "{}";
-const char* const description_subchannel_wrapper_cleanup_on_orphan =
-    "Fixes the subchannel wrapper to drop any non-cancelled watchers when it "
-    "gets orphaned.";
-const char* const additional_constraints_subchannel_wrapper_cleanup_on_orphan =
-    "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -241,14 +258,25 @@ const char* const description_use_call_event_engine_in_completion_queue =
     "Use the call event engine to run callbacks in completion queue.";
 const char* const
     additional_constraints_use_call_event_engine_in_completion_queue = "{}";
+const char* const description_v2_non_owning_waker_implementation =
+    "Use non-owning wakers in v2 filter bridge.";
+const char* const additional_constraints_v2_non_owning_waker_implementation =
+    "{}";
+const char* const description_verbose_channelz_connection_logging =
+    "Verbose logging of events into channelz during connection setup.";
+const char* const additional_constraints_verbose_channelz_connection_logging =
+    "{}";
 const char* const description_wildcard_ip_expansion_restriction =
     "If set, adds optional restriction on when to expand wildcard IPs.";
 const char* const additional_constraints_wildcard_ip_expansion_restriction =
     "{}";
-const char* const description_xds_channel_filter_chain_per_route =
-    "xDS channels use a separate filter chain for each route.";
-const char* const additional_constraints_xds_channel_filter_chain_per_route =
+const char* const description_xds_server_filter_chain_per_route =
+    "xDS servers use a separate filter chain for each route.";
+const char* const additional_constraints_xds_server_filter_chain_per_route =
     "{}";
+const uint8_t required_experiments_xds_server_filter_chain_per_route[] = {
+    static_cast<uint8_t>(
+        grpc_core::kExperimentIdV2NonOwningWakerImplementation)};
 }  // namespace
 
 namespace grpc_core {
@@ -266,15 +294,17 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_tracer_send_trailing_metadata_is_an_annotation,
      additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation,
      nullptr, 0, false, true},
+    {"callv3_batch_validation", description_callv3_batch_validation,
+     additional_constraints_callv3_batch_validation, nullptr, 0, true, true},
     {"chaotic_good_framing_layer", description_chaotic_good_framing_layer,
      additional_constraints_chaotic_good_framing_layer, nullptr, 0, true,
      false},
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, nullptr, 0, true, false},
+     true, true},
+    {"custom_frame_check", description_custom_frame_check,
+     additional_constraints_custom_frame_check, nullptr, 0, true, false},
     {"event_engine_client", description_event_engine_client,
      additional_constraints_event_engine_client, nullptr, 0, true, false},
     {"event_engine_dns", description_event_engine_dns,
@@ -294,10 +324,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_event_engine_for_all_other_endpoints,
      additional_constraints_event_engine_for_all_other_endpoints,
      required_experiments_event_engine_for_all_other_endpoints, 4, true, false},
-    {"event_engine_poller_for_python",
-     description_event_engine_poller_for_python,
-     additional_constraints_event_engine_poller_for_python, nullptr, 0, true,
-     true},
     {"fail_recv_metadata_on_deadline_exceeded",
      description_fail_recv_metadata_on_deadline_exceeded,
      additional_constraints_fail_recv_metadata_on_deadline_exceeded, nullptr, 0,
@@ -310,35 +336,53 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
+    {"inproc_cancel_stream", description_inproc_cancel_stream,
+     additional_constraints_inproc_cancel_stream, nullptr, 0, true, 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},
-    {"max_inflight_pings_strict_limit",
-     description_max_inflight_pings_strict_limit,
-     additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,
-     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
      additional_constraints_memory_optimization_02, nullptr, 0, false, false},
+    {"message_size_refactoring", description_message_size_refactoring,
+     additional_constraints_message_size_refactoring, nullptr, 0, false, true},
+    {"metadata_outstanding_token_refactor",
+     description_metadata_outstanding_token_refactor,
+     additional_constraints_metadata_outstanding_token_refactor, nullptr, 0,
+     false, true},
     {"metadata_publish_to_app_tag", description_metadata_publish_to_app_tag,
-     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, true,
+     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, false,
      true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
     {"optimization_01", description_optimization_01,
-     additional_constraints_optimization_01, nullptr, 0, false, true},
+     additional_constraints_optimization_01, nullptr, 0, true, true},
     {"optimization_02", description_optimization_02,
-     additional_constraints_optimization_02, nullptr, 0, false, true},
+     additional_constraints_optimization_02, nullptr, 0, true, true},
+    {"optimization_03", description_optimization_03,
+     additional_constraints_optimization_03, nullptr, 0, true, true},
+    {"optimization_04", description_optimization_04,
+     additional_constraints_optimization_04, nullptr, 0, true, true},
+    {"optimization_05", description_optimization_05,
+     additional_constraints_optimization_05, nullptr, 0, false, true},
+    {"optimization_06", description_optimization_06,
+     additional_constraints_optimization_06, nullptr, 0, false, true},
     {"otel_export_telemetry_domains", description_otel_export_telemetry_domains,
      additional_constraints_otel_export_telemetry_domains, nullptr, 0, false,
      true},
+    {"ph2_client", description_ph2_client, additional_constraints_ph2_client,
+     nullptr, 0, false, true},
+    {"ph2_client_server", description_ph2_client_server,
+     additional_constraints_ph2_client_server, nullptr, 0, false, true},
     {"ph2_perf_01", description_ph2_perf_01, additional_constraints_ph2_perf_01,
      nullptr, 0, false, true},
+    {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
+     nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
      description_pick_first_ignore_empty_updates,
      additional_constraints_pick_first_ignore_empty_updates, nullptr, 0, false,
@@ -353,14 +397,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"prioritize_finished_requests", description_prioritize_finished_requests,
      additional_constraints_prioritize_finished_requests, nullptr, 0, false,
      true},
-    {"promise_based_http2_client_transport",
-     description_promise_based_http2_client_transport,
-     additional_constraints_promise_based_http2_client_transport, nullptr, 0,
-     false, true},
-    {"promise_based_http2_server_transport",
-     description_promise_based_http2_server_transport,
-     additional_constraints_promise_based_http2_server_transport, nullptr, 0,
-     false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
      additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
@@ -376,7 +412,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"retry_in_callv3", description_retry_in_callv3,
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
-     additional_constraints_return_preexisting_errors, nullptr, 0, false, true},
+     additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
@@ -398,12 +434,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_skip_clear_peer_on_cancellation, nullptr, 0, false,
      true},
     {"subchannel_connection_scaling", description_subchannel_connection_scaling,
-     additional_constraints_subchannel_connection_scaling, nullptr, 0, false,
+     additional_constraints_subchannel_connection_scaling, nullptr, 0, true,
      true},
-    {"subchannel_wrapper_cleanup_on_orphan",
-     description_subchannel_wrapper_cleanup_on_orphan,
-     additional_constraints_subchannel_wrapper_cleanup_on_orphan, nullptr, 0,
-     true, true},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
      additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
@@ -420,14 +452,22 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_use_call_event_engine_in_completion_queue,
      additional_constraints_use_call_event_engine_in_completion_queue, nullptr,
      0, false, true},
+    {"v2_non_owning_waker_implementation",
+     description_v2_non_owning_waker_implementation,
+     additional_constraints_v2_non_owning_waker_implementation, nullptr, 0,
+     false, true},
+    {"verbose_channelz_connection_logging",
+     description_verbose_channelz_connection_logging,
+     additional_constraints_verbose_channelz_connection_logging, nullptr, 0,
+     false, true},
     {"wildcard_ip_expansion_restriction",
      description_wildcard_ip_expansion_restriction,
      additional_constraints_wildcard_ip_expansion_restriction, nullptr, 0,
      false, true},
-    {"xds_channel_filter_chain_per_route",
-     description_xds_channel_filter_chain_per_route,
-     additional_constraints_xds_channel_filter_chain_per_route, nullptr, 0,
-     true, true},
+    {"xds_server_filter_chain_per_route",
+     description_xds_server_filter_chain_per_route,
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core
@@ -452,6 +492,9 @@ const char* const
 const char* const
     additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation =
         "{}";
+const char* const description_callv3_batch_validation =
+    "If enabled, perform validations on receiving a new batch.";
+const char* const additional_constraints_callv3_batch_validation = "{}";
 const char* const description_chaotic_good_framing_layer =
     "Enable the chaotic good framing layer.";
 const char* const additional_constraints_chaotic_good_framing_layer = "{}";
@@ -459,9 +502,9 @@ const char* const description_chaotic_good_send_supported_features =
     "Send supported features in chaotic good settings frames.";
 const char* const additional_constraints_chaotic_good_send_supported_features =
     "{}";
-const char* const description_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
+const char* const description_custom_frame_check =
+    "Adding checks to custom HTTP2 frame.";
+const char* const additional_constraints_custom_frame_check = "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -497,9 +540,6 @@ const uint8_t required_experiments_event_engine_for_all_other_endpoints[] = {
     static_cast<uint8_t>(
         grpc_core::kExperimentIdEventEngineDnsNonClientChannel),
     static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
-const char* const description_event_engine_poller_for_python =
-    "Enable event engine poller in gRPC Python";
-const char* const additional_constraints_event_engine_poller_for_python = "{}";
 const char* const description_fail_recv_metadata_on_deadline_exceeded =
     "Fail recv initial metadata when the deadline is exceeded.";
 const char* const
@@ -514,6 +554,9 @@ const char* const description_h2_max_deallocating_streams_headroom =
     "Separate allocated max concurrent streams.";
 const char* const additional_constraints_h2_max_deallocating_streams_headroom =
     "{}";
+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_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -522,13 +565,17 @@ 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_max_inflight_pings_strict_limit =
-    "If set, the max inflight pings limit is strictly enforced.";
-const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
 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";
 const char* const additional_constraints_memory_optimization_02 = "{}";
+const char* const description_message_size_refactoring =
+    "Refactoring the message size config parsing.";
+const char* const additional_constraints_message_size_refactoring = "{}";
+const char* const description_metadata_outstanding_token_refactor =
+    "Refactor ClientInitialMetadataOutstandingToken.";
+const char* const additional_constraints_metadata_outstanding_token_refactor =
+    "{}";
 const char* const description_metadata_publish_to_app_tag =
     "Publish metadata to the app using the kPublishToApp metadata field.";
 const char* const additional_constraints_metadata_publish_to_app_tag = "{}";
@@ -542,12 +589,39 @@ const char* const description_optimization_01 = "Optimization";
 const char* const additional_constraints_optimization_01 = "{}";
 const char* const description_optimization_02 = "Optimization";
 const char* const additional_constraints_optimization_02 = "{}";
+const char* const description_optimization_03 = "Optimization";
+const char* const additional_constraints_optimization_03 = "{}";
+const char* const description_optimization_04 = "Optimization";
+const char* const additional_constraints_optimization_04 = "{}";
+const char* const description_optimization_05 = "Optimization";
+const char* const additional_constraints_optimization_05 = "{}";
+const char* const description_optimization_06 = "Optimization";
+const char* const additional_constraints_optimization_06 = "{}";
 const char* const description_otel_export_telemetry_domains =
     "Export telemetry domains in OpenTelemetry metrics.";
 const char* const additional_constraints_otel_export_telemetry_domains = "{}";
+const char* const description_ph2_client =
+    "Use promises for the http2 client transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test PH2 Client "
+    "with CHTTP2 Server.";
+const char* const additional_constraints_ph2_client = "{}";
+const char* const description_ph2_client_server =
+    "This is a combination of ph2_server and ph2_client experiments. When this "
+    "flag is enabled for the test suites, it would test PH2 Client with PH2 "
+    "Server. We will NEVER be rolling out this experiment, because the roll "
+    "out would be done using ph2_server and ph2_client. This experiment MUST "
+    "be deleted when either ph2_server or ph2_client experiments are deleted.";
+const char* const additional_constraints_ph2_client_server = "{}";
 const char* const description_ph2_perf_01 =
     "Different performance experiments for PH2 Transport";
 const char* const additional_constraints_ph2_perf_01 = "{}";
+const char* const description_ph2_server =
+    "Use promises for the http2 server transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test CHTTP2 "
+    "Client with PH2 Server.";
+const char* const additional_constraints_ph2_server = "{}";
 const char* const description_pick_first_ignore_empty_updates =
     "Ignore empty resolutions in pick_first (delete)";
 const char* const additional_constraints_pick_first_ignore_empty_updates = "{}";
@@ -568,18 +642,6 @@ const char* const description_prioritize_finished_requests =
     "Prioritize flushing out finished requests over other in-flight requests "
     "during transport writes.";
 const char* const additional_constraints_prioritize_finished_requests = "{}";
-const char* const description_promise_based_http2_client_transport =
-    "Use promises for the http2 client transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_client_transport =
-    "{}";
-const char* const description_promise_based_http2_server_transport =
-    "Use promises for the http2 server transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_server_transport =
-    "{}";
 const char* const description_promise_based_inproc_transport =
     "Use call-v3 for the in-process transport.";
 const char* const additional_constraints_promise_based_inproc_transport = "{}";
@@ -626,11 +688,6 @@ const char* const additional_constraints_skip_clear_peer_on_cancellation = "{}";
 const char* const description_subchannel_connection_scaling =
     "Subchannel connection scaling support.";
 const char* const additional_constraints_subchannel_connection_scaling = "{}";
-const char* const description_subchannel_wrapper_cleanup_on_orphan =
-    "Fixes the subchannel wrapper to drop any non-cancelled watchers when it "
-    "gets orphaned.";
-const char* const additional_constraints_subchannel_wrapper_cleanup_on_orphan =
-    "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -652,14 +709,25 @@ const char* const description_use_call_event_engine_in_completion_queue =
     "Use the call event engine to run callbacks in completion queue.";
 const char* const
     additional_constraints_use_call_event_engine_in_completion_queue = "{}";
+const char* const description_v2_non_owning_waker_implementation =
+    "Use non-owning wakers in v2 filter bridge.";
+const char* const additional_constraints_v2_non_owning_waker_implementation =
+    "{}";
+const char* const description_verbose_channelz_connection_logging =
+    "Verbose logging of events into channelz during connection setup.";
+const char* const additional_constraints_verbose_channelz_connection_logging =
+    "{}";
 const char* const description_wildcard_ip_expansion_restriction =
     "If set, adds optional restriction on when to expand wildcard IPs.";
 const char* const additional_constraints_wildcard_ip_expansion_restriction =
     "{}";
-const char* const description_xds_channel_filter_chain_per_route =
-    "xDS channels use a separate filter chain for each route.";
-const char* const additional_constraints_xds_channel_filter_chain_per_route =
+const char* const description_xds_server_filter_chain_per_route =
+    "xDS servers use a separate filter chain for each route.";
+const char* const additional_constraints_xds_server_filter_chain_per_route =
     "{}";
+const uint8_t required_experiments_xds_server_filter_chain_per_route[] = {
+    static_cast<uint8_t>(
+        grpc_core::kExperimentIdV2NonOwningWakerImplementation)};
 }  // namespace
 
 namespace grpc_core {
@@ -677,15 +745,17 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_tracer_send_trailing_metadata_is_an_annotation,
      additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation,
      nullptr, 0, false, true},
+    {"callv3_batch_validation", description_callv3_batch_validation,
+     additional_constraints_callv3_batch_validation, nullptr, 0, true, true},
     {"chaotic_good_framing_layer", description_chaotic_good_framing_layer,
      additional_constraints_chaotic_good_framing_layer, nullptr, 0, true,
      false},
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, nullptr, 0, true, false},
+     true, true},
+    {"custom_frame_check", description_custom_frame_check,
+     additional_constraints_custom_frame_check, nullptr, 0, true, false},
     {"event_engine_client", description_event_engine_client,
      additional_constraints_event_engine_client, nullptr, 0, true, false},
     {"event_engine_dns", description_event_engine_dns,
@@ -705,10 +775,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_event_engine_for_all_other_endpoints,
      additional_constraints_event_engine_for_all_other_endpoints,
      required_experiments_event_engine_for_all_other_endpoints, 4, true, false},
-    {"event_engine_poller_for_python",
-     description_event_engine_poller_for_python,
-     additional_constraints_event_engine_poller_for_python, nullptr, 0, true,
-     true},
     {"fail_recv_metadata_on_deadline_exceeded",
      description_fail_recv_metadata_on_deadline_exceeded,
      additional_constraints_fail_recv_metadata_on_deadline_exceeded, nullptr, 0,
@@ -721,35 +787,53 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
+    {"inproc_cancel_stream", description_inproc_cancel_stream,
+     additional_constraints_inproc_cancel_stream, nullptr, 0, true, 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},
-    {"max_inflight_pings_strict_limit",
-     description_max_inflight_pings_strict_limit,
-     additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,
-     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
      additional_constraints_memory_optimization_02, nullptr, 0, false, false},
+    {"message_size_refactoring", description_message_size_refactoring,
+     additional_constraints_message_size_refactoring, nullptr, 0, false, true},
+    {"metadata_outstanding_token_refactor",
+     description_metadata_outstanding_token_refactor,
+     additional_constraints_metadata_outstanding_token_refactor, nullptr, 0,
+     false, true},
     {"metadata_publish_to_app_tag", description_metadata_publish_to_app_tag,
-     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, true,
+     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, false,
      true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
     {"optimization_01", description_optimization_01,
-     additional_constraints_optimization_01, nullptr, 0, false, true},
+     additional_constraints_optimization_01, nullptr, 0, true, true},
     {"optimization_02", description_optimization_02,
-     additional_constraints_optimization_02, nullptr, 0, false, true},
+     additional_constraints_optimization_02, nullptr, 0, true, true},
+    {"optimization_03", description_optimization_03,
+     additional_constraints_optimization_03, nullptr, 0, true, true},
+    {"optimization_04", description_optimization_04,
+     additional_constraints_optimization_04, nullptr, 0, true, true},
+    {"optimization_05", description_optimization_05,
+     additional_constraints_optimization_05, nullptr, 0, false, true},
+    {"optimization_06", description_optimization_06,
+     additional_constraints_optimization_06, nullptr, 0, false, true},
     {"otel_export_telemetry_domains", description_otel_export_telemetry_domains,
      additional_constraints_otel_export_telemetry_domains, nullptr, 0, false,
      true},
+    {"ph2_client", description_ph2_client, additional_constraints_ph2_client,
+     nullptr, 0, false, true},
+    {"ph2_client_server", description_ph2_client_server,
+     additional_constraints_ph2_client_server, nullptr, 0, false, true},
     {"ph2_perf_01", description_ph2_perf_01, additional_constraints_ph2_perf_01,
      nullptr, 0, false, true},
+    {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
+     nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
      description_pick_first_ignore_empty_updates,
      additional_constraints_pick_first_ignore_empty_updates, nullptr, 0, false,
@@ -764,14 +848,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"prioritize_finished_requests", description_prioritize_finished_requests,
      additional_constraints_prioritize_finished_requests, nullptr, 0, false,
      true},
-    {"promise_based_http2_client_transport",
-     description_promise_based_http2_client_transport,
-     additional_constraints_promise_based_http2_client_transport, nullptr, 0,
-     false, true},
-    {"promise_based_http2_server_transport",
-     description_promise_based_http2_server_transport,
-     additional_constraints_promise_based_http2_server_transport, nullptr, 0,
-     false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
      additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
@@ -787,7 +863,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"retry_in_callv3", description_retry_in_callv3,
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
-     additional_constraints_return_preexisting_errors, nullptr, 0, false, true},
+     additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
@@ -809,12 +885,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_skip_clear_peer_on_cancellation, nullptr, 0, false,
      true},
     {"subchannel_connection_scaling", description_subchannel_connection_scaling,
-     additional_constraints_subchannel_connection_scaling, nullptr, 0, false,
+     additional_constraints_subchannel_connection_scaling, nullptr, 0, true,
      true},
-    {"subchannel_wrapper_cleanup_on_orphan",
-     description_subchannel_wrapper_cleanup_on_orphan,
-     additional_constraints_subchannel_wrapper_cleanup_on_orphan, nullptr, 0,
-     true, true},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
      additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
@@ -831,14 +903,22 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_use_call_event_engine_in_completion_queue,
      additional_constraints_use_call_event_engine_in_completion_queue, nullptr,
      0, false, true},
+    {"v2_non_owning_waker_implementation",
+     description_v2_non_owning_waker_implementation,
+     additional_constraints_v2_non_owning_waker_implementation, nullptr, 0,
+     false, true},
+    {"verbose_channelz_connection_logging",
+     description_verbose_channelz_connection_logging,
+     additional_constraints_verbose_channelz_connection_logging, nullptr, 0,
+     false, true},
     {"wildcard_ip_expansion_restriction",
      description_wildcard_ip_expansion_restriction,
      additional_constraints_wildcard_ip_expansion_restriction, nullptr, 0,
      false, true},
-    {"xds_channel_filter_chain_per_route",
-     description_xds_channel_filter_chain_per_route,
-     additional_constraints_xds_channel_filter_chain_per_route, nullptr, 0,
-     true, true},
+    {"xds_server_filter_chain_per_route",
+     description_xds_server_filter_chain_per_route,
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core
@@ -863,6 +943,9 @@ const char* const
 const char* const
     additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation =
         "{}";
+const char* const description_callv3_batch_validation =
+    "If enabled, perform validations on receiving a new batch.";
+const char* const additional_constraints_callv3_batch_validation = "{}";
 const char* const description_chaotic_good_framing_layer =
     "Enable the chaotic good framing layer.";
 const char* const additional_constraints_chaotic_good_framing_layer = "{}";
@@ -870,9 +953,9 @@ const char* const description_chaotic_good_send_supported_features =
     "Send supported features in chaotic good settings frames.";
 const char* const additional_constraints_chaotic_good_send_supported_features =
     "{}";
-const char* const description_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
+const char* const description_custom_frame_check =
+    "Adding checks to custom HTTP2 frame.";
+const char* const additional_constraints_custom_frame_check = "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -908,9 +991,6 @@ const uint8_t required_experiments_event_engine_for_all_other_endpoints[] = {
     static_cast<uint8_t>(
         grpc_core::kExperimentIdEventEngineDnsNonClientChannel),
     static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
-const char* const description_event_engine_poller_for_python =
-    "Enable event engine poller in gRPC Python";
-const char* const additional_constraints_event_engine_poller_for_python = "{}";
 const char* const description_fail_recv_metadata_on_deadline_exceeded =
     "Fail recv initial metadata when the deadline is exceeded.";
 const char* const
@@ -925,6 +1005,9 @@ const char* const description_h2_max_deallocating_streams_headroom =
     "Separate allocated max concurrent streams.";
 const char* const additional_constraints_h2_max_deallocating_streams_headroom =
     "{}";
+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_keep_alive_ping_timer_batch =
     "Avoid explicitly cancelling the keepalive timer. Instead adjust the "
     "callback to re-schedule itself to the next ping interval.";
@@ -933,13 +1016,17 @@ 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_max_inflight_pings_strict_limit =
-    "If set, the max inflight pings limit is strictly enforced.";
-const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
 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";
 const char* const additional_constraints_memory_optimization_02 = "{}";
+const char* const description_message_size_refactoring =
+    "Refactoring the message size config parsing.";
+const char* const additional_constraints_message_size_refactoring = "{}";
+const char* const description_metadata_outstanding_token_refactor =
+    "Refactor ClientInitialMetadataOutstandingToken.";
+const char* const additional_constraints_metadata_outstanding_token_refactor =
+    "{}";
 const char* const description_metadata_publish_to_app_tag =
     "Publish metadata to the app using the kPublishToApp metadata field.";
 const char* const additional_constraints_metadata_publish_to_app_tag = "{}";
@@ -953,12 +1040,39 @@ const char* const description_optimization_01 = "Optimization";
 const char* const additional_constraints_optimization_01 = "{}";
 const char* const description_optimization_02 = "Optimization";
 const char* const additional_constraints_optimization_02 = "{}";
+const char* const description_optimization_03 = "Optimization";
+const char* const additional_constraints_optimization_03 = "{}";
+const char* const description_optimization_04 = "Optimization";
+const char* const additional_constraints_optimization_04 = "{}";
+const char* const description_optimization_05 = "Optimization";
+const char* const additional_constraints_optimization_05 = "{}";
+const char* const description_optimization_06 = "Optimization";
+const char* const additional_constraints_optimization_06 = "{}";
 const char* const description_otel_export_telemetry_domains =
     "Export telemetry domains in OpenTelemetry metrics.";
 const char* const additional_constraints_otel_export_telemetry_domains = "{}";
+const char* const description_ph2_client =
+    "Use promises for the http2 client transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test PH2 Client "
+    "with CHTTP2 Server.";
+const char* const additional_constraints_ph2_client = "{}";
+const char* const description_ph2_client_server =
+    "This is a combination of ph2_server and ph2_client experiments. When this "
+    "flag is enabled for the test suites, it would test PH2 Client with PH2 "
+    "Server. We will NEVER be rolling out this experiment, because the roll "
+    "out would be done using ph2_server and ph2_client. This experiment MUST "
+    "be deleted when either ph2_server or ph2_client experiments are deleted.";
+const char* const additional_constraints_ph2_client_server = "{}";
 const char* const description_ph2_perf_01 =
     "Different performance experiments for PH2 Transport";
 const char* const additional_constraints_ph2_perf_01 = "{}";
+const char* const description_ph2_server =
+    "Use promises for the http2 server transport. We have kept client and "
+    "server transport experiments separate to help with smoother roll outs. "
+    "When this flag is enabled for the test suites, it would test CHTTP2 "
+    "Client with PH2 Server.";
+const char* const additional_constraints_ph2_server = "{}";
 const char* const description_pick_first_ignore_empty_updates =
     "Ignore empty resolutions in pick_first (delete)";
 const char* const additional_constraints_pick_first_ignore_empty_updates = "{}";
@@ -979,18 +1093,6 @@ const char* const description_prioritize_finished_requests =
     "Prioritize flushing out finished requests over other in-flight requests "
     "during transport writes.";
 const char* const additional_constraints_prioritize_finished_requests = "{}";
-const char* const description_promise_based_http2_client_transport =
-    "Use promises for the http2 client transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_client_transport =
-    "{}";
-const char* const description_promise_based_http2_server_transport =
-    "Use promises for the http2 server transport. We have kept client and "
-    "server transport experiments separate to help with smoother roll outs and "
-    "also help with interop testing.";
-const char* const additional_constraints_promise_based_http2_server_transport =
-    "{}";
 const char* const description_promise_based_inproc_transport =
     "Use call-v3 for the in-process transport.";
 const char* const additional_constraints_promise_based_inproc_transport = "{}";
@@ -1037,11 +1139,6 @@ const char* const additional_constraints_skip_clear_peer_on_cancellation = "{}";
 const char* const description_subchannel_connection_scaling =
     "Subchannel connection scaling support.";
 const char* const additional_constraints_subchannel_connection_scaling = "{}";
-const char* const description_subchannel_wrapper_cleanup_on_orphan =
-    "Fixes the subchannel wrapper to drop any non-cancelled watchers when it "
-    "gets orphaned.";
-const char* const additional_constraints_subchannel_wrapper_cleanup_on_orphan =
-    "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -1063,14 +1160,25 @@ const char* const description_use_call_event_engine_in_completion_queue =
     "Use the call event engine to run callbacks in completion queue.";
 const char* const
     additional_constraints_use_call_event_engine_in_completion_queue = "{}";
+const char* const description_v2_non_owning_waker_implementation =
+    "Use non-owning wakers in v2 filter bridge.";
+const char* const additional_constraints_v2_non_owning_waker_implementation =
+    "{}";
+const char* const description_verbose_channelz_connection_logging =
+    "Verbose logging of events into channelz during connection setup.";
+const char* const additional_constraints_verbose_channelz_connection_logging =
+    "{}";
 const char* const description_wildcard_ip_expansion_restriction =
     "If set, adds optional restriction on when to expand wildcard IPs.";
 const char* const additional_constraints_wildcard_ip_expansion_restriction =
     "{}";
-const char* const description_xds_channel_filter_chain_per_route =
-    "xDS channels use a separate filter chain for each route.";
-const char* const additional_constraints_xds_channel_filter_chain_per_route =
+const char* const description_xds_server_filter_chain_per_route =
+    "xDS servers use a separate filter chain for each route.";
+const char* const additional_constraints_xds_server_filter_chain_per_route =
     "{}";
+const uint8_t required_experiments_xds_server_filter_chain_per_route[] = {
+    static_cast<uint8_t>(
+        grpc_core::kExperimentIdV2NonOwningWakerImplementation)};
 }  // namespace
 
 namespace grpc_core {
@@ -1088,15 +1196,17 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_tracer_send_trailing_metadata_is_an_annotation,
      additional_constraints_call_tracer_send_trailing_metadata_is_an_annotation,
      nullptr, 0, false, true},
+    {"callv3_batch_validation", description_callv3_batch_validation,
+     additional_constraints_callv3_batch_validation, nullptr, 0, true, true},
     {"chaotic_good_framing_layer", description_chaotic_good_framing_layer,
      additional_constraints_chaotic_good_framing_layer, nullptr, 0, true,
      false},
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, nullptr, 0, true, false},
+     true, true},
+    {"custom_frame_check", description_custom_frame_check,
+     additional_constraints_custom_frame_check, nullptr, 0, true, false},
     {"event_engine_client", description_event_engine_client,
      additional_constraints_event_engine_client, nullptr, 0, true, false},
     {"event_engine_dns", description_event_engine_dns,
@@ -1116,10 +1226,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_event_engine_for_all_other_endpoints,
      additional_constraints_event_engine_for_all_other_endpoints,
      required_experiments_event_engine_for_all_other_endpoints, 4, true, false},
-    {"event_engine_poller_for_python",
-     description_event_engine_poller_for_python,
-     additional_constraints_event_engine_poller_for_python, nullptr, 0, true,
-     true},
     {"fail_recv_metadata_on_deadline_exceeded",
      description_fail_recv_metadata_on_deadline_exceeded,
      additional_constraints_fail_recv_metadata_on_deadline_exceeded, nullptr, 0,
@@ -1132,35 +1238,53 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
+    {"inproc_cancel_stream", description_inproc_cancel_stream,
+     additional_constraints_inproc_cancel_stream, nullptr, 0, true, 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},
-    {"max_inflight_pings_strict_limit",
-     description_max_inflight_pings_strict_limit,
-     additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,
-     true},
     {"memory_optimization_01", description_memory_optimization_01,
      additional_constraints_memory_optimization_01, nullptr, 0, false, false},
     {"memory_optimization_02", description_memory_optimization_02,
      additional_constraints_memory_optimization_02, nullptr, 0, false, false},
+    {"message_size_refactoring", description_message_size_refactoring,
+     additional_constraints_message_size_refactoring, nullptr, 0, false, true},
+    {"metadata_outstanding_token_refactor",
+     description_metadata_outstanding_token_refactor,
+     additional_constraints_metadata_outstanding_token_refactor, nullptr, 0,
+     false, true},
     {"metadata_publish_to_app_tag", description_metadata_publish_to_app_tag,
-     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, true,
+     additional_constraints_metadata_publish_to_app_tag, nullptr, 0, false,
      true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
     {"optimization_01", description_optimization_01,
-     additional_constraints_optimization_01, nullptr, 0, false, true},
+     additional_constraints_optimization_01, nullptr, 0, true, true},
     {"optimization_02", description_optimization_02,
-     additional_constraints_optimization_02, nullptr, 0, false, true},
+     additional_constraints_optimization_02, nullptr, 0, true, true},
+    {"optimization_03", description_optimization_03,
+     additional_constraints_optimization_03, nullptr, 0, true, true},
+    {"optimization_04", description_optimization_04,
+     additional_constraints_optimization_04, nullptr, 0, true, true},
+    {"optimization_05", description_optimization_05,
+     additional_constraints_optimization_05, nullptr, 0, false, true},
+    {"optimization_06", description_optimization_06,
+     additional_constraints_optimization_06, nullptr, 0, false, true},
     {"otel_export_telemetry_domains", description_otel_export_telemetry_domains,
      additional_constraints_otel_export_telemetry_domains, nullptr, 0, false,
      true},
+    {"ph2_client", description_ph2_client, additional_constraints_ph2_client,
+     nullptr, 0, false, true},
+    {"ph2_client_server", description_ph2_client_server,
+     additional_constraints_ph2_client_server, nullptr, 0, false, true},
     {"ph2_perf_01", description_ph2_perf_01, additional_constraints_ph2_perf_01,
      nullptr, 0, false, true},
+    {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
+     nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
      description_pick_first_ignore_empty_updates,
      additional_constraints_pick_first_ignore_empty_updates, nullptr, 0, false,
@@ -1175,14 +1299,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"prioritize_finished_requests", description_prioritize_finished_requests,
      additional_constraints_prioritize_finished_requests, nullptr, 0, false,
      true},
-    {"promise_based_http2_client_transport",
-     description_promise_based_http2_client_transport,
-     additional_constraints_promise_based_http2_client_transport, nullptr, 0,
-     false, true},
-    {"promise_based_http2_server_transport",
-     description_promise_based_http2_server_transport,
-     additional_constraints_promise_based_http2_server_transport, nullptr, 0,
-     false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
      additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
@@ -1198,7 +1314,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"retry_in_callv3", description_retry_in_callv3,
      additional_constraints_retry_in_callv3, nullptr, 0, false, true},
     {"return_preexisting_errors", description_return_preexisting_errors,
-     additional_constraints_return_preexisting_errors, nullptr, 0, false, true},
+     additional_constraints_return_preexisting_errors, nullptr, 0, true, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
      additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
@@ -1220,12 +1336,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_skip_clear_peer_on_cancellation, nullptr, 0, false,
      true},
     {"subchannel_connection_scaling", description_subchannel_connection_scaling,
-     additional_constraints_subchannel_connection_scaling, nullptr, 0, false,
+     additional_constraints_subchannel_connection_scaling, nullptr, 0, true,
      true},
-    {"subchannel_wrapper_cleanup_on_orphan",
-     description_subchannel_wrapper_cleanup_on_orphan,
-     additional_constraints_subchannel_wrapper_cleanup_on_orphan, nullptr, 0,
-     true, true},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
      additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
@@ -1242,14 +1354,22 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_use_call_event_engine_in_completion_queue,
      additional_constraints_use_call_event_engine_in_completion_queue, nullptr,
      0, false, true},
+    {"v2_non_owning_waker_implementation",
+     description_v2_non_owning_waker_implementation,
+     additional_constraints_v2_non_owning_waker_implementation, nullptr, 0,
+     false, true},
+    {"verbose_channelz_connection_logging",
+     description_verbose_channelz_connection_logging,
+     additional_constraints_verbose_channelz_connection_logging, nullptr, 0,
+     false, true},
     {"wildcard_ip_expansion_restriction",
      description_wildcard_ip_expansion_restriction,
      additional_constraints_wildcard_ip_expansion_restriction, nullptr, 0,
      false, true},
-    {"xds_channel_filter_chain_per_route",
-     description_xds_channel_filter_chain_per_route,
-     additional_constraints_xds_channel_filter_chain_per_route, nullptr, 0,
-     true, true},
+    {"xds_server_filter_chain_per_route",
+     description_xds_server_filter_chain_per_route,
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core