use a sync.Map

Author: maxdml

dbos/workflow.go

@@ -719,7 +719,12 @@ func setStepParamDefaults(params *StepParams, stepName string) *StepParams {
 			BackoffFactor: 2.0,
 			BaseInterval:  100 * time.Millisecond, // Default base interval
 			MaxInterval:   5 * time.Second,        // Default max interval
-			StepName:      getTypeErasedStepName(stepName),
+			StepName: func() string {
+				if value, ok := typeErasedStepNameToStepName.Load(stepName); ok {
+					return value.(string)
+				}
+				return "" // This should never happen
+			}(),
 		}
 	}
 
@@ -733,24 +738,17 @@ func setStepParamDefaults(params *StepParams, stepName string) *StepParams {
 	if params.MaxInterval == 0 {
 		params.MaxInterval = 5 * time.Second // Default max interval
 	}
-	if params.StepName == "" {
+	if len(params.StepName) == 0 {
 		// If the step name is not provided, use the function name
-		params.StepName = getTypeErasedStepName(stepName)
+		if value, ok := typeErasedStepNameToStepName.Load(stepName); ok {
+			params.StepName = value.(string)
+		}
 	}
 
 	return params
 }
 
-var (
-	typeErasedStepNameToStepName = make(map[string]string)
-	typeErasedStepNameMutex      sync.RWMutex
-)
-
-func getTypeErasedStepName(stepName string) string {
-	typeErasedStepNameMutex.RLock()
-	defer typeErasedStepNameMutex.RUnlock()
-	return typeErasedStepNameToStepName[stepName]
-}
+var typeErasedStepNameToStepName sync.Map
 
 func RunAsStep[R any](ctx DBOSContext, fn GenericStepFunc[R]) (R, error) {
 	if ctx == nil {
@@ -766,9 +764,7 @@ func RunAsStep[R any](ctx DBOSContext, fn GenericStepFunc[R]) (R, error) {
 	// Type-erase the function
 	typeErasedFn := StepFunc(func(ctx context.Context) (any, error) { return fn(ctx) })
 	typeErasedFnName := runtime.FuncForPC(reflect.ValueOf(typeErasedFn).Pointer()).Name()
-	typeErasedStepNameMutex.Lock()
-	typeErasedStepNameToStepName[typeErasedFnName] = stepName
-	typeErasedStepNameMutex.Unlock()
+	typeErasedStepNameToStepName.LoadOrStore(typeErasedFnName, stepName)
 
 	// Call the executor method and pass through the result/error
 	result, err := ctx.RunAsStep(ctx, typeErasedFn)