revert how workflow and activity name is determined

Author: lovromazgon

backend/test/e2e.go

@@ -75,7 +75,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 				output, err := runWorkflowWithResult[string](t, ctx, c, wf, "hello")
 
 				require.Zero(t, output)
-				require.ErrorContains(t, err, "workflow github.com/cschleiden/go-workflows/backend/test.EndToEndBackendTest.func3.1 not found")
+				require.ErrorContains(t, err, "workflow 1 not found")
 			},
 		},
 		{

client/client.go

@@ -70,7 +70,7 @@ func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowIns
 	wfi := core.NewWorkflowInstance(options.InstanceID, uuid.NewString())
 	metadata := &workflow.Metadata{}
 
-	workflowName := fn.FuncName(wf)
+	workflowName := fn.Name(wf)
 
 	// Start new span for the workflow instance
 	ctx, span := c.backend.Tracer().Start(ctx, fmt.Sprintf("CreateWorkflowInstance: %s", workflowName), trace.WithAttributes(

internal/activity/executor_test.go

@@ -47,7 +47,7 @@ func TestExecutor_ExecuteActivity(t *testing.T) {
 				require.NoError(t, r.RegisterActivity(a))
 
 				return &history.ActivityScheduledAttributes{
-					Name: fn.FuncName(a),
+					Name: fn.Name(a),
 				}
 			},
 			result: func(t *testing.T, result payload.Payload, err error) {
@@ -67,7 +67,7 @@ func TestExecutor_ExecuteActivity(t *testing.T) {
 				inputs, _ := args.ArgsToInputs(converter.DefaultConverter, 42)
 
 				return &history.ActivityScheduledAttributes{
-					Name:   fn.FuncName(a),
+					Name:   fn.Name(a),
 					Inputs: inputs,
 				}
 			},
@@ -90,7 +90,7 @@ func TestExecutor_ExecuteActivity(t *testing.T) {
 				inputs, _ := args.ArgsToInputs(converter.DefaultConverter, 42)
 
 				return &history.ActivityScheduledAttributes{
-					Name:   fn.FuncName(a),
+					Name:   fn.Name(a),
 					Inputs: inputs,
 				}
 			},

internal/fn/fn.go

@@ -1,39 +1,17 @@
 package fn
 
 import (
-	"fmt"
 	"reflect"
 	"runtime"
 	"strings"
 )
 
-func FuncName(i any) string {
+func Name(i interface{}) string {
 	// Adapted from https://stackoverflow.com/a/7053871
 	fnName := runtime.FuncForPC(reflect.ValueOf(i).Pointer()).Name()
-	return strings.TrimSuffix(fnName, "-fm")
-}
-
-func StructName(v any) string {
-	t := reflect.TypeOf(v)
 
-	tt := t
-	pkgPath := tt.PkgPath()
-	for pkgPath == "" && tt.Kind() == reflect.Pointer {
-		tt = tt.Elem()
-		pkgPath = tt.PkgPath()
-	}
-	if pkgPath != "" {
-		pkgPath += "."
-	}
+	s := strings.Split(fnName, ".")
+	fnName = s[len(s)-1]
 
-	tokens := strings.Split(t.String(), ".")
-	typeName := strings.TrimPrefix(tokens[len(tokens)-1], "*")
-	if t.Kind() == reflect.Pointer {
-		typeName = fmt.Sprintf("*%v", typeName)
-		if pkgPath != "" {
-			typeName = fmt.Sprintf("(%v)", typeName)
-		}
-	}
-
-	return pkgPath + typeName
+	return strings.TrimSuffix(fnName, "-fm")
 }

internal/fn/fn_test.go

@@ -31,62 +31,27 @@ func Test_FuncName(t *testing.T) {
 		{
 			name: "function",
 			i:    bar,
-			want: "github.com/cschleiden/go-workflows/internal/fn.bar",
+			want: "bar",
 		},
 		{
 			name: "struct method",
 			i:    f.bar,
-			want: "github.com/cschleiden/go-workflows/internal/fn.(*foo).bar",
+			want: "bar",
 		},
 		{
 			name: "exported struct method",
 			i:    f.DoSomething,
-			want: "github.com/cschleiden/go-workflows/internal/fn.(*foo).DoSomething",
+			want: "DoSomething",
 		},
 		{
 			name: "anonymous function",
 			i:    func() {},
-			want: "github.com/cschleiden/go-workflows/internal/fn.Test_FuncName.func1",
+			want: "func1",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := FuncName(tt.i)
-			require.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func Test_StructName(t *testing.T) {
-	tests := []struct {
-		name string
-		i    interface{}
-		want string
-	}{
-		{
-			name: "value",
-			i:    foo{},
-			want: "github.com/cschleiden/go-workflows/internal/fn.foo",
-		},
-		{
-			name: "pointer",
-			i:    &foo{},
-			want: "github.com/cschleiden/go-workflows/internal/fn.(*foo)",
-		},
-		{
-			name: "inline value",
-			i:    struct{ foo int }{},
-			want: "struct { foo int }",
-		},
-		{
-			name: "inline pointer",
-			i:    &struct{ foo int }{},
-			want: "*struct { foo int }",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := StructName(tt.i)
+			got := Name(tt.i)
 			require.Equal(t, tt.want, got)
 		})
 	}

internal/workflow/executor_test.go

@@ -99,7 +99,7 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowWithActivity),
+								Name:   fn.Name(workflowWithActivity),
 								Inputs: []payload.Payload{},
 							},
 						),
@@ -115,7 +115,7 @@ func Test_Executor(t *testing.T) {
 				inputs, _ := converter.DefaultConverter.To(42)
 				require.IsType(t, &command.ScheduleActivityCommand{}, e.workflowState.Commands()[0])
 				require.Equal(t, command.CommandState_Committed, e.workflowState.Commands()[0].State())
-				require.Equal(t, "github.com/cschleiden/go-workflows/internal/workflow.activity1", e.workflowState.Commands()[0].(*command.ScheduleActivityCommand).Name)
+				require.Equal(t, "activity1", e.workflowState.Commands()[0].(*command.ScheduleActivityCommand).Name)
 				require.Equal(t, []payload.Payload{inputs}, e.workflowState.Commands()[0].(*command.ScheduleActivityCommand).Inputs)
 			},
 		},
@@ -151,7 +151,7 @@ func Test_Executor(t *testing.T) {
 						time.Now(),
 						history.EventType_WorkflowExecutionStarted,
 						&history.ExecutionStartedAttributes{
-							Name:   fn.FuncName(workflowWithActivity),
+							Name:   fn.Name(workflowWithActivity),
 							Inputs: []payload.Payload{},
 						},
 					),
@@ -160,7 +160,7 @@ func Test_Executor(t *testing.T) {
 						time.Now(),
 						history.EventType_ActivityScheduled,
 						&history.ActivityScheduledAttributes{
-							Name:   "github.com/cschleiden/go-workflows/internal/workflow.activity1",
+							Name:   "activity1",
 							Inputs: []payload.Payload{inputs},
 						},
 						history.ScheduleEventID(1),
@@ -212,15 +212,15 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowWithActivity),
+								Name:   fn.Name(workflowWithActivity),
 								Inputs: []payload.Payload{},
 							},
 						),
 						history.NewPendingEvent(
 							time.Now(),
 							history.EventType_ActivityScheduled,
 							&history.ActivityScheduledAttributes{
-								Name:   "github.com/cschleiden/go-workflows/internal/workflow.activity1",
+								Name:   "activity1",
 								Inputs: []payload.Payload{inputs},
 							},
 							history.ScheduleEventID(1),
@@ -305,7 +305,7 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowWithSelector),
+								Name:   fn.Name(workflowWithSelector),
 								Inputs: []payload.Payload{},
 							},
 						),
