@temporalio/core-bridge 1.6.0 → 1.7.1

package/lib/index.d.ts

@@ -341,10 +341,10 @@ export interface TimeSkippingServerConfig {
     extraArgs?: string[];
 }
 /**
- * Configuration for temporalite.
+ * Configuration for the Temporal CLI dev server.
  */
-export interface TemporaliteConfig {
-    type: 'temporalite';
+export interface DevServerConfig {
+    type: 'dev-server';
     executable?: EphemeralServerExecutable;
     /**
      * Namespace to use - created at startup.
@@ -359,11 +359,13 @@ export interface TemporaliteConfig {
      */
     ip?: string;
     /**
-     * Sqlite DB filename if persisting or non-persistent if none.
+     * Sqlite DB filename if persisting or non-persistent if none (default).
      */
     db_filename?: string;
     /**
      * Whether to enable the UI.
+     *
+     * @default false
      */
     ui?: boolean;
     /**
@@ -386,9 +388,9 @@ export interface TemporaliteConfig {
 /**
  * Configuration for spawning an ephemeral Temporal server.
  *
- * Both the time-skipping test server and temporalite are supported.
+ * Both the time-skipping test server and Temporal CLI dev server are supported.
  */
-export declare type EphemeralServerConfig = TimeSkippingServerConfig | TemporaliteConfig;
+export declare type EphemeralServerConfig = TimeSkippingServerConfig | DevServerConfig;
 export interface Worker {
     type: 'Worker';
 }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":";;;AAigBA,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":";;;AAmgBA,mCAA0E;AAAjE,uGAAA,aAAa,OAAA;AAAE,wGAAA,cAAc,OAAA;AAAE,yGAAA,eAAe,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/core-bridge",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "Temporal.io SDK Core<>Node bridge",
   "main": "index.js",
   "types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@temporalio/common": "1.6.0",
+    "@temporalio/common": "1.7.1",
     "arg": "^5.0.2",
     "cargo-cp-artifact": "^0.1.6",
     "which": "^2.0.2"
@@ -31,6 +31,11 @@
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/temporalio/sdk-typescript.git",
+    "directory": "packages/core-bridge"
+  },
   "homepage": "https://github.com/temporalio/sdk-typescript/tree/main/packages/core-bridge",
   "files": [
     "scripts",
@@ -48,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "49c6b1341daef2b94a0a989d515cbf97b8b02fa7"
+  "gitHead": "368aa83c631555fc31cff25f4af8817d069878d8"
 }

package/sdk-core/.buildkite/docker/Dockerfile

@@ -1,9 +1,9 @@
-FROM rust:1.65
+FROM rust:1.68
 
 RUN rustup component add rustfmt && \
 	rustup component add clippy
 
-RUN cargo install cargo-tarpaulin
+# RUN cargo install cargo-tarpaulin
 RUN apt-get update && apt-get install -y protobuf-compiler
 
 WORKDIR /sdk-core

package/sdk-core/.buildkite/docker/docker-compose.yaml

@@ -9,7 +9,7 @@ services:
   #      - '9042:9042'
 
   temporal:
-    image: temporalio/auto-setup:1.18.3
+    image: temporalio/auto-setup:1.20.0
     ports:
       - "7233:7233"
       - "7234:7234"

package/sdk-core/.buildkite/pipeline.yml

@@ -29,7 +29,7 @@ steps:
     agents:
       queue: "default"
       docker: "*"
-    command: "cargo tarpaulin --out Html --workspace && cargo test -- --include-ignored"
+    command: "cargo test -- --include-ignored"
     artifact_paths:
       - "tarpaulin-report.html"
       - "machine_coverage/*"

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

@@ -8,6 +8,7 @@ on: # rebuild any PRs and main branch changes
 
 jobs:
   build-and-test:
+    timeout-minutes: 20
     runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v2

package/sdk-core/README.md

@@ -4,20 +4,20 @@ Core SDK that can be used as a base for other Temporal SDKs. It is currently use
 
 - [TypeScript SDK](https://github.com/temporalio/sdk-typescript/)
 - [Python SDK](https://github.com/temporalio/sdk-python/)
+- [.NET SDK](https://github.com/temporalio/sdk-dotnet/)
+- [Ruby SDK](https://github.com/temporalio/sdk-ruby/)
 
 For the reasoning behind the Core SDK, see: 
 
 - [Why Rust powers Temporal’s new Core SDK](https://temporal.io/blog/why-rust-powers-core-sdk).
 
-# Getting started
-
-See the [Architecture](ARCHITECTURE.md) doc for some high-level information.
-
-## Dependencies
-* Protobuf compiler
+See the [Architecture](ARCHITECTURE.md) doc for some high-level information about how Core works
+and how language layers interact with it.
 
 # Development
 
+You will need the `protoc` protobuf compiler installed to build Core.
+
 This repo is composed of multiple crates:
 * temporal-sdk-core-protos `./sdk-core-protos` - Holds the generated proto code and extensions
 * temporal-client `./client` - Defines client(s) for interacting with the Temporal gRPC service
@@ -31,7 +31,6 @@ Visualized (dev dependencies are in blue):
 
 ![Crate dependency graph](./etc/deps.svg)
 
-
 All the following commands are enforced for each pull request:
 
 ## Building and testing
@@ -109,3 +108,10 @@ Any error which is returned from a public interface should be well-typed, and we
 Errors returned from things only used in testing are free to use 
 [anyhow](https://github.com/dtolnay/anyhow) for less verbosity.
 
+
+# The Rust "SDK"
+This repo contains a *prototype* Rust sdk in the `sdk/` directory. This SDK should be considered
+pre-alpha in terms of its API surface. Since it's still using Core underneath, it is generally
+functional. We do not currently have any firm plans to productionize this SDK. If you want to write
+workflows and activities in Rust, feel free to use it - but be aware that the API may change at any
+time without warning and we do not provide any support guarantees.

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

@@ -13,6 +13,7 @@ mod retry;
 mod workflow_handle;
 
 pub use crate::retry::{CallType, RetryClient, RETRYABLE_ERROR_CODES};
+pub use metrics::ClientMetricProvider;
 pub use raw::{HealthService, OperatorService, TestService, WorkflowService};
 pub use temporal_sdk_core_protos::temporal::api::{
     enums::v1::ArchivalState,
@@ -32,9 +33,8 @@ use crate::{
     workflow_handle::UntypedWorkflowHandle,
 };
 use backoff::{exponential, ExponentialBackoff, SystemClock};
-use http::uri::InvalidUri;
+use http::{uri::InvalidUri, Uri};
 use once_cell::sync::OnceCell;
-use opentelemetry::metrics::Meter;
 use parking_lot::RwLock;
 use std::{
     collections::HashMap,
@@ -114,6 +114,14 @@ pub struct ClientOptions {
     /// Retry configuration for the server client. Default is [RetryConfig::default]
     #[builder(default)]
     pub retry_config: RetryConfig,
+
+    /// If set, override the origin used when connecting. May be useful in rare situations where tls
+    /// verification needs to use a different name from what should be set as the `:authority`
+    /// header. If [TlsConfig::domain] is set, and this is not, this will be set to
+    /// `https://<domain>`, effectively making the `:authority` header consistent with the domain
+    /// override.
+    #[builder(default)]
+    pub override_origin: Option<Uri>,
 }
 
 /// Configuration options for TLS
@@ -286,7 +294,7 @@ impl ClientOptions {
     pub async fn connect(
         &self,
         namespace: impl Into<String>,
-        metrics_meter: Option<&Meter>,
+        metrics_meter: Option<&dyn ClientMetricProvider>,
         headers: Option<Arc<RwLock<HashMap<String, String>>>>,
     ) -> Result<RetryClient<Client>, ClientInitError> {
         let client = self
@@ -304,12 +312,17 @@ impl ClientOptions {
     /// See [RetryClient] for more
     pub async fn connect_no_namespace(
         &self,
-        metrics_meter: Option<&Meter>,
+        metrics_meter: Option<&dyn ClientMetricProvider>,
         headers: Option<Arc<RwLock<HashMap<String, String>>>>,
     ) -> Result<RetryClient<ConfiguredClient<TemporalServiceClientWithMetrics>>, ClientInitError>
     {
         let channel = Channel::from_shared(self.target_url.to_string())?;
         let channel = self.add_tls_to_channel(channel).await?;
+        let channel = if let Some(origin) = self.override_origin.clone() {
+            channel.origin(origin)
+        } else {
+            channel
+        };
         let channel = channel.connect().await?;
         let service = ServiceBuilder::new()
             .layer_fn(|channel| GrpcMetricSvc {
@@ -347,10 +360,7 @@ impl ClientOptions {
 
     /// If TLS is configured, set the appropriate options on the provided channel and return it.
     /// Passes it through if TLS options not set.
-    async fn add_tls_to_channel(
-        &self,
-        channel: Endpoint,
-    ) -> Result<Endpoint, tonic::transport::Error> {
+    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();
 
@@ -361,6 +371,13 @@ impl ClientOptions {
 
             if let Some(domain) = &tls_cfg.domain {
                 tls = tls.domain_name(domain);
+
+                // This song and dance ultimately is just to make sure the `:authority` header ends
+                // up correct on requests while we use TLS. Setting the header directly in our
+                // interceptor doesn't work since seemingly it is overridden at some point by
+                // something lower level.
+                let uri: Uri = format!("https://{}", domain).parse()?;
+                channel = channel.origin(uri);
             }
 
             if let Some(client_opts) = &tls_cfg.client_tls_config {
@@ -369,7 +386,7 @@ impl ClientOptions {
                 tls = tls.identity(client_identity);
             }
 
-            return channel.tls_config(tls);
+            return channel.tls_config(tls).map_err(Into::into);
         }
         Ok(channel)
     }
@@ -1077,6 +1094,7 @@ impl WorkflowClientTrait for Client {
             identity: self.inner.options.identity.clone(),
             binary_checksum: self.bound_worker_build_id.clone().unwrap_or_default(),
             namespace: self.namespace.clone(),
+            messages: vec![],
         };
         Ok(self
             .wf_svc()

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

@@ -1,7 +1,7 @@
 use crate::{AttachMetricLabels, LONG_POLL_METHOD_NAMES};
 use futures::{future::BoxFuture, FutureExt};
 use opentelemetry::{
-    metrics::{Counter, Histogram, Meter},
+    metrics::{Counter, Histogram},
     KeyValue,
 };
 use std::{
@@ -30,18 +30,27 @@ pub struct MetricsContext {
     long_svc_request_latency: Histogram<u64>,
 }
 
+/// Things that can provide metrics for the client implement this. Trait exists to avoid having
+/// to make a whole new lower-level crate just for a tiny shared wrapper around OTel meters.
+pub trait ClientMetricProvider: Send + Sync {
+    /// Construct a counter metric
+    fn counter(&self, name: &'static str) -> Counter<u64>;
+    /// Construct a histogram metric
+    fn histogram(&self, name: &'static str) -> Histogram<u64>;
+}
+
 impl MetricsContext {
-    pub(crate) fn new(kvs: Vec<KeyValue>, meter: &Meter) -> Self {
+    pub(crate) fn new(kvs: Vec<KeyValue>, metric_provider: &dyn ClientMetricProvider) -> Self {
         Self {
             ctx: opentelemetry::Context::current(),
             kvs: Arc::new(kvs),
             poll_is_long: false,
-            svc_request: meter.u64_counter("request").init(),
-            svc_request_failed: meter.u64_counter("request_failure").init(),
-            long_svc_request: meter.u64_counter("long_request").init(),
-            long_svc_request_failed: meter.u64_counter("long_request_failure").init(),
-            svc_request_latency: meter.u64_histogram("request_latency").init(),
-            long_svc_request_latency: meter.u64_histogram("long_request_latency").init(),
+            svc_request: metric_provider.counter("request"),
+            svc_request_failed: metric_provider.counter("request_failure"),
+            long_svc_request: metric_provider.counter("long_request"),
+            long_svc_request_failed: metric_provider.counter("long_request_failure"),
+            svc_request_latency: metric_provider.histogram("request_latency"),
+            long_svc_request_latency: metric_provider.histogram("long_request_latency"),
         }
     }
 

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

@@ -760,9 +760,9 @@ proxier! {
         }
     );
     (
-        update_workflow,
-        UpdateWorkflowRequest,
-        UpdateWorkflowResponse,
+        update_workflow_execution,
+        UpdateWorkflowExecutionRequest,
+        UpdateWorkflowExecutionResponse,
         |r| {
             let labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
             r.extensions_mut().insert(labels);

package/sdk-core/core/Cargo.toml

@@ -21,7 +21,6 @@ save_wf_inputs = ["rmp-serde", "temporal-sdk-core-protos/serde_serialize"]
 [dependencies]
 anyhow = "1.0"
 arc-swap = "1.3"
-async-channel = "1.6"
 async-trait = "0.1"
 base64 = "0.21"
 crossbeam = "0.8"
@@ -37,7 +36,7 @@ http = "0.2"
 hyper = "0.14"
 itertools = "0.10"
 lazy_static = "1.4"
-lru = "0.9"
+lru = "0.10"
 mockall = "0.11"
 nix = "0.26"
 once_cell = "1.5"
@@ -59,7 +58,7 @@ siphasher = "0.3"
 slotmap = "1.0"
 tar = "0.4"
 thiserror = "1.0"
-tokio = { version = "1.1", features = ["rt", "rt-multi-thread", "parking_lot", "time", "fs", "process"] }
+tokio = { version = "1.26", features = ["rt", "rt-multi-thread", "parking_lot", "time", "fs", "process"] }
 tokio-util = { version = "0.7", features = ["io", "io-util"] }
 tokio-stream = "0.1"
 tonic = { version = "0.8", features = ["tls", "tls-roots"] }
@@ -94,7 +93,7 @@ assert_matches = "1.4"
 bimap = "0.6.1"
 clap = { version = "4.0", features = ["derive"] }
 criterion = "0.4"
-rstest = "0.16"
+rstest = "0.17"
 temporal-sdk-core-test-utils = { path = "../test-utils" }
 temporal-sdk = { path = "../sdk" }
 

package/sdk-core/core/src/abstractions/take_cell.rs

@@ -0,0 +1,28 @@
+use parking_lot::Mutex;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+/// Implements something a bit like a `OnceCell`, but starts already initialized and allows you
+/// to take everything out of it only once in a thread-safe way. This isn't optimized for super
+/// fast-path usage.
+pub struct TakeCell<T> {
+    taken: AtomicBool,
+    data: Mutex<Option<T>>,
+}
+
+impl<T> TakeCell<T> {
+    pub fn new(val: T) -> Self {
+        Self {
+            taken: AtomicBool::new(false),
+            data: Mutex::new(Some(val)),
+        }
+    }
+
+    /// If the cell has not already been taken from, takes the value and returns it
+    pub fn take_once(&self) -> Option<T> {
+        if self.taken.load(Ordering::Acquire) {
+            return None;
+        }
+        self.taken.store(true, Ordering::Release);
+        self.data.lock().take()
+    }
+}