Fix integration tests.

Author: eamsden

packages/common/src/interceptors.ts

@@ -33,7 +33,7 @@ export function composeInterceptorsWith<I, M extends keyof I>(
   next: Next<I, M>,
   wrapNext: WrapNext
 ): Next<I, M> {
-  let composedNext: any = wrapNext(next as any);
+  let composedNext: any = next;
   for (let i = interceptors.length - 1; i >= 0; --i) {
     const interceptor = interceptors[i];
     if (interceptor?.[method] !== undefined) {

packages/test/src/test-interceptors.ts

@@ -258,6 +258,7 @@ if (RUN_INTEGRATION_TESTS) {
         ApplicationFailure: Expected anything other than 1
             at $CLASS.nonRetryable (common/src/failure.ts)
             at Object.continueAsNew (test/src/workflows/interceptor-example.ts)
+            at composedNext (common/src/interceptors.ts)
             at workflow/src/workflow.ts
             at continueAsNewToDifferentWorkflow (test/src/workflows/continue-as-new-to-different-workflow.ts)
       `;

packages/workflow/src/interceptor-composition.ts

@@ -23,11 +23,9 @@ import { getActivator } from './global-attributes';
  * explicitly establishes its own scope.
  */
 export function composeInterceptors<I, M extends keyof I>(interceptors: I[], method: M, next: Next<I, M>): Next<I, M> {
-  return ((input: any) => {
-    const activator = getActivator();
-    return (
-      composeInterceptorsWith(interceptors, method, next, ((wrappedNext) =>
-        activator.bindCurrentRandom(wrappedNext as any)) as <F extends (...args: any[]) => any>(next: F) => F) as any
-    )(input);
-  }) as unknown as Next<I, M>;
+  const activator = getActivator();
+  return composeInterceptorsWith(interceptors, method, next, ((wrappedNext) =>
+    activator.bindCurrentRandom(wrappedNext as any)) as <F extends (...args: any[]) => any>(
+    next: F
+  ) => F) as unknown as Next<I, M>;
 }

packages/workflow/src/internals.ts

@@ -528,8 +528,17 @@ export class Activator implements ActivationHandler {
   }
 
   public bindCurrentRandom<T extends (...args: any[]) => any>(fn: T): T {
-    const randomSource = this.currentRandomStorage?.getStore();
-    return ((...args: Parameters<T>) => this.withRandomSource(randomSource, () => fn(...args))) as unknown as T;
+    const storage = (this.currentRandomStorage ??= new AsyncLocalStorage<ScopedWorkflowRandomSource | undefined>());
+    const randomSource = storage.getStore();
+    const bind = (
+      AsyncLocalStorage as typeof AsyncLocalStorage & {
+        bind?: <F extends (...args: any[]) => any>(fn: F) => F;
+      }
+    ).bind;
+    if (bind) {
+      return storage.run(randomSource, () => bind(fn)) as T;
+    }
+    return ((...args: Parameters<T>) => storage.run(randomSource, () => fn(...args))) as unknown as T;
   }
 
   public currentRandom(): number {

packages/workflow/src/workflow.ts

@@ -67,7 +67,6 @@ import {
   DefaultQueryHandler,
 } from './interfaces';
 import { LocalActivityDoBackoff } from './errors';
-import { currentRandom } from './current-random';
 import { assertInWorkflowContext, getActivator, maybeGetActivator } from './global-attributes';
 import { uuid4FromRandom } from './random-helpers';
 import { untrackPromise } from './stack-helpers';
@@ -1067,7 +1066,8 @@ export function continueAsNew<F extends Workflow>(...args: Parameters<F>): Promi
  * See the {@link https://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid | stackoverflow discussion}.
  */
 export function uuid4(): string {
-  return uuid4FromRandom(currentRandom);
+  const activator = maybeGetActivator();
+  return uuid4FromRandom(activator ? () => activator.currentRandom() : Math.random);
 }
 
 /**