From 9e4f5682739a5177d42775912cfa99fd73ca0a1c Mon Sep 17 00:00:00 2001
From: Sean Kane <sean.kane@temporal.io>
Date: Tue, 7 Jul 2026 13:08:52 -0600
Subject: [PATCH] remove reset_heartbeats field in
 ResetActivityExecutionRequest

---
 buf.yaml                                             | 12 ++++++++++++
 openapi/openapiv2.json                               |  4 ----
 openapi/openapiv3.yaml                               |  5 -----
 .../api/workflowservice/v1/request_response.proto    | 12 ++++--------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/buf.yaml b/buf.yaml
index e984c1439..99679fcc2 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -13,6 +13,18 @@ breaking:
     - WIRE_JSON
   ignore:
     - google
+  ignore_only:
+    # TODO(seankane): Remove these temporary breaking-change ignores after this PR merges.
+    FIELD_SAME_JSON_NAME:
+      - temporal/api/workflowservice/v1/request_response.proto
+    FIELD_SAME_NAME:
+      - temporal/api/workflowservice/v1/request_response.proto
+    FIELD_WIRE_JSON_COMPATIBLE_TYPE:
+      - temporal/api/workflowservice/v1/request_response.proto
+    FIELD_NO_DELETE_UNLESS_NAME_RESERVED:
+      - temporal/api/workflowservice/v1/request_response.proto
+    FIELD_NO_DELETE_UNLESS_NUMBER_RESERVED:
+      - temporal/api/workflowservice/v1/request_response.proto
 lint:
   use:
     - DEFAULT
diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json
index 917fce76c..4a01d0089 100644
--- a/openapi/openapiv2.json
+++ b/openapi/openapiv2.json
@@ -11533,10 +11533,6 @@
           "type": "string",
           "description": "The identity of the client who initiated this request."
         },
-        "resetHeartbeat": {
-          "type": "boolean",
-          "description": "Indicates that activity should reset heartbeat details.\nThis flag will be applied only to the new instance of the activity."
-        },
         "keepPaused": {
           "type": "boolean",
           "title": "If activity is paused, it will remain paused after reset"
diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml
index 4ada710f0..6d2634241 100644
--- a/openapi/openapiv3.yaml
+++ b/openapi/openapiv3.yaml
@@ -14789,11 +14789,6 @@ components:
         identity:
           type: string
           description: The identity of the client who initiated this request.
-        resetHeartbeat:
-          type: boolean
-          description: |-
-            Indicates that activity should reset heartbeat details.
-             This flag will be applied only to the new instance of the activity.
         keepPaused:
           type: boolean
           description: If activity is paused, it will remain paused after reset
diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/request_response.proto
index f4012c73d..d54a9cf84 100644
--- a/temporal/api/workflowservice/v1/request_response.proto
+++ b/temporal/api/workflowservice/v1/request_response.proto
@@ -2328,24 +2328,20 @@ message ResetActivityExecutionRequest {
     // The identity of the client who initiated this request.
     string identity = 5;
 
-    // Indicates that activity should reset heartbeat details.
-    // This flag will be applied only to the new instance of the activity.
-    bool reset_heartbeat = 6;
-
     // If activity is paused, it will remain paused after reset
-    bool keep_paused = 7;
+    bool keep_paused = 6;
 
     // If set, and activity is in backoff, the activity will start at a random time within the specified jitter duration.
     // (unless it is paused and keep_paused is set)
-    google.protobuf.Duration jitter = 8;
+    google.protobuf.Duration jitter = 7;
 
     // If set, the activity options will be restored to the defaults.
     // Default options are then options activity was created with.
     // They are part of the first schedule event.
-    bool restore_original_options = 9;
+    bool restore_original_options = 8;
 
     // Resource ID for routing. Contains "workflow:{workflow_id}" for workflow activities or "activity:{activity_id}" for standalone activities.
-    string resource_id = 10;
+    string resource_id = 9;
 }
 
 // Deprecated. Use `ResetActivityExecutionRequest`.