Merge pull request #406 from cschleiden/copilot/fix-405

Fix duplicate workflow instance and execution ID fields in logs

Author: cschleiden

internal/workflowstate/workflowstate.go

@@ -10,7 +10,6 @@ import (
 	"github.com/cschleiden/go-workflows/backend/payload"
 	"github.com/cschleiden/go-workflows/core"
 	"github.com/cschleiden/go-workflows/internal/command"
-	"github.com/cschleiden/go-workflows/internal/log"
 	"github.com/cschleiden/go-workflows/internal/sync"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -85,9 +84,7 @@ func NewWorkflowState(instance *core.WorkflowInstance, logger *slog.Logger, trac
 		clock: clock,
 	}
 
-	state.logger = NewReplayLogger(state, logger.With(
-		log.InstanceIDKey, instance.InstanceID,
-		log.ExecutionIDKey, instance.ExecutionID))
+	state.logger = NewReplayLogger(state, logger)
 
 	return state
 }

workflow/executor/executor.go

@@ -110,11 +110,6 @@ func NewExecutor(
 		}
 	}
 
-	logger = logger.With(
-		slog.String(log.InstanceIDKey, instance.InstanceID),
-		slog.String(log.ExecutionIDKey, instance.ExecutionID),
-	)
-
 	return &executor{
 		registry:          r,
 		historyProvider:   historyProvider,
@@ -326,7 +321,7 @@ func (e *executor) executeNewEvents(newEvents []*history.Event) ([]*history.Even
 
 func (e *executor) Close() {
 	if e.workflow != nil {
-		e.logger.Debug("Stopping workflow executor", log.InstanceIDKey, e.workflowState.Instance().InstanceID)
+		e.logger.Debug("Stopping workflow executor")
 
 		// End workflow if running to prevent leaking goroutines
 		e.workflow.Close()
@@ -335,7 +330,6 @@ func (e *executor) Close() {
 
 func (e *executor) executeEvent(event *history.Event) error {
 	fields := []any{
-		log.InstanceIDKey, e.workflowState.Instance().InstanceID,
 		log.EventIDKey, event.ID,
 		log.SeqIDKey, event.SequenceID,
 		log.EventTypeKey, event.Type,