@@ -351,7 +351,7 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowWithTimer),
+								Name:   fn.Name(workflowWithTimer),
 								Inputs: []payload.Payload{},
 							},
 						),
@@ -432,7 +432,7 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowWithSignal),
+								Name:   fn.Name(workflowWithSignal),
 								Inputs: []payload.Payload{},
 							},
 						),
@@ -473,7 +473,7 @@ func Test_Executor(t *testing.T) {
 							time.Now(),
 							history.EventType_WorkflowExecutionStarted,
 							&history.ExecutionStartedAttributes{
-								Name:   fn.FuncName(workflowPanic),
+								Name:   fn.Name(workflowPanic),
 								Inputs: []payload.Payload{},
 							},
 						),
@@ -613,7 +613,7 @@ func startWorkflowTask(instanceID string, workflow interface{}, workflowArgs ...
 				time.Now(),
 				history.EventType_WorkflowExecutionStarted,
 				&history.ExecutionStartedAttributes{
-					Name:   fn.FuncName(workflow),
+					Name:   fn.Name(workflow),
 					Inputs: inputs,
 				},
 			),

internal/workflow/registry.go

@@ -67,7 +67,7 @@ func (r *Registry) RegisterWorkflow(workflow Workflow, opts ...RegisterOption) e
 	cfg := registerOptions(opts).applyRegisterOptions(RegisterConfig{})
 	name := cfg.Name
 	if name == "" {
-		name = fn.FuncName(workflow)
+		name = fn.Name(workflow)
 	}
 
 	wfType := reflect.TypeOf(workflow)
