@temporalio/core-bridge 1.7.4 → 1.8.1

package/Cargo.toml

@@ -26,6 +26,6 @@ prost = "0.11"
 prost-types = "0.11"
 tokio = "1.13"
 once_cell = "1.7.2"
-temporal-sdk-core = { version = "*", path = "./sdk-core/core" }
+temporal-sdk-core = { version = "*", path = "./sdk-core/core", features = ["ephemeral-server"] }
 temporal-client = { version = "*", path = "./sdk-core/client" }
 tokio-stream = "0.1"

package/lib/errors.d.ts

@@ -1,9 +1,18 @@
 import { IllegalStateError } from '@temporalio/common';
+declare const isShutdownError: unique symbol;
 /**
  * The worker has been shut down
  */
 export declare class ShutdownError extends Error {
     readonly name = "ShutdownError";
+    /**
+     * Marker to determine whether an error is an instance of TerminatedFailure.
+     */
+    protected readonly [isShutdownError] = true;
+    /**
+     * Instanceof check that works when multiple versions of @temporalio/core-bridge are installed.
+     */
+    static is(error: unknown): error is ShutdownError;
 }
 /**
  * Thrown after shutdown was requested as a response to a poll function, JS should stop polling

package/lib/errors.js

@@ -1,8 +1,10 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFromNamedError = exports.IllegalStateError = exports.UnexpectedError = exports.TransportError = exports.ShutdownError = void 0;
 const common_1 = require("@temporalio/common");
 Object.defineProperty(exports, "IllegalStateError", { enumerable: true, get: function () { return common_1.IllegalStateError; } });
+const isShutdownError = Symbol.for('__temporal_isShutdownError');
 /**
  * The worker has been shut down
  */
@@ -10,9 +12,20 @@ class ShutdownError extends Error {
     constructor() {
         super(...arguments);
         this.name = 'ShutdownError';
+        /**
+         * Marker to determine whether an error is an instance of TerminatedFailure.
+         */
+        this[_a] = true;
+    }
+    /**
+     * Instanceof check that works when multiple versions of @temporalio/core-bridge are installed.
+     */
+    static is(error) {
+        return error instanceof ShutdownError || error?.[isShutdownError] === true;
     }
 }
 exports.ShutdownError = ShutdownError;
