Merge branch 'master' into standalone-nexus-op

stephanos · web-flow · commit 78c8193a30f2 · 2026-04-23T10:57:42.000-07:00
diff --git a/openapi/openapiv2.json b/openapi/openapiv2.json
@@ -12268,6 +12268,11 @@
             "$ref": "#/definitions/v1Link"
           },
           "description": "Links to related entities, such as the entity that started this activity."
+        },
+        "totalHeartbeatCount": {
+          "type": "string",
+          "format": "int64",
+          "description": "Total number of heartbeats recorded across all attempts of this activity, including retries."
         }
       },
       "description": "Information about a standalone activity."
diff --git a/openapi/openapiv3.yaml b/openapi/openapiv3.yaml
@@ -8885,6 +8885,9 @@ components:
           items:
             $ref: '#/components/schemas/Link'
           description: Links to related entities, such as the entity that started this activity.
+        totalHeartbeatCount:
+          type: string
+          description: Total number of heartbeats recorded across all attempts of this activity, including retries.
       description: Information about a standalone activity.
     ActivityExecutionListInfo:
       type: object
diff --git a/temporal/api/activity/v1/message.proto b/temporal/api/activity/v1/message.proto
@@ -165,6 +165,9 @@ message ActivityExecutionInfo {
 
     // Links to related entities, such as the entity that started this activity.
     repeated temporal.api.common.v1.Link links = 33;
+
+    // Total number of heartbeats recorded across all attempts of this activity, including retries.
+    int64 total_heartbeat_count = 34;
 }
 
 // Limited activity information returned in the list response.

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,9 @@ message ActivityExecutionInfo {`
`165`	`165`
`166`	`166`	`// Links to related entities, such as the entity that started this activity.`
`167`	`167`	`repeated temporal.api.common.v1.Link links = 33;`
	`168`	`+`
	`169`	`+ // Total number of heartbeats recorded across all attempts of this activity, including retries.`
	`170`	`+ int64 total_heartbeat_count = 34;`
`168`	`171`	`}`
`169`	`172`
`170`	`173`	`// Limited activity information returned in the list response.`