From 30ecd06af08964fabc56e6912eae4672e1278041 Mon Sep 17 00:00:00 2001 From: Yuri Date: Fri, 25 Apr 2025 12:50:00 -0700 Subject: [PATCH 1/4] Add reset info to the activity heartbeat response --- openapi/openapiv2.json | 8 ++++++++ openapi/openapiv3.yaml | 8 ++++++++ temporal/api/workflowservice/v1/request_response.proto | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json index 343c9f702..9b9581104 100644 --- a/openapi/openapiv2.json +++ b/openapi/openapiv2.json @@ -12216,6 +12216,14 @@ "activityPaused": { "type": "boolean", "description": "Will be set to true if the activity is paused." + }, + "activityReset": { + "type": "boolean", + "description": "Will be set to true if the activity was reset.\nApplyes only to the current run." + }, + "heartbeatReset": { + "type": "boolean", + "description": "Will be set to true if the activity heartbeat was reset." } } }, diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml index cc5a7315f..cd8aa208f 100644 --- a/openapi/openapiv3.yaml +++ b/openapi/openapiv3.yaml @@ -9281,6 +9281,14 @@ components: activityPaused: type: boolean description: Will be set to true if the activity is paused. + activityReset: + type: boolean + description: |- + Will be set to true if the activity was reset. + Applyes only to the current run. + heartbeatReset: + type: boolean + description: Will be set to true if the activity heartbeat was reset. RegisterNamespaceRequest: type: object properties: diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/request_response.proto index 011c192cd..430980cfb 100644 --- a/temporal/api/workflowservice/v1/request_response.proto +++ b/temporal/api/workflowservice/v1/request_response.proto @@ -529,6 +529,13 @@ message RecordActivityTaskHeartbeatResponse { // Will be set to true if the activity is paused. bool activity_paused = 2; + + // Will be set to true if the activity was reset. + // Applyes only to the current run. + bool activity_reset = 3; + + // Will be set to true if the activity heartbeat was reset. + bool heartbeat_reset = 4; } message RecordActivityTaskHeartbeatByIdRequest { From f26278fbab20bac02e8ae37c19aa79be3a0319f2 Mon Sep 17 00:00:00 2001 From: Yuri Date: Fri, 25 Apr 2025 14:44:53 -0700 Subject: [PATCH 2/4] comments typo --- openapi/openapiv2.json | 2 +- openapi/openapiv3.yaml | 2 +- temporal/api/workflowservice/v1/request_response.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json index 9b9581104..153d5b88c 100644 --- a/openapi/openapiv2.json +++ b/openapi/openapiv2.json @@ -12219,7 +12219,7 @@ }, "activityReset": { "type": "boolean", - "description": "Will be set to true if the activity was reset.\nApplyes only to the current run." + "description": "Will be set to true if the activity was reset.\nApplies only to the current run." }, "heartbeatReset": { "type": "boolean", diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml index cd8aa208f..b5369c5ef 100644 --- a/openapi/openapiv3.yaml +++ b/openapi/openapiv3.yaml @@ -9285,7 +9285,7 @@ components: type: boolean description: |- Will be set to true if the activity was reset. - Applyes only to the current run. + Applies only to the current run. heartbeatReset: type: boolean description: Will be set to true if the activity heartbeat was reset. diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/request_response.proto index 430980cfb..9b3bbe192 100644 --- a/temporal/api/workflowservice/v1/request_response.proto +++ b/temporal/api/workflowservice/v1/request_response.proto @@ -531,7 +531,7 @@ message RecordActivityTaskHeartbeatResponse { bool activity_paused = 2; // Will be set to true if the activity was reset. - // Applyes only to the current run. + // Applies only to the current run. bool activity_reset = 3; // Will be set to true if the activity heartbeat was reset. From d8071bc5bf430f57de53e0924dada60ca2edd6e7 Mon Sep 17 00:00:00 2001 From: Yuri Date: Mon, 28 Apr 2025 16:44:57 -0700 Subject: [PATCH 3/4] remove reset_heartbeat --- openapi/openapiv2.json | 4 ---- openapi/openapiv3.yaml | 3 --- temporal/api/workflowservice/v1/request_response.proto | 3 --- 3 files changed, 10 deletions(-) diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json index 153d5b88c..00c83ce06 100644 --- a/openapi/openapiv2.json +++ b/openapi/openapiv2.json @@ -12220,10 +12220,6 @@ "activityReset": { "type": "boolean", "description": "Will be set to true if the activity was reset.\nApplies only to the current run." - }, - "heartbeatReset": { - "type": "boolean", - "description": "Will be set to true if the activity heartbeat was reset." } } }, diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml index b5369c5ef..17e45030d 100644 --- a/openapi/openapiv3.yaml +++ b/openapi/openapiv3.yaml @@ -9286,9 +9286,6 @@ components: description: |- Will be set to true if the activity was reset. Applies only to the current run. - heartbeatReset: - type: boolean - description: Will be set to true if the activity heartbeat was reset. RegisterNamespaceRequest: type: object properties: diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/request_response.proto index 9b3bbe192..6798b4b31 100644 --- a/temporal/api/workflowservice/v1/request_response.proto +++ b/temporal/api/workflowservice/v1/request_response.proto @@ -533,9 +533,6 @@ message RecordActivityTaskHeartbeatResponse { // Will be set to true if the activity was reset. // Applies only to the current run. bool activity_reset = 3; - - // Will be set to true if the activity heartbeat was reset. - bool heartbeat_reset = 4; } message RecordActivityTaskHeartbeatByIdRequest { From ac5051e5cf3f619ad2c3f02e8d148058c6928061 Mon Sep 17 00:00:00 2001 From: Yuri Date: Tue, 29 Apr 2025 15:23:48 -0700 Subject: [PATCH 4/4] add reset flag to another response (by ID) --- openapi/openapiv2.json | 4 ++++ openapi/openapiv3.yaml | 5 +++++ .../workflowservice/v1/request_response.proto | 18 +++++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json index 00c83ce06..d5c1f8632 100644 --- a/openapi/openapiv2.json +++ b/openapi/openapiv2.json @@ -12203,6 +12203,10 @@ "activityPaused": { "type": "boolean", "description": "Will be set to true if the activity is paused." + }, + "activityReset": { + "type": "boolean", + "description": "Will be set to true if the activity was reset.\nApplies only to the current run." } } }, diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml index 17e45030d..0d3d43614 100644 --- a/openapi/openapiv3.yaml +++ b/openapi/openapiv3.yaml @@ -9254,6 +9254,11 @@ components: activityPaused: type: boolean description: Will be set to true if the activity is paused. + activityReset: + type: boolean + description: |- + Will be set to true if the activity was reset. + Applies only to the current run. RecordActivityTaskHeartbeatRequest: type: object properties: diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/request_response.proto index 6798b4b31..4f1d09adc 100644 --- a/temporal/api/workflowservice/v1/request_response.proto +++ b/temporal/api/workflowservice/v1/request_response.proto @@ -557,6 +557,10 @@ message RecordActivityTaskHeartbeatByIdResponse { // Will be set to true if the activity is paused. bool activity_paused = 2; + + // Will be set to true if the activity was reset. + // Applies only to the current run. + bool activity_reset = 3; } message RespondActivityTaskCompletedRequest { @@ -1844,13 +1848,13 @@ message UpdateActivityOptionsRequest { // Controls which fields from `activity_options` will be applied google.protobuf.FieldMask update_mask = 5; - // either activity id or activity type must be provided - oneof activity { - // Only activity with this ID will be updated. - string id = 6; - // Update all running activities of this type. - string type = 7; - } + // either activity id or activity type must be provided + oneof activity { + // Only activity with this ID will be updated. + string id = 6; + // Update all running activities of this type. + string type = 7; + } } message UpdateActivityOptionsResponse {