Define activity context logger values once

artefactual-labs · Sep 4, 2024 · 8b54fad · 8b54fad
1 parent d7afd45
commit 8b54fad
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/temporal/log.go b/temporal/log.go
@@ -73,9 +73,15 @@ type contextKey struct{}
 var loggerContextKey = contextKey{}
 
 func (a *activityInboundInterceptor) ExecuteActivity(ctx context.Context, in *temporalsdk_interceptor.ExecuteActivityInput) (interface{}, error) {
-	ctx = context.WithValue(ctx, loggerContextKey, a.logger)
+	info := temporalsdk_activity.GetInfo(ctx)
+	logger := a.logger.WithValues(
+		"ActivityID", info.ActivityID,
+		"ActivityType", info.ActivityType.Name,
+	)
+
+	ctx = context.WithValue(ctx, loggerContextKey, logger)
 
-	a.logger.V(1).Info("Executing activity.")
+	logger.V(1).Info("Executing activity.")
 
 	return a.Next.ExecuteActivity(ctx, in)
 }
@@ -86,12 +92,5 @@ func GetLogger(ctx context.Context) logr.Logger {
 		return logr.Discard()
 	}
 
-	logger := v.(logr.Logger)
-
-	info := temporalsdk_activity.GetInfo(ctx)
-
-	return logger.WithValues(
-		"ActivityID", info.ActivityID,
-		"ActivityType", info.ActivityType.Name,
-	)
+	return v.(logr.Logger)
 }