@temporalio/core-bridge 1.10.2 → 1.11.0

package/Cargo.toml

@@ -20,10 +20,10 @@ incremental = false
 futures = { version = "0.3", features = ["executor"] }
 log = "0.4"
 neon = { version = "0.10", default-features = false, features = ["napi-6", "event-queue-api"] }
-opentelemetry = "0.22"
+opentelemetry = "0.23"
 parking_lot = "0.12"
-prost = "0.12"
-prost-types = "0.12"
+prost = "0.13"
+prost-types = "0.13"
 serde_json = "1.0"
 tokio = "1.13"
 once_cell = "1.19"

package/lib/index.d.ts

@@ -1,5 +1,7 @@
 import { LogLevel, Duration } from '@temporalio/common';
 import type { TLSConfig, ProxyConfig, HttpConnectProxyConfig } from '@temporalio/common/lib/internal-non-workflow';
+import { WorkerTuner } from './worker-tuner';
+export { WorkerTuner, SlotSupplier, ResourceBasedSlotOptions, ResourceBasedTunerOptions, FixedSizeSlotSupplier, } from './worker-tuner';
 export type { TLSConfig, ProxyConfig, HttpConnectProxyConfig };
 /** @deprecated Import from @temporalio/common instead */
 export { LogLevel };
