FIx missing logging field names

Author: cschleiden

samples/retries/retries.go

@@ -61,7 +61,7 @@ func RunWorker(ctx context.Context, mb backend.Backend) {
 
 func Workflow1(ctx workflow.Context, msg string) error {
 	logger := workflow.Logger(ctx)
-	logger.Debug("Entering Workflow1", msg)
+	logger.Debug("Entering Workflow1", "msg", msg)
 	defer logger.Debug("Leaving Workflow1")
 
 	// Illustrate sub workflow retries. The called workflow will fail a few times, and its execution will be retried.
@@ -84,7 +84,7 @@ var workflowCalls = 0
 
 func WorkflowWithFailures(ctx workflow.Context, msg string) error {
 	logger := workflow.Logger(ctx)
-	logger.Debug("Entering WorkflowWithFailures", msg)
+	logger.Debug("Entering WorkflowWithFailures", "msg", msg)
 	defer logger.Debug("Leaving WorkflowWithFailures")
 
 	workflowCalls++
@@ -101,7 +101,7 @@ func WorkflowWithFailures(ctx workflow.Context, msg string) error {
 		},
 	}, Activity1, 35).Get(ctx)
 	if err != nil {
-		logger.Debug("Error from Activity 1", err)
+		logger.Error("Error from Activity 1", "err", err)
 		return fmt.Errorf("getting result from activity 1: %w", err)
 	}
 

samples/subworkflow/subworkflow.go

@@ -95,13 +95,13 @@ func SubWorkflow(ctx workflow.Context, msg string) (string, error) {
 	if err != nil {
 		logger.Error("error getting activity 1 result", "err", err)
 	}
-	logger.Debug("R1 result:", r1)
+	logger.Debug("R1 result:", "r1", r1)
 
 	r2, err := workflow.ExecuteActivity[int](ctx, workflow.DefaultActivityOptions, Activity2).Get(ctx)
 	if err != nil {
 		logger.Error("error getting activity 2 result", "err", err)
 	}
-	logger.Debug("R2 result:", r2)
+	logger.Debug("R2 result:", "r2", r2)
 
 	return "W2 Result", nil
 }

samples/timer/timer.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"time"
 
+	"github.com/cschleiden/go-workflows/activity"
 	"github.com/cschleiden/go-workflows/backend"
 	"github.com/cschleiden/go-workflows/client"
 	"github.com/cschleiden/go-workflows/samples"
@@ -63,7 +64,7 @@ func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
 
 func Workflow1(ctx workflow.Context, msg string) (string, error) {
 	logger := workflow.Logger(ctx)
-	logger.Debug("Entering Workflow1, input: ", msg)
+	logger.Debug("Entering Workflow1, input: ", "msg", msg)
 	defer logger.Debug("Leaving Workflow1")
 
 	a1 := workflow.ExecuteActivity[int](ctx, workflow.DefaultActivityOptions, Activity1, 35, 12)
@@ -85,7 +86,7 @@ func Workflow1(ctx workflow.Context, msg string) (string, error) {
 				panic(err)
 			}
 
-			logger.Debug("Activity result", r)
+			logger.Debug("Activity result", "r", r)
 
 			// Cancel timer
 			cancel()
@@ -96,12 +97,13 @@ func Workflow1(ctx workflow.Context, msg string) (string, error) {
 }
 
 func Activity1(ctx context.Context, a, b int) (int, error) {
-	log.Println("Entering Activity1")
+	logger := activity.Logger(ctx)
+	logger.Debug("Entering Activity1")
 
 	time.Sleep(10 * time.Second)
 
 	defer func() {
-		log.Println("Leaving Activity1")
+		logger.Debug("Leaving Activity1")
 	}()
 
 	return a + b, nil