From e3da1e7ab689c698331c19f83047b1b9cda1bc16 Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 11 Jun 2024 09:26:35 -0700
Subject: [PATCH] [EventEngine] Enable Windows EventEngine client (#36876)

Reattempt enabling the Windows EventEngine client experiment, after fixing a race condition in connection establishment vs timeout.

Closes #36876

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36876 from drfloob:wineec 125f3a20d80bcdbd1f61bd473b92aaace261430c
PiperOrigin-RevId: 642294760
---
 bazel/experiments.bzl                   | 10 ++++------
 src/core/lib/experiments/experiments.cc |  2 +-
 src/core/lib/experiments/experiments.h  |  3 ++-
 src/core/lib/experiments/rollouts.yaml  |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index ff0dc8cef75..9aeb2fc360d 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -55,16 +55,10 @@ EXPERIMENTS = {
         "dbg": {
         },
         "off": {
-            "core_end2end_test": [
-                "event_engine_client",
-            ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
             ],
-            "event_engine_client_test": [
-                "event_engine_client",
-            ],
             "flow_control_test": [
                 "multiping",
                 "peer_state_based_framing",
@@ -82,11 +76,15 @@ EXPERIMENTS = {
                 "event_engine_dns",
             ],
             "core_end2end_test": [
+                "event_engine_client",
                 "event_engine_listener",
             ],
             "cpp_lb_end2end_test": [
                 "pick_first_new",
             ],
+            "event_engine_client_test": [
+                "event_engine_client",
+            ],
             "event_engine_listener_test": [
                 "event_engine_listener",
             ],
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index de736b7674c..deec6512339 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -295,7 +295,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"client_privacy", description_client_privacy,
      additional_constraints_client_privacy, nullptr, 0, false, false},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, nullptr, 0, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
     {"event_engine_listener", description_event_engine_listener,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index d5a42419fb8..5811fe2e7dd 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -94,7 +94,8 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; }
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 inline bool IsClientPrivacyEnabled() { return false; }
-inline bool IsEventEngineClientEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
+inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index fe679a5718e..05438ce6f90 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -58,7 +58,7 @@
     # not tested on iOS at all
     ios: broken
     posix: false
-    windows: false
+    windows: true
 - name: event_engine_dns
   default:
     # not tested on iOS at all