@@ -250,9 +252,10 @@ export interface WorkerOptions {
      * The task queue the worker will pull from
      */
     taskQueue: string;
-    maxConcurrentActivityTaskExecutions: number;
-    maxConcurrentWorkflowTaskExecutions: number;
-    maxConcurrentLocalActivityExecutions: number;
+    /**
+     * The tuner the worker will use
+     */
+    tuner: WorkerTuner;
     nonStickyToStickyPollRatio: number;
     /**
      * Maximum number of Workflow tasks to poll concurrently.
@@ -356,11 +359,15 @@ export interface TimeSkippingServerConfig {
     port?: number;
     /**
      * Extra args to pass to the executable command.
+     *
+     * Note that the Test Server implementation may be changed to another one in the future. Therefore, there is
+     * no guarantee that server options, and particularly those provided through the `extraArgs` array, will continue to
+     * be supported in the future.
      */
     extraArgs?: string[];
 }
 /**
- * Configuration for the Temporal CLI dev server.
+ * Configuration for the Temporal CLI Dev Server.
  */
 export interface DevServerConfig {
     type: 'dev-server';
@@ -401,13 +408,17 @@ export interface DevServerConfig {
     port?: number;
     /**
      * Extra args to pass to the executable command.
+     *
+     * Note that the Dev Server implementation may be changed to another one in the future. Therefore, there is no
+     * guarantee that Dev Server options, and particularly those provided through the `extraArgs` array, will continue to
+     * be supported in the future.
      */
     extraArgs?: string[];
 }
 /**
  * Configuration for spawning an ephemeral Temporal server.
  *
- * Both the time-skipping test server and Temporal CLI dev server are supported.
+ * Both the time-skipping Test Server and Temporal CLI dev server are supported.
  */
 export type EphemeralServerConfig = TimeSkippingServerConfig | DevServerConfig;
 export interface Worker {

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":";;;AAsjBA,mCAA0E;AAAjE,uGAAA,aAAa,OAAA;AAAE,wGAAA,cAAc,OAAA;AAAE,yGAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":";;;AAykBA,mCAA0E;AAAjE,uGAAA,aAAa,OAAA;AAAE,wGAAA,cAAc,OAAA;AAAE,yGAAA,eAAe,OAAA"}

package/lib/worker-tuner.d.ts

@@ -0,0 +1,57 @@
+/**
+ * A worker tuner allows the customization of the performance characteristics of workers by
+ * controlling how "slots" are handed out for different task types. In order to poll for and then
+ * run tasks, a slot must first be reserved by the {@link SlotSupplier} returned by the tuner.
+ *
+ * @experimental
+ */
+export interface WorkerTuner {
+    workflowTaskSlotSupplier: SlotSupplier;
+    activityTaskSlotSupplier: SlotSupplier;
+    localActivityTaskSlotSupplier: SlotSupplier;
+}
+/**
+ * Controls how slots are handed out for a specific task type.
+ *
+ * For now, only {@link ResourceBasedSlotOptions} and {@link FixedSizeSlotSupplier} are supported,
+ * but we may add support for custom tuners in the future.
+ *
+ * @experimental
+ */
+export type SlotSupplier = ResourceBasedSlotsForType | FixedSizeSlotSupplier;
+/**
+ * Options for a specific slot type within a {@link ResourceBasedSlotsForType}
+ *
+ * @experimental
+ */
+export interface ResourceBasedSlotOptions {
+    minimumSlots: number;
+    maximumSlots: number;
+    rampThrottleMs: number;
+}
+/**
+ * @experimental
+ */
+type ResourceBasedSlotsForType = ResourceBasedSlotOptions & {
+    type: 'resource-based';
+    tunerOptions: ResourceBasedTunerOptions;
+};
+/**
+ * Options for a {@link ResourceBasedTuner} to control target resource usage
+ *
+ * @experimental
+ */
+export interface ResourceBasedTunerOptions {
+    targetMemoryUsage: number;
+    targetCpuUsage: number;
+}
+/**
+ * A fixed-size slot supplier that will never issue more than a fixed number of slots.
+ *
+ * @experimental
+ */
+export interface FixedSizeSlotSupplier {
+    type: 'fixed-size';
+    numSlots: number;
+}
+export {};

package/lib/worker-tuner.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=worker-tuner.js.map

package/lib/worker-tuner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-tuner.js","sourceRoot":"","sources":["../ts/worker-tuner.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/core-bridge",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "Temporal.io SDK Core<>Node bridge",
   "main": "index.js",
   "types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "Temporal Technologies Inc. <sdk@temporal.io>",
   "license": "MIT",
   "dependencies": {
-    "@temporalio/common": "1.10.2",
+    "@temporalio/common": "1.11.0",
     "arg": "^5.0.2",
     "cargo-cp-artifact": "^0.1.8",
     "which": "^4.0.0"
@@ -52,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a44bdfa780c1247fe7ed82b4b73c7b1577ee94af"
+  "gitHead": "3d7dd521cadc2ebcc4989360eeb0bedacd4533ab"
 }

package/sdk-core/.github/workflows/heavy.yml

@@ -15,19 +15,14 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest-16-cores
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
+      - uses: dtolnay/rust-toolchain@stable
       - name: Install protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@v3
         with:
-          version: '3.x'
+          # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed
+          version: '23.x'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-rs/cargo@v1
-        with:
-          command: integ-test
-          args: -c "--release" -t heavy_tests -- --test-threads 1
+      - run: cargo integ-test -c "--release" -t heavy_tests -- --test-threads 1

package/sdk-core/.github/workflows/per-pr.yml

@@ -16,62 +16,47 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: 1.77.0
-          override: true
       - name: Install protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@v3
         with:
-          version: '3.x'
+          # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed
+          version: '23.x'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: rustup component add rustfmt clippy
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-      - uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --workspace --all-features --no-deps
-      - uses: actions-rs/cargo@v1
-        with:
-          command: lint
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test-lint
+      - run: cargo fmt --all --check
+      - run: cargo doc --workspace --all-features --no-deps
+      - run: cargo lint
+      - run: cargo test-lint
 
   test:
     name: Unit Tests
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: 1.77.0
-          override: true
       - name: Install protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@v3
         with:
-          version: '3.x'
+          # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed
+          version: '23.x'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -- --include-ignored --nocapture
-      - uses: actions/upload-artifact@v3
+      - run: cargo test -- --include-ignored --nocapture
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-report
           path: tarpaulin-report.html
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: state-machine-coverage
           path: machine_coverage/
@@ -81,18 +66,15 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: 1.77.0
-          override: true
       - name: Install protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@v3
         with:
-          version: '3.x'
+          # TODO: Upgrade proto once https://github.com/arduino/setup-protoc/issues/99 is fixed
+          version: '23.x'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: integ-test
+      - run: cargo integ-test

package/sdk-core/Cargo.toml

@@ -10,11 +10,11 @@ license-file = "LICENSE.txt"
 derive_builder = "0.20"
 derive_more = { version = "0.99", default-features = false, features = ["constructor", "display", "from", "into"] }
 once_cell = "1.16"
-tonic = "0.11"
-tonic-build = "0.11"
-opentelemetry = "0.22"
-prost = "0.12"
-prost-types = "0.12"
+tonic = "0.12"
+tonic-build = "0.12"
+opentelemetry = { version = "0.24", features = ["metrics"] }
+prost = "0.13"
+prost-types = "0.13"
 
 [workspace.lints.rust]
 unreachable_pub = "warn"

package/sdk-core/README.md

@@ -90,6 +90,8 @@ is a subtree. To update it, use:
 `git pull --squash --rebase=false -s subtree ssh://git@github.com/temporalio/api.git master --allow-unrelated-histories`
 
 Do not question why this git command is the way it is. It is not our place to interpret git's ways.
+This same approach can be taken for updating `sdk-core-protos/protos/api_cloud_upstream` from the
+`api-cloud` repo.
 
 The java testserver protos are also pulled from the sdk-java repo, but since we only need a
 subdirectory of that repo, we just copy the files with read-tree:

package/sdk-core/client/Cargo.toml

@@ -22,8 +22,10 @@ derive_builder = { workspace = true }
 derive_more = "0.99"
 futures = "0.3"
 futures-retry = "0.6.0"
-http = "0.2"
-hyper = { version = "0.14" }
+http = "1.1.0"
+http-body-util = "0.1"
+hyper = { version = "1.4.1" }
+hyper-util = "0.1.6"
 once_cell = { workspace = true }
 opentelemetry = { workspace = true, features = ["metrics"], optional = true }
 parking_lot = "0.12"

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

@@ -18,7 +18,7 @@ pub use crate::{
     proxy::HttpConnectProxyOptions,
     retry::{CallType, RetryClient, RETRYABLE_ERROR_CODES},
 };
-pub use raw::{HealthService, OperatorService, TestService, WorkflowService};
+pub use raw::{CloudService, HealthService, OperatorService, TestService, WorkflowService};
 pub use temporal_sdk_core_protos::temporal::api::{
     enums::v1::ArchivalState,
     filter::v1::{StartTimeFilter, StatusFilter, WorkflowExecutionFilter, WorkflowTypeFilter},
@@ -56,6 +56,7 @@ use temporal_sdk_core_protos::{
     coresdk::{workflow_commands::QueryResult, IntoPayloadsExt},
     grpc::health::v1::health_client::HealthClient,
     temporal::api::{
+        cloud::cloudservice::v1::cloud_service_client::CloudServiceClient,
         common::v1::{Header, Payload, Payloads, RetryPolicy, WorkflowExecution, WorkflowType},
         enums::v1::{TaskQueueKind, WorkflowIdReusePolicy},
         failure::v1::Failure,
@@ -84,6 +85,7 @@ use uuid::Uuid;
 
 static CLIENT_NAME_HEADER_KEY: &str = "client-name";
 static CLIENT_VERSION_HEADER_KEY: &str = "client-version";
+static TEMPORAL_NAMESPACE_HEADER_KEY: &str = "temporal-namespace";
 /// These must match the gRPC method names, not the snake case versions that exist in the Rust code.
 static LONG_POLL_METHOD_NAMES: [&str; 3] = [
     "PollWorkflowTaskQueue",
@@ -156,6 +158,10 @@ pub struct ClientOptions {
     /// If set true, error code labels will not be included on request failure metrics.
     #[builder(default)]
     pub disable_error_code_metric_tags: bool,
+
+    /// If set true, get_system_info will not be called upon connection
+    #[builder(default)]
+    pub skip_get_system_info: bool,
 }
 
 /// Configuration options for TLS
@@ -447,18 +453,20 @@ impl ClientOptions {
             capabilities: None,
             workers: Arc::new(SlotManager::new()),
         };
-        match client
-            .get_system_info(GetSystemInfoRequest::default())
-            .await
-        {
-            Ok(sysinfo) => {
-                client.capabilities = sysinfo.into_inner().capabilities;
-            }
-            Err(status) => match status.code() {
-                Code::Unimplemented => {}
-                _ => return Err(ClientInitError::SystemInfoCallError(status)),
-            },
-        };
+        if !self.skip_get_system_info {
+            match client
+                .get_system_info(GetSystemInfoRequest::default())
+                .await
+            {
+                Ok(sysinfo) => {
+                    client.capabilities = sysinfo.into_inner().capabilities;
+                }
+                Err(status) => match status.code() {
+                    Code::Unimplemented => {}
+                    _ => return Err(ClientInitError::SystemInfoCallError(status)),
+                },
+            };
+        }
         Ok(RetryClient::new(client, self.retry_config.clone()))
     }
 
@@ -466,7 +474,7 @@ impl ClientOptions {
     /// Passes it through if TLS options not set.
     async fn add_tls_to_channel(&self, mut channel: Endpoint) -> Result<Endpoint, ClientInitError> {
         if let Some(tls_cfg) = &self.tls_cfg {
-            let mut tls = tonic::transport::ClientTlsConfig::new();
+            let mut tls = tonic::transport::ClientTlsConfig::new().with_native_roots();
 
             if let Some(root_cert) = &tls_cfg.server_root_ca_cert {
                 let server_root_ca_cert = Certificate::from_pem(root_cert);
@@ -528,9 +536,7 @@ impl Interceptor for ServiceCallInterceptor {
             );
         }
         self.headers.read().apply_to_metadata(metadata);
-        if !metadata.contains_key("grpc-timeout") {
-            request.set_timeout(OTHER_CALL_TIMEOUT);
-        }
+        request.set_default_timeout(OTHER_CALL_TIMEOUT);
 
         Ok(request)
     }
@@ -542,6 +548,7 @@ pub struct TemporalServiceClient<T> {
     svc: T,
     workflow_svc_client: OnceCell<WorkflowServiceClient<T>>,
     operator_svc_client: OnceCell<OperatorServiceClient<T>>,
+    cloud_svc_client: OnceCell<CloudServiceClient<T>>,
     test_svc_client: OnceCell<TestServiceClient<T>>,
     health_svc_client: OnceCell<HealthClient<T>>,
 }
@@ -571,6 +578,7 @@ where
             svc,
             workflow_svc_client: OnceCell::new(),
             operator_svc_client: OnceCell::new(),
+            cloud_svc_client: OnceCell::new(),
             test_svc_client: OnceCell::new(),
             health_svc_client: OnceCell::new(),
         }
@@ -589,6 +597,13 @@ where
                 .max_decoding_message_size(get_decode_max_size())
         })
     }
+    /// Get the underlying cloud service client
+    pub fn cloud_svc(&self) -> &CloudServiceClient<T> {
+        self.cloud_svc_client.get_or_init(|| {
+            CloudServiceClient::new(self.svc.clone())
+                .max_decoding_message_size(get_decode_max_size())
+        })
+    }
     /// Get the underlying test service client
     pub fn test_svc(&self) -> &TestServiceClient<T> {
         self.test_svc_client.get_or_init(|| {
@@ -612,6 +627,11 @@ where
         let _ = self.operator_svc();
         self.operator_svc_client.get_mut().unwrap()
     }
+    /// Get the underlying cloud service client mutably
+    pub fn cloud_svc_mut(&mut self) -> &mut CloudServiceClient<T> {
+        let _ = self.cloud_svc();
+        self.cloud_svc_client.get_mut().unwrap()
+    }
     /// Get the underlying test service client mutably
     pub fn test_svc_mut(&mut self) -> &mut TestServiceClient<T> {
         let _ = self.test_svc();
@@ -1604,9 +1624,22 @@ pub trait WfClientExt: WfHandleClient + Sized + Clone {
 
 impl<T> WfClientExt for T where T: WfHandleClient + Clone + Sized {}
 
+trait RequestExt {
+    /// Set a timeout for a request if one is not already specified in the metadata
+    fn set_default_timeout(&mut self, duration: Duration);
+}
+impl<T> RequestExt for tonic::Request<T> {
+    fn set_default_timeout(&mut self, duration: Duration) {
+        if !self.metadata().contains_key("grpc-timeout") {
+            self.set_timeout(duration)
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
+    use tonic::metadata::Ascii;
 
     #[test]
     fn applies_headers() {
@@ -1667,6 +1700,16 @@ mod tests {
         let req = interceptor.call(tonic::Request::new(())).unwrap();
         assert!(!req.metadata().contains_key("my-meta-key"));
         assert!(!req.metadata().contains_key("authorization"));
+
+        // Timeout header not overriden
+        let mut req = tonic::Request::new(());
+        req.metadata_mut()
+            .insert("grpc-timeout", "1S".parse().unwrap());
+        let req = interceptor.call(req).unwrap();
+        assert_eq!(
+            req.metadata().get("grpc-timeout").unwrap(),
+            "1S".parse::<MetadataValue<Ascii>>().unwrap()
+        );
     }
 
     #[test]

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

@@ -173,7 +173,7 @@ pub struct GrpcMetricSvc {
 }
 
 impl Service<http::Request<BoxBody>> for GrpcMetricSvc {
-    type Response = http::Response<tonic::transport::Body>;
+    type Response = http::Response<BoxBody>;
     type Error = tonic::transport::Error;
     type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
 

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

@@ -1,12 +1,17 @@
 use base64::prelude::*;
-use hyper::header;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::Context;
-use std::task::Poll;
+use http_body_util::Empty;
+use hyper::{body::Bytes, header};
+use hyper_util::{
+    client::legacy::Client,
+    rt::{TokioExecutor, TokioIo},
+};
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
 use tokio::net::TcpStream;
-use tonic::transport::Channel;
-use tonic::transport::Endpoint;
+use tonic::transport::{Channel, Endpoint};
 use tower::{service_fn, Service};
 
 /// Options for HTTP CONNECT proxy.
@@ -43,12 +48,12 @@ impl HttpConnectProxyOptions {
             let creds = BASE64_STANDARD.encode(format!("{}:{}", user, pass));
             req_build = req_build.header(header::PROXY_AUTHORIZATION, format!("Basic {}", creds));
         }
-        let req = req_build.body(hyper::Body::empty())?;
+        let req = req_build.body(Empty::<Bytes>::new())?;
 
         // We have to create a client with a specific connector because Hyper is
         // not letting us change the HTTP/2 authority
-        let client =
-            hyper::Client::builder().build(OverrideAddrConnector(self.target_addr.clone()));
+        let client = Client::builder(TokioExecutor::new())
+            .build(OverrideAddrConnector(self.target_addr.clone()));
 
         // Send request
         let res = client.request(req).await?;
@@ -67,7 +72,7 @@ impl HttpConnectProxyOptions {
 struct OverrideAddrConnector(String);
 
 impl Service<hyper::Uri> for OverrideAddrConnector {
-    type Response = TcpStream;
+    type Response = TokioIo<TcpStream>;
 
     type Error = anyhow::Error;
 
@@ -79,7 +84,7 @@ impl Service<hyper::Uri> for OverrideAddrConnector {
 
     fn call(&mut self, _uri: hyper::Uri) -> Self::Future {
         let target_addr = self.0.clone();
-        let fut = async move { Ok(TcpStream::connect(target_addr).await?) };
+        let fut = async move { Ok(TokioIo::new(TcpStream::connect(target_addr).await?)) };
         Box::pin(fut)
     }
 }