Merge branch 'main' into activity_pause

Author: THardy98

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "npmClient": "npm",
   "command": {
     "publish": {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/activity",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Activity sub-package",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/activity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/client",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Client sub-package",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/cloud",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK — Temporal Cloud Client",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/common",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Common library for code that's used across the Client, Worker, and/or Workflow",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/common/package.json

@@ -3,8 +3,10 @@ import {
   ApplicationFailure,
   CancelledFailure,
   ChildWorkflowFailure,
+  decodeApplicationFailureCategory,
   decodeRetryState,
   decodeTimeoutType,
+  encodeApplicationFailureCategory,
   encodeRetryState,
   encodeTimeoutType,
   FAILURE_SOURCE,
@@ -127,7 +129,9 @@ export class DefaultFailureConverter implements FailureConverter {
         failure.applicationFailureInfo.type,
         Boolean(failure.applicationFailureInfo.nonRetryable),
         arrayFromPayloads(payloadConverter, failure.applicationFailureInfo.details?.payloads),
-        this.optionalFailureToOptionalError(failure.cause, payloadConverter)
+        this.optionalFailureToOptionalError(failure.cause, payloadConverter),
+        undefined,
+        decodeApplicationFailureCategory(failure.applicationFailureInfo.category)
       );
     }
     if (failure.serverFailureInfo) {
@@ -273,6 +277,7 @@ export class DefaultFailureConverter implements FailureConverter {
                 ? { payloads: toPayloads(payloadConverter, ...err.details) }
                 : undefined,
             nextRetryDelay: msOptionalToTs(err.nextRetryDelay),
+            category: encodeApplicationFailureCategory(err.category),
           },
         };
       }

packages/common/src/converter/failure-converter.ts

@@ -101,6 +101,34 @@ export const [encodeRetryState, decodeRetryState] = makeProtoEnumConverters<
   'RETRY_STATE_'
 );
 
+/**
+ * A category to describe the severity and change the observability behavior of an application failure.
+ *
+ * Currently, observability behaviour changes are limited to:
+ * - activities that fail due to a BENIGN application failure emit DEBUG level logs and do not record metrics
+ *
+ * @experimental Category is a new feature and may be subject to change.
+ */
+export const ApplicationFailureCategory = {
+  BENIGN: 'BENIGN',
+} as const;
+
+export type ApplicationFailureCategory = (typeof ApplicationFailureCategory)[keyof typeof ApplicationFailureCategory];
+
+export const [encodeApplicationFailureCategory, decodeApplicationFailureCategory] = makeProtoEnumConverters<
+  temporal.api.enums.v1.ApplicationErrorCategory,
+  typeof temporal.api.enums.v1.ApplicationErrorCategory,
+  keyof typeof temporal.api.enums.v1.ApplicationErrorCategory,
+  typeof ApplicationFailureCategory,
+  'APPLICATION_ERROR_CATEGORY_'
+>(
+  {
+    [ApplicationFailureCategory.BENIGN]: 1,
+    UNSPECIFIED: 0,
+  } as const,
+  'APPLICATION_ERROR_CATEGORY_'
+);
+
 export type WorkflowExecution = temporal.api.common.v1.IWorkflowExecution;
 
 /**
@@ -172,7 +200,8 @@ export class ApplicationFailure extends TemporalFailure {
     public readonly nonRetryable?: boolean | undefined | null,
     public readonly details?: unknown[] | undefined | null,
     cause?: Error,
-    public readonly nextRetryDelay?: Duration | undefined | null
+    public readonly nextRetryDelay?: Duration | undefined | null,
+    public readonly category?: ApplicationFailureCategory | undefined | null
   ) {
     super(message, cause);
   }
@@ -195,8 +224,8 @@ export class ApplicationFailure extends TemporalFailure {
    * By default, will be retryable (unless its `type` is included in {@link RetryPolicy.nonRetryableErrorTypes}).
    */
   public static create(options: ApplicationFailureOptions): ApplicationFailure {
-    const { message, type, nonRetryable = false, details, nextRetryDelay, cause } = options;
-    return new this(message, type, nonRetryable, details, cause, nextRetryDelay);
+    const { message, type, nonRetryable = false, details, nextRetryDelay, cause, category } = options;
+    return new this(message, type, nonRetryable, details, cause, nextRetryDelay, category);
   }
 
   /**
@@ -261,6 +290,12 @@ export interface ApplicationFailureOptions {
    * Cause of the failure
    */
   cause?: Error;
