@temporalio/core-bridge 1.10.3 → 1.11.0

package/sdk-core/client/src/raw.rs

@@ -6,8 +6,8 @@ use crate::{
     metrics::{namespace_kv, task_queue_kv},
     raw::sealed::RawClientLike,
     worker_registry::{Slot, SlotManager},
-    Client, ConfiguredClient, InterceptedMetricsSvc, RetryClient, TemporalServiceClient,
-    LONG_POLL_TIMEOUT,
+    Client, ConfiguredClient, InterceptedMetricsSvc, RequestExt, RetryClient,
+    TemporalServiceClient, LONG_POLL_TIMEOUT, TEMPORAL_NAMESPACE_HEADER_KEY,
 };
 use futures::{future::BoxFuture, FutureExt, TryFutureExt};
 use std::sync::Arc;
@@ -15,6 +15,7 @@ use temporal_sdk_core_api::telemetry::metrics::MetricKeyValue;
 use temporal_sdk_core_protos::{
     grpc::health::v1::{health_client::HealthClient, *},
     temporal::api::{
+        cloud::cloudservice::{v1 as cloudreq, v1::cloud_service_client::CloudServiceClient},
         operatorservice::v1::{operator_service_client::OperatorServiceClient, *},
         taskqueue::v1::TaskQueue,
         testservice::v1::{test_service_client::TestServiceClient, *},
@@ -22,7 +23,10 @@ use temporal_sdk_core_protos::{
     },
 };
 use tonic::{
-    body::BoxBody, client::GrpcService, metadata::KeyAndValueRef, Request, Response, Status,
+    body::BoxBody,
+    client::GrpcService,
+    metadata::{AsciiMetadataValue, KeyAndValueRef},
+    Request, Response, Status,
 };
 
 pub(super) mod sealed {
@@ -45,6 +49,12 @@ pub(super) mod sealed {
         /// Return a mutable ref to the operator service client instance
         fn operator_client_mut(&mut self) -> &mut OperatorServiceClient<Self::SvcType>;
 
+        /// Return a ref to the cloud service client instance
+        fn cloud_client(&self) -> &CloudServiceClient<Self::SvcType>;
+
+        /// Return a mutable ref to the cloud service client instance
+        fn cloud_client_mut(&mut self) -> &mut CloudServiceClient<Self::SvcType>;
+
         /// Return a ref to the test service client instance
         fn test_client(&self) -> &TestServiceClient<Self::SvcType>;
 
@@ -100,6 +110,14 @@ where
         self.get_client_mut().operator_client_mut()
     }
 
+    fn cloud_client(&self) -> &CloudServiceClient<Self::SvcType> {
+        self.get_client().cloud_client()
+    }
+
+    fn cloud_client_mut(&mut self) -> &mut CloudServiceClient<Self::SvcType> {
+        self.get_client_mut().cloud_client_mut()
+    }
+
     fn test_client(&self) -> &TestServiceClient<Self::SvcType> {
         self.get_client().test_client()
     }
@@ -167,6 +185,14 @@ where
         self.operator_svc_mut()
     }
 
+    fn cloud_client(&self) -> &CloudServiceClient<Self::SvcType> {
+        self.cloud_svc()
+    }
+
+    fn cloud_client_mut(&mut self) -> &mut CloudServiceClient<Self::SvcType> {
+        self.cloud_svc_mut()
+    }
+
     fn test_client(&self) -> &TestServiceClient<Self::SvcType> {
         self.test_svc()
     }
@@ -214,6 +240,14 @@ where
         self.client.operator_client_mut()
     }
 
+    fn cloud_client(&self) -> &CloudServiceClient<Self::SvcType> {
+        self.client.cloud_client()
+    }
+
+    fn cloud_client_mut(&mut self) -> &mut CloudServiceClient<Self::SvcType> {
+        self.client.cloud_client_mut()
+    }
+
     fn test_client(&self) -> &TestServiceClient<Self::SvcType> {
         self.client.test_client()
     }
@@ -254,6 +288,14 @@ impl RawClientLike for Client {
         self.inner.operator_client_mut()
     }
 
+    fn cloud_client(&self) -> &CloudServiceClient<Self::SvcType> {
+        self.inner.cloud_client()
+    }
+
+    fn cloud_client_mut(&mut self) -> &mut CloudServiceClient<Self::SvcType> {
+        self.inner.cloud_client_mut()
+    }
+
     fn test_client(&self) -> &TestServiceClient<Self::SvcType> {
         self.inner.test_client()
     }
