Moving original / first run id from WorkflowExecution to WorkflowInfo

temporalio · Apr 16, 2023 · f509d36 · f509d36
1 parent 3d0f9be
commit f509d36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
@@ -573,11 +573,11 @@ func (wth *workflowTaskHandlerImpl) createWorkflowContext(task *workflowservice.
 	}
 	workflowInfo := &WorkflowInfo{
 		WorkflowExecution: WorkflowExecution{
-			ID:            workflowID,
-			RunID:         runID,
-			OriginalRunID: attributes.OriginalExecutionRunId,
-			FirstRunID:    attributes.FirstExecutionRunId,
+			ID:    workflowID,
+			RunID: runID,
 		},
+		OriginalRunID:            attributes.OriginalExecutionRunId,
+		FirstRunID:               attributes.FirstExecutionRunId,
 		WorkflowType:             WorkflowType{Name: task.WorkflowType.GetName()},
 		TaskQueueName:            taskQueue.GetName(),
 		WorkflowExecutionTimeout: common.DurationValue(attributes.GetWorkflowExecutionTimeout()),

diff --git a/internal/workflow.go b/internal/workflow.go
@@ -211,10 +211,8 @@ type (
 
 	// WorkflowExecution details.
 	WorkflowExecution struct {
-		ID            string
-		RunID         string
-		OriginalRunID string // The original runID before resetting. Using it instead of current runID can make workflow decision determinstic after reset. See also FirstRunId
-		FirstRunID    string // The very first original RunId of the current Workflow Execution preserved along the chain of ContinueAsNew, Retry, Cron and Reset. Identifies the whole Runs chain of Workflow Execution.
+		ID    string
+		RunID string
 	}
 
 	// EncodedValue is type used to encapsulate/extract encoded result from workflow/activity.
@@ -947,6 +945,8 @@ func (wc *workflowEnvironmentInterceptor) ExecuteChildWorkflow(ctx Context, chil
 // WorkflowInfo information about currently executing workflow
 type WorkflowInfo struct {
 	WorkflowExecution        WorkflowExecution
+	OriginalRunID            string // The original runID before resetting. Using it instead of current runID can make workflow decision determinstic after reset. See also FirstRunId
+	FirstRunID               string // The very first original RunId of the current Workflow Execution preserved along the chain of ContinueAsNew, Retry, Cron and Reset. Identifies the whole Runs chain of Workflow Execution.
 	WorkflowType             WorkflowType
 	TaskQueueName            string
 	WorkflowExecutionTimeout time.Duration