+_a = isShutdownError;
 /**
  * Thrown after shutdown was requested as a response to a poll function, JS should stop polling
  * once this error is encountered

package/lib/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../ts/errors.ts"],"names":[],"mappings":";;;AAAA,+CAAuD;AAuB9C,kGAvBA,0BAAiB,OAuBA;AArB1B;;GAEG;AACH,MAAa,aAAc,SAAQ,KAAK;IAAxC;;QACkB,SAAI,GAAG,eAAe,CAAC;IACzC,CAAC;CAAA;AAFD,sCAEC;AAED;;;GAGG;AACH,MAAa,cAAe,SAAQ,KAAK;IAAzC;;QACkB,SAAI,GAAG,gBAAgB,CAAC;IAC1C,CAAC;CAAA;AAFD,wCAEC;AAED;;GAEG;AACH,MAAa,eAAgB,SAAQ,KAAK;IAA1C;;QACkB,SAAI,GAAG,iBAAiB,CAAC;IAC3C,CAAC;CAAA;AAFD,0CAEC;AAGD,SAAgB,qBAAqB,CAAC,CAAU,EAAE,cAAuB;IACvE,wEAAwE;IACxE,wEAAwE;IACxE,6DAA6D;IAC7D,IAAI,CAAC,YAAY,KAAK,IAAI,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;QACnE,IAAI,MAAa,CAAC;QAClB,QAAQ,CAAC,CAAC,IAAI,EAAE;YACd,KAAK,gBAAgB;gBACnB,MAAM,GAAG,IAAI,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,mBAAmB;gBACtB,MAAM,GAAG,IAAI,0BAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,eAAe;gBAClB,MAAM,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACtC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,iBAAiB;gBACpB,MAAM,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACxC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;SACjB;KACF;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AA7BD,sDA6BC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../ts/errors.ts"],"names":[],"mappings":";;;;AAAA,+CAAuD;AAsC9C,kGAtCA,0BAAiB,OAsCA;AApC1B,MAAM,eAAe,GAAkB,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAEhF;;GAEG;AACH,MAAa,aAAc,SAAQ,KAAK;IAAxC;;QACkB,SAAI,GAAG,eAAe,CAAC;QAEvC;;WAEG;QACgB,QAAiB,GAAG,IAAI,CAAC;IAQ9C,CAAC;IANC;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,KAAc;QACtB,OAAO,KAAK,YAAY,aAAa,IAAK,KAAa,EAAE,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;IACtF,CAAC;CACF;AAdD,sCAcC;KARqB,eAAe;AAUrC;;;GAGG;AACH,MAAa,cAAe,SAAQ,KAAK;IAAzC;;QACkB,SAAI,GAAG,gBAAgB,CAAC;IAC1C,CAAC;CAAA;AAFD,wCAEC;AAED;;GAEG;AACH,MAAa,eAAgB,SAAQ,KAAK;IAA1C;;QACkB,SAAI,GAAG,iBAAiB,CAAC;IAC3C,CAAC;CAAA;AAFD,0CAEC;AAID,SAAgB,qBAAqB,CAAC,CAAU,EAAE,cAAuB;IACvE,wEAAwE;IACxE,wEAAwE;IACxE,6DAA6D;IAC7D,IAAI,CAAC,YAAY,KAAK,IAAI,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;QACnE,IAAI,MAAa,CAAC;QAClB,QAAQ,CAAC,CAAC,IAAI,EAAE;YACd,KAAK,gBAAgB;gBACnB,MAAM,GAAG,IAAI,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,mBAAmB;gBACtB,MAAM,GAAG,IAAI,0BAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,eAAe;gBAClB,MAAM,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACtC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;YAEhB,KAAK,iBAAiB;gBACpB,MAAM,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACxC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,OAAO,MAAM,CAAC;SACjB;KACF;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AA7BD,sDA6BC"}

package/lib/index.d.ts

@@ -1,6 +1,9 @@
 import { SpanContext } from '@opentelemetry/api';
+import { LogLevel, Duration } from '@temporalio/common';
 import type { TLSConfig } from '@temporalio/common/lib/internal-non-workflow';
 export { TLSConfig };
+/** @deprecated Import from @temporalio/common instead */
+export { LogLevel };
 type Shadow<Base, New> = Base extends object ? New extends object ? {
     [K in keyof Base | keyof New]: K extends keyof Base ? K extends keyof New ? Shadow<Base[K], New[K]> : Base[K] : K extends keyof New ? New[K] : never;
 } : New : New;
@@ -96,7 +99,7 @@ export interface OtelCollectorExporter {
          * @format number of milliseconds or {@link https://www.npmjs.com/package/ms | ms-formatted string}
          * @defaults 1 second
          */
-        metricsExportInterval?: string | number;
+        metricsExportInterval?: Duration;
     };
 }
 /** @experimental */