@@ -121,7 +121,7 @@ func (r *Registry) RegisterActivity(activity interface{}, opts ...RegisterOption
 	// Activity as function
 	name := cfg.Name
 	if name == "" {
-		name = fn.FuncName(activity)
+		name = fn.Name(activity)
 	}
 
 	if err := checkActivity(reflect.TypeOf(activity)); err != nil {
@@ -144,8 +144,6 @@ func (r *Registry) registerActivitiesFromStruct(a interface{}) error {
 	v := reflect.ValueOf(a)
 	t := v.Type()
 
-	structName := fn.StructName(a)
-
 	r.Lock()
 	defer r.Unlock()
 
@@ -162,10 +160,7 @@ func (r *Registry) registerActivitiesFromStruct(a interface{}) error {
 			return err
 		}
 
-		name := structName + "." + mt.Name
-		if _, ok := r.activityMap[name]; ok {
-			return &ErrActivityAlreadyRegistered{fmt.Sprintf("activity with name %q already registered", name)}
-		}
+		name := mt.Name
 		r.activityMap[name] = mv.Interface()
 	}
 

internal/workflow/registry_test.go

@@ -29,7 +29,7 @@ func TestRegistry_RegisterWorkflow(t *testing.T) {
 			args: args{
 				workflow: reg_workflow1,
 			},
-			wantName: "github.com/cschleiden/go-workflows/internal/workflow.reg_workflow1",
+			wantName: "reg_workflow1",
 		},
 		{
 			name: "valid workflow by name",
@@ -130,7 +130,7 @@ func Test_ActivityRegistration(t *testing.T) {
 	err := r.RegisterActivity(reg_activity)
 	require.NoError(t, err)
 
-	x, err := r.GetActivity("github.com/cschleiden/go-workflows/internal/workflow.reg_activity")
+	x, err := r.GetActivity("reg_activity")
 	require.NoError(t, err)
 
 	fn, ok := x.(func(context context.Context) error)
@@ -181,11 +181,11 @@ func Test_ActivityRegistrationOnStruct(t *testing.T) {
 	require.NoError(t, err)
 
 	b := &reg_activities{}
-	x, err := r.GetActivity(fn.FuncName(b.Activity1))
+	x, err := r.GetActivity(fn.Name(b.Activity1))
 	require.NoError(t, err)
 
 	// Ignore private methods
-	y, err := r.GetActivity(fn.FuncName(b.privateActivity))
+	y, err := r.GetActivity(fn.Name(b.privateActivity))
 	require.Error(t, err)
 	require.Nil(t, y)
 

tester/tester.go

@@ -262,7 +262,7 @@ func (wt *workflowTester[TResult]) OnActivity(activity workflow.Activity, args .
 	// Register activity so that we can correctly identify its arguments later
 	wt.registry.RegisterActivity(activity)
 
-	name := fn.FuncName(activity)
+	name := fn.Name(activity)
 	wt.mockedActivities[name] = true
 	return wt.ma.On(name, args...)
 }
@@ -279,7 +279,7 @@ func (wt *workflowTester[TResult]) OnSubWorkflow(workflow workflow.Workflow, arg
 	// Register workflow so that we can correctly identify its arguments later
 	wt.registry.RegisterWorkflow(workflow)
 
-	name := fn.FuncName(workflow)
+	name := fn.Name(workflow)
 	wt.mockedWorkflows[name] = true
 	return wt.mw.On(name, args...)
 }
@@ -796,7 +796,7 @@ func (wt *workflowTester[TResult]) scheduleSubWorkflow(event history.WorkflowEve
 }
 
 func (wt *workflowTester[TResult]) getInitialEvent(wf interface{}, args []interface{}) *history.Event {
-	name := fn.FuncName(wf)
+	name := fn.Name(wf)
 
 	inputs, err := margs.ArgsToInputs(wt.converter, args...)
 	if err != nil {

tester/tester_test.go

@@ -59,7 +59,7 @@ func Test_Activity(t *testing.T) {
 func Test_OverrideActivity(t *testing.T) {
 	tester := NewWorkflowTester[int](workflowWithActivity)
 
-	tester.OnActivityByName("github.com/cschleiden/go-workflows/tester.activity1", activity1, mock.Anything).Return(23, nil)
+	tester.OnActivityByName("activity1", activity1, mock.Anything).Return(23, nil)
 
 	tester.Execute(context.Background())