Merge branch 'master' into expose-history

timl3136 · web-flow · commit bdd300dfe92c · 2023-10-27T12:56:36.000-07:00
diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
@@ -1683,7 +1683,7 @@ func (ath *activityTaskHandlerImpl) Execute(taskList string, t *s.PollForActivit
 							zap.String(tagWorkflowID, t.WorkflowExecution.GetWorkflowId()),
 							zap.String(tagRunID, t.WorkflowExecution.GetRunId()),
 							zap.String(tagActivityType, activityType),
-							zap.Error(err),
+							zap.Error(hbErr),
 						)
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -1683,7 +1683,7 @@ func (ath activityTaskHandlerImpl) Execute(taskList string, t s.PollForActivit`
`1683`	`1683`	`zap.String(tagWorkflowID, t.WorkflowExecution.GetWorkflowId()),`
`1684`	`1684`	`zap.String(tagRunID, t.WorkflowExecution.GetRunId()),`
`1685`	`1685`	`zap.String(tagActivityType, activityType),`
`1686`		`- zap.Error(err),`
	`1686`	`+ zap.Error(hbErr),`
`1687`	`1687`	`)`
`1688`	`1688`	`}`
`1689`	`1689`	`}`