Always log workflow instance and execution id from executor

cschleiden · cschleiden · commit abff4b050a4d · 2024-01-19T08:44:26.000-08:00
diff --git a/internal/workflow/executor.go b/internal/workflow/executor.go
@@ -93,6 +93,11 @@ func NewExecutor(
 		}
 	}
 
+	logger = logger.With(
+		slog.String(log.InstanceIDKey, instance.InstanceID),
+		slog.String(log.ExecutionIDKey, instance.ExecutionID),
+	)
+
 	// Get span from the workflow context, set by the default context propagator
 	parentSpan := workflowtracer.SpanFromContext(wfCtx)
 
@@ -114,8 +119,6 @@ func NewExecutor(
 func (e *executor) ExecuteTask(ctx context.Context, t *backend.WorkflowTask) (*ExecutionResult, error) {
 	logger := e.logger.With(
 		log.TaskIDKey, t.ID,
-		log.InstanceIDKey, t.WorkflowInstance.InstanceID,
-		log.ExecutionIDKey, t.WorkflowInstance.ExecutionID,
 	)
 
 	logger.Debug("Executing workflow task", log.TaskLastSequenceIDKey, t.LastSequenceID)

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ func NewExecutor(`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ logger = logger.With(`
	`97`	`+ slog.String(log.InstanceIDKey, instance.InstanceID),`
	`98`	`+ slog.String(log.ExecutionIDKey, instance.ExecutionID),`
	`99`	`+ )`
	`100`	`+`
`96`	`101`	`// Get span from the workflow context, set by the default context propagator`
`97`	`102`	`parentSpan := workflowtracer.SpanFromContext(wfCtx)`
`98`	`103`
`@@ -114,8 +119,6 @@ func NewExecutor(`
`114`	`119`	`func (e executor) ExecuteTask(ctx context.Context, t backend.WorkflowTask) (*ExecutionResult, error) {`
`115`	`120`	`logger := e.logger.With(`
`116`	`121`	`log.TaskIDKey, t.ID,`
`117`		`- log.InstanceIDKey, t.WorkflowInstance.InstanceID,`
`118`		`- log.ExecutionIDKey, t.WorkflowInstance.ExecutionID,`
`119`	`122`	`)`
`120`	`123`
`121`	`124`	`logger.Debug("Executing workflow task", log.TaskLastSequenceIDKey, t.LastSequenceID)`