From fd5f761456a7d1ec2f0d77a81d1ebc11a14805b8 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 30 Apr 2024 20:39:04 +0000
Subject: [PATCH] x

---
 bazel/experiments.bzl                     | 18 ------------------
 src/core/lib/experiments/experiments.yaml |  2 +-
 src/core/lib/surface/call.cc              |  9 +++++++--
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index e366840a1e6..679b754b05d 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -62,9 +62,6 @@ EXPERIMENTS = {
             "core_end2end_test": [
                 "promise_based_server_call",
             ],
-            "cpp_end2end_test": [
-                "promise_based_server_call",
-            ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -83,9 +80,6 @@ EXPERIMENTS = {
                 "free_large_allocator",
                 "unconstrained_max_quota_buffer_size",
             ],
-            "xds_end2end_test": [
-                "promise_based_server_call",
-            ],
         },
         "on": {
             "core_end2end_test": [
@@ -112,9 +106,6 @@ EXPERIMENTS = {
             "core_end2end_test": [
                 "promise_based_server_call",
             ],
-            "cpp_end2end_test": [
-                "promise_based_server_call",
-            ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -133,9 +124,6 @@ EXPERIMENTS = {
                 "free_large_allocator",
                 "unconstrained_max_quota_buffer_size",
             ],
-            "xds_end2end_test": [
-                "promise_based_server_call",
-            ],
         },
         "on": {
             "cpp_lb_end2end_test": [
@@ -159,9 +147,6 @@ EXPERIMENTS = {
                 "promise_based_client_call",
                 "promise_based_server_call",
             ],
-            "cpp_end2end_test": [
-                "promise_based_server_call",
-            ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -186,9 +171,6 @@ EXPERIMENTS = {
                 "free_large_allocator",
                 "unconstrained_max_quota_buffer_size",
             ],
-            "xds_end2end_test": [
-                "promise_based_server_call",
-            ],
         },
         "on": {
             "cancel_ares_query_test": [
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 9be9619ff3c..0712c8afd85 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -177,7 +177,7 @@
     (ie when all filters in a stack are promise based)
   expiry: 2024/06/14
   owner: ctiller@google.com
-  test_tags: ["core_end2end_test", "cpp_end2end_test", "xds_end2end_test", "logging_test"]
+  test_tags: ["core_end2end_test", "logging_test"]
 - name: rstpit
   description:
     On RST_STREAM on a server, reduce MAX_CONCURRENT_STREAMS for a short duration
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index ea320b99e63..b2d09507c33 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -384,7 +384,7 @@ void Call::Run() {
   ApplicationCallbackExecCtx callback_exec_ctx;
   ExecCtx exec_ctx;
   CancelWithError(grpc_error_set_int(
-      absl::DeadlineExceededError("Deadline exceeded"),
+      absl::DeadlineExceededError("Deadline Exceeded"),
       StatusIntProperty::kRpcStatus, GRPC_STATUS_DEADLINE_EXCEEDED));
   InternalUnref("deadline[run]");
 }
@@ -3536,7 +3536,12 @@ ServerPromiseBasedCall::MakeTopOfServerCallPromise(
   server_to_client_messages_ = call_args.server_to_client_messages;
   client_to_server_messages_ = call_args.client_to_server_messages;
   server_initial_metadata_ = call_args.server_initial_metadata;
-  set_send_deadline(deadline());
+  absl::optional<Timestamp> deadline =
+      client_initial_metadata_->get(GrpcTimeoutMetadata());
+  if (deadline.has_value()) {
+    set_send_deadline(*deadline);
+    UpdateDeadline(*deadline);
+  }
   ProcessIncomingInitialMetadata(*client_initial_metadata_);
   ExternalRef();
   publish(c_ptr());