+
+  /**
+   * Severity category of the application error.
+   * Affects worker-side logging and metrics behavior of this failure.
+   */
+  category?: ApplicationFailureCategory;
 }
 
 /**

packages/common/src/failure.ts

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/core-bridge",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Core<>Node bridge",
   "main": "index.js",
   "types": "lib/index.d.ts",

packages/core-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/create",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Create a Temporal project from template",
   "main": "cli.js",
   "bin": "cli.js",

packages/create-project/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/interceptors-opentelemetry",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK interceptors bundle for tracing with opentelemetry",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/interceptors-opentelemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/nyc-test-coverage",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK code coverage integration",
   "keywords": [
     "temporal",

packages/nyc-test-coverage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/proto",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK compiled protobuf definitions",
   "main": "protos/index.js",
   "types": "protos/index.d.ts",

packages/proto/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@temporalio/test",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Tests",
   "scripts": {
     "build": "npm-run-all build:protos build:ts",

packages/test/package.json

@@ -1,6 +1,6 @@
 import { ExecutionContext } from 'ava';
 import * as workflow from '@temporalio/workflow';
-import { HandlerUnfinishedPolicy } from '@temporalio/common';
+import { ApplicationFailureCategory, HandlerUnfinishedPolicy } from '@temporalio/common';
 import { LogEntry } from '@temporalio/worker';
 import { WorkflowFailedError, WorkflowUpdateFailedError } from '@temporalio/client';
 import { Context, helpers, makeTestFunction } from './helpers-integration';
@@ -469,3 +469,44 @@ async function assertWorkflowUpdateFailedBecauseWorkflowCompleted(t: ExecutionCo
   t.true((cause as workflow.ApplicationFailure).type === 'AcceptedUpdateCompletedWorkflow');
   t.regex((cause as workflow.ApplicationFailure).message, /Workflow completed before the Update completed/);
 }
+
+export async function raiseErrorWorkflow(useBenign: boolean): Promise<void> {
+  await workflow
+    .proxyActivities({ startToCloseTimeout: '10s', retry: { maximumAttempts: 1 } })
+    .throwApplicationFailureActivity(useBenign);
+}
+
+test('Application failure category controls log level', async (t) => {
+  const { createWorker, startWorkflow } = helpers(t);
+  const worker = await createWorker({
+    activities: {
+      async throwApplicationFailureActivity(useBenign: boolean) {
+        throw workflow.ApplicationFailure.create({
+          category: useBenign ? ApplicationFailureCategory.BENIGN : undefined,
+        });
+      },
+    },
+  });
+
+  await worker.runUntil(async () => {
+    // Run with BENIGN
+    let handle = await startWorkflow(raiseErrorWorkflow, { args: [true] });
+    try {
+      await handle.result();
+    } catch (_) {
+      const logs = recordedLogs[handle.workflowId];
+      const activityFailureLog = logs.find((log) => log.message.includes('Activity failed'));
+      t.true(activityFailureLog !== undefined && activityFailureLog.level === 'DEBUG');
+    }
+
+    // Run without BENIGN
+    handle = await startWorkflow(raiseErrorWorkflow, { args: [false] });
+    try {
+      await handle.result();
+    } catch (_) {
+      const logs = recordedLogs[handle.workflowId];
+      const activityFailureLog = logs.find((log) => log.message.includes('Activity failed'));
+      t.true(activityFailureLog !== undefined && activityFailureLog.level === 'WARN');
+    }
+  });
+});

packages/test/src/test-integration-workflows-with-recorded-logs.ts

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/testing",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Testing sub-package",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/worker",
-  "version": "1.11.5",
+  "version": "1.12.0-rc.0",
   "description": "Temporal.io SDK Worker sub-package",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",