Support named workflows and activities

workflow/worker.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strings"
 
@@ -90,10 +91,15 @@ func getFunctionName(f interface{}) (string, error) {
 	}
 
 	callSplit := strings.Split(runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name(), ".")
-
 	funcName := callSplit[len(callSplit)-1]
 
-	if funcName == "1" {
+	const anonymousFunctionRegexp = "^func[0-9]+$"
+	isAnonymousFunc, err := regexp.MatchString(anonymousFunctionRegexp, funcName)
+	if err != nil {
+		return "", fmt.Errorf("failed to match anonymous function regexp: %w", err)
+	}
+
+	if isAnonymousFunc {
 		return "", errors.New("anonymous function name")
 	}
 
@@ -107,18 +113,43 @@ func wrapWorkflow(w Workflow) task.Orchestrator {
 	}
 }
 
+type registerOptions struct {
+	Name string
+}
+
+type registerOption func(*registerOptions) error
+
+// RegisterWithName allows you to specify a custom name for the workflow or activity being registered.
+// Activities and Workflows registered without an explicit name will use the function name as the name.
+func RegisterWithName(name string) registerOption {
+	return func(opts *registerOptions) error {
+		opts.Name = name
+		return nil
+	}
+}
+
 // RegisterWorkflow adds a workflow function to the registry
-func (ww *WorkflowWorker) RegisterWorkflow(w Workflow) error {
+func (ww *WorkflowWorker) RegisterWorkflow(w Workflow, opts ...registerOption) error {
 	wrappedOrchestration := wrapWorkflow(w)
 
-	// get the function name for the passed workflow
-	name, err := getFunctionName(w)
-	if err != nil {
-		return fmt.Errorf("failed to get workflow decorator: %v", err)
+	options := registerOptions{}
+	for _, opt := range opts {
+		if err := opt(&options); err != nil {
+			return fmt.Errorf("failed processing options: %w", err)
+		}
+	}
+
+	if options.Name == "" {
+		// get the function name for the passed workflow if there's
+		// no explicit name provided.
+		name, err := getFunctionName(w)
+		if err != nil {
+			return fmt.Errorf("failed to get workflow decorator: %v", err)
+		}
+		options.Name = name
 	}
 
-	err = ww.tasks.AddOrchestratorN(name, wrappedOrchestration)
-	return err
+	return ww.tasks.AddOrchestratorN(options.Name, wrappedOrchestration)
 }
 
 func wrapActivity(a Activity) task.Activity {
@@ -136,17 +167,27 @@ func wrapActivity(a Activity) task.Activity {
 }
 
 // RegisterActivity adds an activity function to the registry
-func (ww *WorkflowWorker) RegisterActivity(a Activity) error {
+func (ww *WorkflowWorker) RegisterActivity(a Activity, opts ...registerOption) error {
 	wrappedActivity := wrapActivity(a)
 
-	// get the function name for the passed activity
-	name, err := getFunctionName(a)
-	if err != nil {
-		return fmt.Errorf("failed to get activity decorator: %v", err)
+	options := registerOptions{}
+	for _, opt := range opts {
+		if err := opt(&options); err != nil {
+			return fmt.Errorf("failed processing options: %w", err)
+		}
+	}
+
+	if options.Name == "" {
+		// get the function name for the passed workflow if there's
+		// no explicit name provided.
+		name, err := getFunctionName(a)
+		if err != nil {
+			return fmt.Errorf("failed to get activity decorator: %v", err)
+		}
+		options.Name = name
 	}
 
-	err = ww.tasks.AddActivityN(name, wrappedActivity)
-	return err
+	return ww.tasks.AddActivityN(options.Name, wrappedActivity)
 }
 
 // Start initialises a non-blocking worker to handle workflows and activities registered