Merge branch 'master' into api-ts-patch-2

Author: feiyang3cat

openapi/openapiv2.json

@@ -11210,6 +11210,10 @@
         "onConflictOptions": {
           "$ref": "#/definitions/apiCommonV1OnConflictOptions",
           "description": "Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING."
+        },
+        "startDelay": {
+          "type": "string",
+          "description": "Time to wait before dispatching the first activity task. This delay is not applied to retry attempts."
         }
       }
     },

openapi/openapiv3.yaml

@@ -15379,6 +15379,10 @@ components:
           allOf:
             - $ref: '#/components/schemas/OnConflictOptions'
           description: Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING.
+        startDelay:
+          pattern: ^-?(?:0|[1-9][0-9]{0,11})(?:\.[0-9]{1,9})?s$
+          type: string
+          description: Time to wait before dispatching the first activity task. This delay is not applied to retry attempts.
     StartActivityExecutionResponse:
       type: object
       properties:

temporal/api/workflowservice/v1/request_response.proto

@@ -3003,6 +3003,8 @@ message StartActivityExecutionRequest {
     repeated temporal.api.common.v1.Link links = 20;
     // Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING.
     temporal.api.common.v1.OnConflictOptions on_conflict_options = 21;
+    // Time to wait before dispatching the first activity task. This delay is not applied to retry attempts.
+    google.protobuf.Duration start_delay = 22;
 }
 
 message StartActivityExecutionResponse {