@@ -241,6 +244,13 @@ export interface WorkerOptions {
      * A string that should be unique to the exact worker code/binary being executed
      */
     buildId: string;
+    /**
+     * If set true, this worker opts into the worker versioning feature. This ensures it only receives
+     * workflow tasks for workflows which it claims to be compatible with.
+     *
+     * For more information, see https://docs.temporal.io/workers#worker-versioning
+     */
+    useVersioning: boolean;
     /**
      * The task queue the worker will pull from
      */
@@ -248,6 +258,14 @@ export interface WorkerOptions {
     maxConcurrentActivityTaskExecutions: number;
     maxConcurrentWorkflowTaskExecutions: number;
     maxConcurrentLocalActivityExecutions: number;
+    /**
+     * Maximum number of Workflow tasks to poll concurrently.
+     */
+    maxConcurrentWorkflowTaskPolls: number;
+    /**
+     * Maximum number of Activity tasks to poll concurrently.
+     */
+    maxConcurrentActivityTaskPolls: number;
     /**
      * If set to `false` this worker will only handle workflow tasks and local activities, it will not
      * poll for activity tasks.
@@ -289,8 +307,6 @@ export interface WorkerOptions {
      */
     maxActivitiesPerSecond?: number;
 }
-/** Log level - must match rust log level names */
-export type LogLevel = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR';
 export interface LogEntry {
     /** Log message */
     message: string;

package/lib/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":";;;AAqhBA,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.7.4",
+  "version": "1.8.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.4.1",
-    "@temporalio/common": "1.7.4",
+    "@temporalio/common": "1.8.1",
     "arg": "^5.0.2",
     "cargo-cp-artifact": "^0.1.6",
     "which": "^2.0.2"
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb4088a8174b60b7a3fc7763ed39dbfc514a3e56"
+  "gitHead": "97808111bbec478260e915726bb9730a489f8fa4"
 }

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

@@ -26,4 +26,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: integ-test
-          args: -c "--release" -c "--all-features" -t heavy_tests -- --test-threads 1
+          args: -c "--release" -c "--features=save_wf_inputs" -t heavy_tests -- --test-threads 1

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

@@ -0,0 +1,25 @@
+name: Semgrep
+on:
+  workflow_dispatch: {}
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
+    paths:
+      - .github/workflows/semgrep.yml
+  schedule:
+    # random HH:MM to avoid a load spike on GitHub Actions at 00:00
+    - cron: '15 21 * * *'
+jobs:
+  semgrep:
+    name: semgrep/ci
+    runs-on: ubuntu-20.04
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+    container:
+      image: returntocorp/semgrep
+    if: (github.actor != 'dependabot[bot]')
+    steps:
+      - uses: actions/checkout@v3
+      - run: semgrep ci

package/sdk-core/README.md

@@ -42,6 +42,8 @@ You can buld and test the project using cargo:
 Run integ tests with `cargo integ-test`. You will need to already be running the server:
 `docker-compose -f .buildkite/docker/docker-compose.yaml up`
 
+Run load tests with `cargo test --features=save_wf_inputs --test heavy_tests`.
+
 ## Formatting
 To format all code run:
 `cargo fmt --all`

package/sdk-core/cargo-tokio-console.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+export RUSTFLAGS="--cfg tokio_unstable"
+
+cargo "$1" --features "tokio-console" "${@:2}"

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

@@ -49,7 +49,7 @@ use temporal_sdk_core_protos::{
     grpc::health::v1::health_client::HealthClient,
     temporal::api::{
         common::v1::{Header, Payload, Payloads, WorkflowExecution, WorkflowType},
-        enums::v1::{TaskQueueKind, WorkflowIdReusePolicy, WorkflowTaskFailedCause},
+        enums::v1::{TaskQueueKind, WorkflowIdReusePolicy},
         failure::v1::Failure,
         operatorservice::v1::operator_service_client::OperatorServiceClient,
         query::v1::WorkflowQuery,
@@ -525,8 +525,6 @@ pub struct Client {
     inner: ConfiguredClient<TemporalServiceClientWithMetrics>,
     /// The namespace this client interacts with
     namespace: String,
-    /// If set, attach as the worker build id to relevant calls
-    bound_worker_build_id: Option<String>,
 }
 
 impl Client {
@@ -538,7 +536,6 @@ impl Client {
         Client {
             inner: client,
             namespace,
-            bound_worker_build_id: None,
         }
     }
 
@@ -572,12 +569,6 @@ impl Client {
         Arc::make_mut(&mut self.inner.options)
     }
 
-    /// Set a worker build id to be attached to relevant requests. Unlikely to be useful outside
-    /// of core.
-    pub fn set_worker_build_id(&mut self, id: String) {
-        self.bound_worker_build_id = Some(id)
-    }
-
     /// Returns a reference to the underlying client
     pub fn inner(&self) -> &ConfiguredClient<TemporalServiceClientWithMetrics> {
         &self.inner
@@ -800,15 +791,6 @@ pub trait WorkflowClientTrait {
         failure: Option<Failure>,
     ) -> Result<RespondActivityTaskFailedResponse>;
 
-    /// Fail task by sending the failure to the server. `task_token` is the task token that would've
-    /// been received from polling for a workflow activation.
-    async fn fail_workflow_task(
-        &self,
-        task_token: TaskToken,
-        cause: WorkflowTaskFailedCause,
-        failure: Option<Failure>,
-    ) -> Result<RespondWorkflowTaskFailedResponse>;
-
     /// Send a signal to a certain workflow instance
     async fn signal_workflow_execution(
         &self,
@@ -976,6 +958,7 @@ impl WorkflowClientTrait for Client {
                 task_queue: Some(TaskQueue {
                     name: task_queue,
                     kind: TaskQueueKind::Unspecified as i32,
+                    normal_name: "".to_string(),
                 }),
                 request_id: request_id.unwrap_or_else(|| Uuid::new_v4().to_string()),
                 workflow_id_reuse_policy: options.id_reuse_policy as i32,
@@ -1023,6 +1006,7 @@ impl WorkflowClientTrait for Client {
                 result,
                 identity: self.inner.options.identity.clone(),
                 namespace: self.namespace.clone(),
+                worker_version: None,
             })
             .await?
             .into_inner())
@@ -1057,6 +1041,7 @@ impl WorkflowClientTrait for Client {
                 details,
                 identity: self.inner.options.identity.clone(),
                 namespace: self.namespace.clone(),
+                worker_version: None,
             })
             .await?
             .into_inner())
@@ -1076,33 +1061,12 @@ impl WorkflowClientTrait for Client {
                 namespace: self.namespace.clone(),
                 // TODO: Implement - https://github.com/temporalio/sdk-core/issues/293
                 last_heartbeat_details: None,
+                worker_version: None,
             })
             .await?
             .into_inner())
     }
 