@@ -294,7 +336,7 @@ fn req_cloner<T: Clone>(cloneme: &Request<T>) -> Request<T> {
     new_req
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub(super) struct AttachMetricLabels {
     pub(super) labels: Vec<MetricKeyValue>,
 }
@@ -339,6 +381,16 @@ where
     <T::ResponseBody as tonic::codegen::Body>::Error: Into<tonic::codegen::StdError> + Send,
 {
 }
+impl<RC, T> CloudService for RC
+where
+    RC: RawClientLike<SvcType = T>,
+    T: GrpcService<BoxBody> + Send + Clone + 'static,
+    T::ResponseBody: tonic::codegen::Body<Data = tonic::codegen::Bytes> + Send + 'static,
+    T::Error: Into<tonic::codegen::StdError>,
+    T::Future: Send,
+    <T::ResponseBody as tonic::codegen::Body>::Error: Into<tonic::codegen::StdError> + Send,
+{
+}
 impl<RC, T> TestService for RC
 where
     RC: RawClientLike<SvcType = T>,
@@ -424,6 +476,22 @@ macro_rules! proxier {
     };
 }
 
+macro_rules! namespaced_request {
+    ($req:ident) => {{
+        let ns_str = $req.get_ref().namespace.clone();
+        // Attach namespace header
+        $req.metadata_mut().insert(
+            TEMPORAL_NAMESPACE_HEADER_KEY,
+            ns_str.parse().unwrap_or_else(|e| {
+                warn!("Unable to parse namespace for header: {e:?}");
+                AsciiMetadataValue::from_static("")
+            }),
+        );
+        // Init metric labels
+        AttachMetricLabels::namespace(ns_str)
+    }};
+}
+
 // Nice little trick to avoid the callsite asking to type the closure parameter
 fn type_closure_arg<T, R>(arg: T, f: impl FnOnce(T) -> R) -> R {
     f(arg)
@@ -440,7 +508,7 @@ proxier! {
         RegisterNamespaceRequest,
         RegisterNamespaceResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -449,7 +517,7 @@ proxier! {
         DescribeNamespaceRequest,
         DescribeNamespaceResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -463,7 +531,7 @@ proxier! {
         UpdateNamespaceRequest,
         UpdateNamespaceResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -472,7 +540,7 @@ proxier! {
         DeprecateNamespaceRequest,
         DeprecateNamespaceResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -482,7 +550,7 @@ proxier! {
         StartWorkflowExecutionResponse,
         |r, workers| {
             let mut slot: Option<Box<dyn Slot + Send>> = None;
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
             let req_mut = r.get_mut();
@@ -516,8 +584,11 @@ proxier! {
         GetWorkflowExecutionHistoryRequest,
         GetWorkflowExecutionHistoryResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
+            if r.get_ref().wait_new_event {
+                r.set_default_timeout(LONG_POLL_TIMEOUT);
+            }
         }
     );
     (
@@ -525,7 +596,7 @@ proxier! {
         GetWorkflowExecutionHistoryReverseRequest,
         GetWorkflowExecutionHistoryReverseResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -534,10 +605,10 @@ proxier! {
         PollWorkflowTaskQueueRequest,
         PollWorkflowTaskQueueResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
-            r.set_timeout(LONG_POLL_TIMEOUT);
+            r.set_default_timeout(LONG_POLL_TIMEOUT);
         }
     );
     (
@@ -545,7 +616,7 @@ proxier! {
         RespondWorkflowTaskCompletedRequest,
         RespondWorkflowTaskCompletedResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -554,7 +625,7 @@ proxier! {
         RespondWorkflowTaskFailedRequest,
         RespondWorkflowTaskFailedResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -563,10 +634,10 @@ proxier! {
         PollActivityTaskQueueRequest,
         PollActivityTaskQueueResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
-            r.set_timeout(LONG_POLL_TIMEOUT);
+            r.set_default_timeout(LONG_POLL_TIMEOUT);
         }
     );
     (
@@ -574,7 +645,7 @@ proxier! {
         RecordActivityTaskHeartbeatRequest,
         RecordActivityTaskHeartbeatResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -583,7 +654,7 @@ proxier! {
         RecordActivityTaskHeartbeatByIdRequest,
         RecordActivityTaskHeartbeatByIdResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -592,7 +663,7 @@ proxier! {
         RespondActivityTaskCompletedRequest,
         RespondActivityTaskCompletedResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -601,7 +672,7 @@ proxier! {
         RespondActivityTaskCompletedByIdRequest,
         RespondActivityTaskCompletedByIdResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -611,7 +682,7 @@ proxier! {
         RespondActivityTaskFailedRequest,
         RespondActivityTaskFailedResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -620,7 +691,7 @@ proxier! {
         RespondActivityTaskFailedByIdRequest,
         RespondActivityTaskFailedByIdResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -629,7 +700,7 @@ proxier! {
         RespondActivityTaskCanceledRequest,
         RespondActivityTaskCanceledResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -638,7 +709,7 @@ proxier! {
         RespondActivityTaskCanceledByIdRequest,
         RespondActivityTaskCanceledByIdResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -647,7 +718,7 @@ proxier! {
         RequestCancelWorkflowExecutionRequest,
         RequestCancelWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -656,7 +727,7 @@ proxier! {
         SignalWorkflowExecutionRequest,
         SignalWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -665,7 +736,7 @@ proxier! {
         SignalWithStartWorkflowExecutionRequest,
         SignalWithStartWorkflowExecutionResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -675,7 +746,7 @@ proxier! {
         ResetWorkflowExecutionRequest,
         ResetWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -684,7 +755,7 @@ proxier! {
         TerminateWorkflowExecutionRequest,
         TerminateWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -693,7 +764,7 @@ proxier! {
         DeleteWorkflowExecutionRequest,
         DeleteWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -702,7 +773,7 @@ proxier! {
         ListOpenWorkflowExecutionsRequest,
         ListOpenWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -711,7 +782,7 @@ proxier! {
         ListClosedWorkflowExecutionsRequest,
         ListClosedWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -720,7 +791,7 @@ proxier! {
         ListWorkflowExecutionsRequest,
         ListWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -729,7 +800,7 @@ proxier! {
         ListArchivedWorkflowExecutionsRequest,
         ListArchivedWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -738,7 +809,7 @@ proxier! {
         ScanWorkflowExecutionsRequest,
         ScanWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -747,7 +818,7 @@ proxier! {
         CountWorkflowExecutionsRequest,
         CountWorkflowExecutionsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -761,7 +832,7 @@ proxier! {
         RespondQueryTaskCompletedRequest,
         RespondQueryTaskCompletedResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -770,7 +841,7 @@ proxier! {
         ResetStickyTaskQueueRequest,
         ResetStickyTaskQueueResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -779,7 +850,7 @@ proxier! {
         QueryWorkflowRequest,
         QueryWorkflowResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -788,7 +859,7 @@ proxier! {
         DescribeWorkflowExecutionRequest,
         DescribeWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -797,7 +868,7 @@ proxier! {
         DescribeTaskQueueRequest,
         DescribeTaskQueueResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -817,7 +888,7 @@ proxier! {
         ListTaskQueuePartitionsRequest,
         ListTaskQueuePartitionsResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -827,7 +898,7 @@ proxier! {
         CreateScheduleRequest,
         CreateScheduleResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -836,7 +907,7 @@ proxier! {
         DescribeScheduleRequest,
         DescribeScheduleResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -845,7 +916,7 @@ proxier! {
         UpdateScheduleRequest,
         UpdateScheduleResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -854,7 +925,7 @@ proxier! {
         PatchScheduleRequest,
         PatchScheduleResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -863,7 +934,7 @@ proxier! {
         ListScheduleMatchingTimesRequest,
         ListScheduleMatchingTimesResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -872,7 +943,7 @@ proxier! {
         DeleteScheduleRequest,
         DeleteScheduleResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -881,7 +952,7 @@ proxier! {
         ListSchedulesRequest,
         ListSchedulesResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -890,7 +961,7 @@ proxier! {
         UpdateWorkerBuildIdCompatibilityRequest,
         UpdateWorkerBuildIdCompatibilityResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q_str(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -900,7 +971,7 @@ proxier! {
         GetWorkerBuildIdCompatibilityRequest,
         GetWorkerBuildIdCompatibilityResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q_str(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -910,7 +981,7 @@ proxier! {
         GetWorkerTaskReachabilityRequest,
         GetWorkerTaskReachabilityResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -919,8 +990,9 @@ proxier! {
         UpdateWorkflowExecutionRequest,
         UpdateWorkflowExecutionResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
+            r.set_default_timeout(LONG_POLL_TIMEOUT);
         }
     );
     (
@@ -928,8 +1000,9 @@ proxier! {
         PollWorkflowExecutionUpdateRequest,
         PollWorkflowExecutionUpdateResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
+            r.set_default_timeout(LONG_POLL_TIMEOUT);
         }
     );
     (
@@ -937,7 +1010,7 @@ proxier! {
         StartBatchOperationRequest,
         StartBatchOperationResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -946,7 +1019,7 @@ proxier! {
         StopBatchOperationRequest,
         StopBatchOperationResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -955,7 +1028,7 @@ proxier! {
         DescribeBatchOperationRequest,
         DescribeBatchOperationResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -964,7 +1037,7 @@ proxier! {
         ListBatchOperationsRequest,
         ListBatchOperationsResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -973,7 +1046,7 @@ proxier! {
         ExecuteMultiOperationRequest,
         ExecuteMultiOperationResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -982,7 +1055,7 @@ proxier! {
         GetWorkerVersioningRulesRequest,
         GetWorkerVersioningRulesResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q_str(&r.get_ref().task_queue);
             r.extensions_mut().insert(labels);
         }
@@ -992,7 +1065,7 @@ proxier! {
         UpdateWorkerVersioningRulesRequest,
         UpdateWorkerVersioningRulesResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q_str(&r.get_ref().task_queue);
             r.extensions_mut().insert(labels);
         }
@@ -1002,7 +1075,7 @@ proxier! {
         PollNexusTaskQueueRequest,
         PollNexusTaskQueueResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let mut labels = namespaced_request!(r);
             labels.task_q(r.get_ref().task_queue.clone());
             r.extensions_mut().insert(labels);
         }
@@ -1012,7 +1085,7 @@ proxier! {
         RespondNexusTaskCompletedRequest,
         RespondNexusTaskCompletedResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -1021,7 +1094,7 @@ proxier! {
         RespondNexusTaskFailedRequest,
         RespondNexusTaskFailedResponse,
         |r| {
-            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -1034,7 +1107,7 @@ proxier! {
     (list_search_attributes, ListSearchAttributesRequest, ListSearchAttributesResponse);
     (delete_namespace, DeleteNamespaceRequest, DeleteNamespaceResponse,
         |r| {
-            let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            let labels = namespaced_request!(r);
             r.extensions_mut().insert(labels);
         }
     );
@@ -1048,6 +1121,58 @@ proxier! {
     (list_nexus_endpoints, ListNexusEndpointsRequest, ListNexusEndpointsResponse);
 }
 
+proxier! {
+    CloudService; ALL_IMPLEMENTED_CLOUD_SERVICE_RPCS; CloudServiceClient; cloud_client_mut;
+    (get_users, cloudreq::GetUsersRequest, cloudreq::GetUsersResponse);
+    (get_user, cloudreq::GetUserRequest, cloudreq::GetUserResponse);
+    (create_user, cloudreq::CreateUserRequest, cloudreq::CreateUserResponse);
+    (update_user, cloudreq::UpdateUserRequest, cloudreq::UpdateUserResponse);
+    (delete_user, cloudreq::DeleteUserRequest, cloudreq::DeleteUserResponse);
+    (set_user_namespace_access, cloudreq::SetUserNamespaceAccessRequest, cloudreq::SetUserNamespaceAccessResponse);
+    (get_async_operation, cloudreq::GetAsyncOperationRequest, cloudreq::GetAsyncOperationResponse);
+    (create_namespace, cloudreq::CreateNamespaceRequest, cloudreq::CreateNamespaceResponse);
+    (get_namespaces, cloudreq::GetNamespacesRequest, cloudreq::GetNamespacesResponse);
+    (get_namespace, cloudreq::GetNamespaceRequest, cloudreq::GetNamespaceResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (update_namespace, cloudreq::UpdateNamespaceRequest, cloudreq::UpdateNamespaceResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (rename_custom_search_attribute, cloudreq::RenameCustomSearchAttributeRequest, cloudreq::RenameCustomSearchAttributeResponse);
+    (delete_namespace, cloudreq::DeleteNamespaceRequest, cloudreq::DeleteNamespaceResponse,
+        |r| {
+            let labels = namespaced_request!(r);
+            r.extensions_mut().insert(labels);
+        }
+    );
+    (failover_namespace_region, cloudreq::FailoverNamespaceRegionRequest, cloudreq::FailoverNamespaceRegionResponse);
+    (add_namespace_region, cloudreq::AddNamespaceRegionRequest, cloudreq::AddNamespaceRegionResponse);
+    (get_regions, cloudreq::GetRegionsRequest, cloudreq::GetRegionsResponse);
+    (get_region, cloudreq::GetRegionRequest, cloudreq::GetRegionResponse);
+    (get_api_keys, cloudreq::GetApiKeysRequest, cloudreq::GetApiKeysResponse);
+    (get_api_key, cloudreq::GetApiKeyRequest, cloudreq::GetApiKeyResponse);
+    (create_api_key, cloudreq::CreateApiKeyRequest, cloudreq::CreateApiKeyResponse);
+    (update_api_key, cloudreq::UpdateApiKeyRequest, cloudreq::UpdateApiKeyResponse);
+    (delete_api_key, cloudreq::DeleteApiKeyRequest, cloudreq::DeleteApiKeyResponse);
+    (get_user_groups, cloudreq::GetUserGroupsRequest, cloudreq::GetUserGroupsResponse);
+    (get_user_group, cloudreq::GetUserGroupRequest, cloudreq::GetUserGroupResponse);
+    (create_user_group, cloudreq::CreateUserGroupRequest, cloudreq::CreateUserGroupResponse);
+    (update_user_group, cloudreq::UpdateUserGroupRequest, cloudreq::UpdateUserGroupResponse);
+    (delete_user_group, cloudreq::DeleteUserGroupRequest, cloudreq::DeleteUserGroupResponse);
+    (set_user_group_namespace_access, cloudreq::SetUserGroupNamespaceAccessRequest, cloudreq::SetUserGroupNamespaceAccessResponse);
+    (create_service_account, cloudreq::CreateServiceAccountRequest, cloudreq::CreateServiceAccountResponse);
+    (get_service_account, cloudreq::GetServiceAccountRequest, cloudreq::GetServiceAccountResponse);
+    (get_service_accounts, cloudreq::GetServiceAccountsRequest, cloudreq::GetServiceAccountsResponse);
+    (update_service_account, cloudreq::UpdateServiceAccountRequest, cloudreq::UpdateServiceAccountResponse);
+    (delete_service_account, cloudreq::DeleteServiceAccountRequest, cloudreq::DeleteServiceAccountResponse);
+}
+
 proxier! {
     TestService; ALL_IMPLEMENTED_TEST_SERVICE_RPCS; TestServiceClient; test_client_mut;
     (lock_time_skipping, LockTimeSkippingRequest, LockTimeSkippingResponse);
@@ -1091,19 +1216,36 @@ mod tests {
             .unwrap();
 
         // Operator svc method
-        let del_ns_req = DeleteNamespaceRequest::default();
+        let op_del_ns_req = DeleteNamespaceRequest::default();
         let fact = |c: &mut RetryClient<_>, req| {
             let mut c = c.operator_client_mut().clone();
             async move { c.delete_namespace(req).await }.boxed()
         };
         retry_client
-            .call("whatever", fact, Request::new(del_ns_req.clone()))
+            .call("whatever", fact, Request::new(op_del_ns_req.clone()))
+            .await
+            .unwrap();
+
+        // Cloud svc method
+        let cloud_del_ns_req = cloudreq::DeleteNamespaceRequest::default();
+        let fact = |c: &mut RetryClient<_>, req| {
+            let mut c = c.cloud_client_mut().clone();
+            async move { c.delete_namespace(req).await }.boxed()
+        };
+        retry_client
+            .call("whatever", fact, Request::new(cloud_del_ns_req.clone()))
             .await
             .unwrap();
 
         // Verify calling through traits works
         retry_client.list_namespaces(list_ns_req).await.unwrap();
-        retry_client.delete_namespace(del_ns_req).await.unwrap();
+        // Have to disambiguate operator and cloud service
+        OperatorService::delete_namespace(&mut retry_client, op_del_ns_req)
+            .await
+            .unwrap();
+        CloudService::delete_namespace(&mut retry_client, cloud_del_ns_req)
+            .await
+            .unwrap();
         retry_client.get_current_time(()).await.unwrap();
         retry_client
             .check(HealthCheckRequest::default())
@@ -1143,6 +1285,13 @@ mod tests {
         verify_methods(proto_def, ALL_IMPLEMENTED_OPERATOR_SERVICE_RPCS);
     }
 
+    #[test]
+    fn verify_all_cloud_service_methods_implemented() {
+        let proto_def =
+            include_str!("../../sdk-core-protos/protos/api_cloud_upstream/temporal/api/cloud/cloudservice/v1/service.proto");
+        verify_methods(proto_def, ALL_IMPLEMENTED_CLOUD_SERVICE_RPCS);
+    }
+
     #[test]
     fn verify_all_test_service_methods_implemented() {
         let proto_def =