nil checks

Author: Evan Sandoval

internal/activity.go

@@ -356,8 +356,10 @@ func WithActivityTask(
 		zapcore.Field{Key: tagWorkflowType, Type: zapcore.StringType, String: *task.WorkflowType.Name},
 		zapcore.Field{Key: tagWorkflowID, Type: zapcore.StringType, String: *task.WorkflowExecution.WorkflowId},
 		zapcore.Field{Key: tagRunID, Type: zapcore.StringType, String: *task.WorkflowExecution.RunId},
-		zapcore.Field{Key: tagAttempt, Type: zapcore.Int32Type, Int32: *task.Attempt},
 	)
+	if task.Attempt != nil {
+		logger = logger.With(zapcore.Field{Key: tagAttempt, Type: zapcore.Int64Type, Integer: int64(*task.Attempt)})
+	}
 
 	return context.WithValue(ctx, activityEnvContextKey, &activityEnvironment{
 		taskToken:      task.TaskToken,

internal/internal_logging_tags.go

@@ -26,6 +26,7 @@ const (
 	tagDomain                      = "Domain"
 	tagEventID                     = "EventID"
 	tagEventType                   = "EventType"
+	tagAttempt                     = "Attempt"
 	tagRunID                       = "RunID"
 	tagTaskList                    = "TaskList"
 	tagTimerID                     = "TimerID"