-    async fn fail_workflow_task(
-        &self,
-        task_token: TaskToken,
-        cause: WorkflowTaskFailedCause,
-        failure: Option<Failure>,
-    ) -> Result<RespondWorkflowTaskFailedResponse> {
-        let request = RespondWorkflowTaskFailedRequest {
-            task_token: task_token.0,
-            cause: cause as i32,
-            failure,
-            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()
-            .respond_workflow_task_failed(request)
-            .await?
-            .into_inner())
-    }
-
     async fn signal_workflow_execution(
         &self,
         workflow_id: String,
@@ -1145,6 +1109,7 @@ impl WorkflowClientTrait for Client {
                 task_queue: Some(TaskQueue {
                     name: options.task_queue,
                     kind: TaskQueueKind::Normal as i32,
+                    normal_name: "".to_string(),
                 }),
                 input: options.input,
                 signal_name: options.signal_name,

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

@@ -759,6 +759,15 @@ proxier! {
             r.extensions_mut().insert(labels);
         }
     );
+    (
+        get_worker_task_reachability,
+        GetWorkerTaskReachabilityRequest,
+        GetWorkerTaskReachabilityResponse,
+        |r| {
+            let mut labels = AttachMetricLabels::namespace(r.get_ref().namespace.clone());
+            r.extensions_mut().insert(labels);
+        }
+    );
     (
         update_workflow_execution,
         UpdateWorkflowExecutionRequest,

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

@@ -9,7 +9,6 @@ use temporal_sdk_core_protos::{
     coresdk::workflow_commands::QueryResult,
     temporal::api::{
         common::v1::{Payload, Payloads},
-        enums::v1::WorkflowTaskFailedCause,
         failure::v1::Failure,
         query::v1::WorkflowQuery,
         workflowservice::v1::*,
@@ -326,21 +325,6 @@ where
         )
     }
 
-    async fn fail_workflow_task(
-        &self,
-        task_token: TaskToken,
-        cause: WorkflowTaskFailedCause,
-        failure: Option<Failure>,
-    ) -> Result<RespondWorkflowTaskFailedResponse> {
-        retry_call!(
-            self,
-            fail_workflow_task,
-            task_token.clone(),
-            cause,
-            failure.clone()
-        )
-    }
-
     async fn signal_workflow_execution(
         &self,
         workflow_id: String,

package/sdk-core/core/Cargo.toml

@@ -13,23 +13,27 @@ categories = ["development-tools"]
 [lib]
 
 [features]
+default = []
 # Do not enable this feature when building production SDKs. If we ever want a user in the field to
 # record WF input data, we can build them a custom SDK or they can build - it adds significant extra
 # code size in the form of [de]serializers.
 save_wf_inputs = ["rmp-serde", "temporal-sdk-core-protos/serde_serialize"]
+tokio-console = ["console-subscriber"]
+ephemeral-server = ["dep:flate2", "dep:nix", "dep:reqwest", "dep:tar", "dep:zip"]
 
 [dependencies]
 anyhow = "1.0"
 arc-swap = "1.3"
 async-trait = "0.1"
 base64 = "0.21"
+console-subscriber = { version = "0.1", optional = true }
 crossbeam = "0.8"
 dashmap = "5.0"
 derive_builder = "0.12"
 derive_more = "0.99"
 enum_dispatch = "0.3"
 enum-iterator = "1.4"
-flate2 = "1.0"
+flate2 = { version = "1.0", optional = true }
 futures = "0.3"
 futures-util = "0.3"
 governor = "0.5"
@@ -39,7 +43,7 @@ itertools = "0.10"
 lazy_static = "1.4"
 lru = "0.10"
 mockall = "0.11"
-nix = "0.26"
+nix = { version = "0.26", optional = true }
 once_cell = "1.5"
 opentelemetry = { version = "0.18", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.11", features = ["tokio", "metrics"] }
@@ -50,14 +54,14 @@ prometheus = "0.13"
 prost = "0.11"
 prost-types = { version = "0.4", package = "prost-wkt-types" }
 rand = "0.8.3"
-reqwest = { version = "0.11", features = ["json", "stream", "rustls-tls", "tokio-rustls"], default-features = false }
+reqwest = { version = "0.11", features = ["json", "stream", "rustls-tls", "tokio-rustls"], default-features = false, optional = true }
 ringbuf = "0.3"
 rmp-serde = { version = "1.1", optional = true }
 serde = "1.0"
 serde_json = "1.0"
 siphasher = "0.3"
 slotmap = "1.0"
-tar = "0.4"
+tar = { version = "0.4", optional = true }
 thiserror = "1.0"
 tokio = { version = "1.26", features = ["rt", "rt-multi-thread", "parking_lot", "time", "fs", "process"] }
 tokio-util = { version = "0.7", features = ["io", "io-util"] }
@@ -69,7 +73,7 @@ tracing-opentelemetry = "0.18"
 tracing-subscriber = { version = "0.3", features = ["parking_lot", "env-filter", "registry"] }
 url = "2.2"
 uuid = { version = "1.1", features = ["v4"] }
-zip = "0.6.3"
+zip = { version = "0.6.3", optional = true }
 
 # 1st party local deps
 [dependencies.temporal-sdk-core-api]

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

@@ -4,7 +4,6 @@ pub mod take_cell;
 
 use crate::MetricsContext;
 use derive_more::DebugCustom;
-use futures::{stream, Stream, StreamExt};
 use std::{
     fmt::{Debug, Formatter},
     sync::{
@@ -47,6 +46,11 @@ impl MeteredSemaphore {
         self.sem.available_permits()
     }
 
+    #[cfg(test)]
+    pub fn unused_permits(&self) -> usize {
+        self.sem.available_permits() + self.unused_claimants.load(Ordering::Acquire)
+    }
+
     pub async fn acquire_owned(&self) -> Result<OwnedMeteredSemPermit, AcquireError> {
         let res = self.sem.clone().acquire_owned().await?;
         Ok(self.build_owned(res))
@@ -114,8 +118,8 @@ impl ClosableMeteredSemaphore {
 
 impl ClosableMeteredSemaphore {
     #[cfg(test)]
-    pub fn available_permits(&self) -> usize {
-        self.inner.available_permits()
+    pub fn unused_permits(&self) -> usize {
+        self.inner.unused_permits()
     }
 
     /// Request to close the semaphore and prevent new permits from being acquired.
@@ -231,35 +235,6 @@ impl UsedMeteredSemPermit {
     }
 }
 
-/// From the input stream, create a new stream which only pulls from the input stream when allowed.
-/// When allowed is determined by the passed in `proceeder` emitting an item. The input stream is
-/// only pulled from when that future resolves.
-///
-/// This is *almost* identical to `zip`, but does not terminate early if the input stream closes.
-/// The proceeder must allow the poll before the returned stream closes. If the proceeder terminates
-/// the overall stream will terminate.
-pub(crate) fn stream_when_allowed<S, AS>(
-    input: S,
-    proceeder: AS,
-) -> impl Stream<Item = (S::Item, AS::Item)>
-where
-    S: Stream + Send + 'static,
-    AS: Stream + Send + 'static,
-{
-    let stream = stream::unfold(
-        (proceeder.boxed(), input.boxed()),
-        |(mut proceeder, mut input)| async {
-            let v = proceeder.next().await;
-            if let Some(v) = v {
-                input.next().await.map(|i| ((i, v), (proceeder, input)))
-            } else {
-                None
-            }
-        },
-    );
-    stream
-}
-
 macro_rules! dbg_panic {
   ($($arg:tt)*) => {
       error!($($arg)*);
@@ -271,49 +246,6 @@ pub(crate) use dbg_panic;
 #[cfg(test)]
 mod tests {
     use super::*;
-    use futures::pin_mut;
-    use std::task::Poll;
-    use tokio::sync::mpsc::unbounded_channel;
-    use tokio_stream::wrappers::UnboundedReceiverStream;
-
-    #[test]
-    fn stream_when_allowed_works() {
-        let inputs = stream::iter([1, 2, 3]);
-        let (allow_tx, allow_rx) = unbounded_channel();
-        let when_allowed = stream_when_allowed(inputs, UnboundedReceiverStream::new(allow_rx));
-
-        let waker = futures::task::noop_waker_ref();
-        let mut cx = std::task::Context::from_waker(waker);
-        pin_mut!(when_allowed);
-
-        allow_tx.send(()).unwrap();
-        assert_eq!(
-            when_allowed.poll_next_unpin(&mut cx),
-            Poll::Ready(Some((1, ())))
-        );
-        // Now, it won't be ready
-        for _ in 1..10 {
-            assert_eq!(when_allowed.poll_next_unpin(&mut cx), Poll::Pending);
-        }
-        allow_tx.send(()).unwrap();
-        assert_eq!(
-            when_allowed.poll_next_unpin(&mut cx),
-            Poll::Ready(Some((2, ())))
-        );
-        for _ in 1..10 {
-            assert_eq!(when_allowed.poll_next_unpin(&mut cx), Poll::Pending);
-        }
-        allow_tx.send(()).unwrap();
-        assert_eq!(
-            when_allowed.poll_next_unpin(&mut cx),
-            Poll::Ready(Some((3, ())))
-        );
-        for _ in 1..10 {
-            assert_eq!(when_allowed.poll_next_unpin(&mut cx), Poll::Pending);
-        }
-        allow_tx.send(()).unwrap();
-        assert_eq!(when_allowed.poll_next_unpin(&mut cx), Poll::Ready(None));
-    }
 
     #[tokio::test]
     async fn closable_semaphore_permit_drop_returns_permit() {

package/sdk-core/core/src/core_tests/activity_tasks.rs

@@ -1058,26 +1058,34 @@ async fn graceful_shutdown(#[values(true, false)] at_max_outstanding: bool) {
     let _task_q = "q";
     let grace_period = Duration::from_millis(200);
     let mut tasks = three_tasks();
-    let mut mock_client = mock_workflow_client();
-    mock_client
-        .expect_poll_activity_task()
+    let mut mock_act_poller = mock_poller();
+    mock_act_poller
+        .expect_poll()
         .times(3)
-        .returning(move |_, _| Ok(tasks.pop_front().unwrap()));
+        .returning(move || Some(Ok(tasks.pop_front().unwrap())));
+    mock_act_poller
+        .expect_poll()
+        .times(1)
+        .returning(move || None);
     // They shall all be reported as failed
+    let mut mock_client = mock_workflow_client();
     mock_client
         .expect_fail_activity_task()
         .times(3)
         .returning(|_, _| Ok(Default::default()));
 
     let max_outstanding = if at_max_outstanding { 3_usize } else { 100 };
-    let worker = Worker::new_test(
-        test_worker_cfg()
+    let mw = MockWorkerInputs {
+        act_poller: Some(Box::from(mock_act_poller)),
+        config: test_worker_cfg()
             .graceful_shutdown_period(grace_period)
             .max_outstanding_activities(max_outstanding)
+            .max_concurrent_at_polls(1_usize) // Makes test logic simple
             .build()
             .unwrap(),
-        mock_client,
-    );
+        ..Default::default()
+    };
+    let worker = mock_worker(MocksHolder::from_mock_worker(mock_client, mw));
 
     let _1 = worker.poll_activity_task().await.unwrap();