grpc 1.82.2 → 1.83.0.pre1

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

@@ -54,9 +54,6 @@ const char* const additional_constraints_chaotic_good_send_supported_features =
 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_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
 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 = "{}";
@@ -92,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
@@ -109,9 +103,6 @@ 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_header_data_frame =
-    "Managing header and data memory better";
-const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
@@ -123,9 +114,6 @@ 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";
@@ -154,6 +142,10 @@ 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 = "{}";
@@ -245,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 "
@@ -287,6 +274,9 @@ 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 {
@@ -312,11 +302,9 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
+     true, true},
     {"custom_frame_check", description_custom_frame_check,
      additional_constraints_custom_frame_check, nullptr, 0, true, false},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, 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,
@@ -336,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,
@@ -352,8 +336,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
-    {"header_data_frame", description_header_data_frame,
-     additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
@@ -361,22 +343,18 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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, true, true},
+     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},
@@ -390,6 +368,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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},
@@ -398,7 +380,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"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, true, true},
+     nullptr, 0, false, true},
     {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
      nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
@@ -430,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,
@@ -452,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,
@@ -488,8 +466,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      false, true},
     {"xds_server_filter_chain_per_route",
      description_xds_server_filter_chain_per_route,
-     additional_constraints_xds_server_filter_chain_per_route, nullptr, 0,
-     false, true},
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core
@@ -527,9 +505,6 @@ const char* const additional_constraints_chaotic_good_send_supported_features =
 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_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
 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 = "{}";
@@ -565,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
@@ -582,9 +554,6 @@ 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_header_data_frame =
-    "Managing header and data memory better";
-const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
@@ -596,9 +565,6 @@ 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";
@@ -627,6 +593,10 @@ 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 = "{}";
@@ -718,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 "
@@ -760,6 +725,9 @@ 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 {
@@ -785,11 +753,9 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
+     true, true},
     {"custom_frame_check", description_custom_frame_check,
      additional_constraints_custom_frame_check, nullptr, 0, true, false},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, 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,
@@ -809,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,
@@ -825,8 +787,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
-    {"header_data_frame", description_header_data_frame,
-     additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
@@ -834,22 +794,18 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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, true, true},
+     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},
@@ -863,6 +819,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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},
@@ -871,7 +831,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"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, true, true},
+     nullptr, 0, false, true},
     {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
      nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
@@ -903,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,
@@ -925,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,
@@ -961,8 +917,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      false, true},
     {"xds_server_filter_chain_per_route",
      description_xds_server_filter_chain_per_route,
-     additional_constraints_xds_server_filter_chain_per_route, nullptr, 0,
-     false, true},
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core
@@ -1000,9 +956,6 @@ const char* const additional_constraints_chaotic_good_send_supported_features =
 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_error_flatten =
-    "Flatten errors to ordinary absl::Status form.";
-const char* const additional_constraints_error_flatten = "{}";
 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 = "{}";
@@ -1038,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
@@ -1055,9 +1005,6 @@ 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_header_data_frame =
-    "Managing header and data memory better";
-const char* const additional_constraints_header_data_frame = "{}";
 const char* const description_inproc_cancel_stream =
     "If set, cancel inproc stream inside the transport mutex.";
 const char* const additional_constraints_inproc_cancel_stream = "{}";
@@ -1069,9 +1016,6 @@ 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";
@@ -1100,6 +1044,10 @@ 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 = "{}";
@@ -1191,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 "
@@ -1233,6 +1176,9 @@ 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 {
@@ -1258,11 +1204,9 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"chaotic_good_send_supported_features",
      description_chaotic_good_send_supported_features,
      additional_constraints_chaotic_good_send_supported_features, nullptr, 0,
-     false, true},
+     true, true},
     {"custom_frame_check", description_custom_frame_check,
      additional_constraints_custom_frame_check, nullptr, 0, true, false},
-    {"error_flatten", description_error_flatten,
-     additional_constraints_error_flatten, 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,
@@ -1282,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,
@@ -1298,8 +1238,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_h2_max_deallocating_streams_headroom,
      additional_constraints_h2_max_deallocating_streams_headroom, nullptr, 0,
      false, true},
-    {"header_data_frame", description_header_data_frame,
-     additional_constraints_header_data_frame, nullptr, 0, true, true},
     {"inproc_cancel_stream", description_inproc_cancel_stream,
      additional_constraints_inproc_cancel_stream, nullptr, 0, true, true},
     {"keep_alive_ping_timer_batch", description_keep_alive_ping_timer_batch,
@@ -1307,22 +1245,18 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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, true, true},
+     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},
@@ -1336,6 +1270,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      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},
@@ -1344,7 +1282,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"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, true, true},
+     nullptr, 0, false, true},
     {"ph2_server", description_ph2_server, additional_constraints_ph2_server,
      nullptr, 0, false, true},
     {"pick_first_ignore_empty_updates",
@@ -1376,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,
@@ -1398,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,
@@ -1434,8 +1368,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      false, true},
     {"xds_server_filter_chain_per_route",
      description_xds_server_filter_chain_per_route,
-     additional_constraints_xds_server_filter_chain_per_route, nullptr, 0,
-     false, true},
+     additional_constraints_xds_server_filter_chain_per_route,
+     required_experiments_xds_server_filter_chain_per_route, 1, false, true},
 };
 
 }  // namespace grpc_core