Actors: Vanity rename engine -> router (dapr#8658)

* Actors: Vanity rename engine -> router

Vanity package and struct rename of actor `engine` to `router`. The name
`router` far better fits the purpose of this package since its main/sole
focus is routing messages to correct targets. The whole `/pkg/actor`
package hierarchy should be considered the engine.

Signed-off-by: joshvanl <[email protected]>

* Remove unused func

Signed-off-by: joshvanl <[email protected]>

---------

Signed-off-by: joshvanl <[email protected]>
Co-authored-by: Dapr Bot <[email protected]>

Author: JoshVanL

pkg/actors/actors.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/dapr/pkg/actors/api"
-	"github.com/dapr/dapr/pkg/actors/engine"
 	"github.com/dapr/dapr/pkg/actors/hostconfig"
 	"github.com/dapr/dapr/pkg/actors/internal/apilevel"
 	"github.com/dapr/dapr/pkg/actors/internal/locker"
@@ -37,6 +36,7 @@ import (
 	internaltimers "github.com/dapr/dapr/pkg/actors/internal/timers"
 	"github.com/dapr/dapr/pkg/actors/internal/timers/inmemory"
 	"github.com/dapr/dapr/pkg/actors/reminders"
+	"github.com/dapr/dapr/pkg/actors/router"
 	actorstate "github.com/dapr/dapr/pkg/actors/state"
 	"github.com/dapr/dapr/pkg/actors/table"
 	"github.com/dapr/dapr/pkg/actors/targets"
@@ -88,7 +88,7 @@ type InitOptions struct {
 type Interface interface {
 	Init(InitOptions) error
 	Run(context.Context) error
-	Engine(context.Context) (engine.Interface, error)
+	Router(context.Context) (router.Interface, error)
 	Table(context.Context) (table.Interface, error)
 	State(context.Context) (actorstate.Interface, error)
 	Timers(context.Context) (timers.Interface, error)
@@ -117,7 +117,7 @@ type actors struct {
 	reminders      reminders.Interface
 	table          table.Interface
 	placement      placement.Interface
-	engine         engine.Interface
+	router         router.Interface
 	timerStorage   internaltimers.Storage
 	timers         timers.Interface
 	idlerQueue     *queue.Processor[string, targets.Idlable]
@@ -227,7 +227,7 @@ func (a *actors) Init(opts InitOptions) error {
 		})
 	}
 
-	a.engine = engine.New(engine.Options{
+	a.router = router.New(router.Options{
 		Namespace:          a.namespace,
 		SchedulerReminders: a.schedulerReminders,
 		Placement:          a.placement,
@@ -241,15 +241,15 @@ func (a *actors) Init(opts InitOptions) error {
 	})
 
 	a.timerStorage = inmemory.New(inmemory.Options{
-		Engine: a.engine,
+		Router: a.router,
 	})
 	a.timers = timers.New(timers.Options{
 		Storage: a.timerStorage,
 		Table:   a.table,
 	})
 
 	if a.stateReminders != nil {
-		a.stateReminders.SetEngine(a.engine)
+		a.stateReminders.SetRouter(a.router)
 	}
 
 	return nil
@@ -318,12 +318,12 @@ func (a *actors) Run(ctx context.Context) error {
 	return mngr.Run(ctx)
 }
 
-func (a *actors) Engine(ctx context.Context) (engine.Interface, error) {
+func (a *actors) Router(ctx context.Context) (router.Interface, error) {
 	if err := a.waitForReady(ctx); err != nil {
 		return nil, err
 	}
 
-	return a.engine, nil
+	return a.router, nil
 }
 
 func (a *actors) Table(ctx context.Context) (table.Interface, error) {

pkg/actors/fake/fake.go

@@ -17,11 +17,11 @@ import (
 	"context"
 
 	"github.com/dapr/dapr/pkg/actors"
-	"github.com/dapr/dapr/pkg/actors/engine"
-	enginefake "github.com/dapr/dapr/pkg/actors/engine/fake"
 	"github.com/dapr/dapr/pkg/actors/hostconfig"
 	"github.com/dapr/dapr/pkg/actors/reminders"
 	remindersfake "github.com/dapr/dapr/pkg/actors/reminders/fake"
+	"github.com/dapr/dapr/pkg/actors/router"
+	routerfake "github.com/dapr/dapr/pkg/actors/router/fake"
 	"github.com/dapr/dapr/pkg/actors/state"
 	statefake "github.com/dapr/dapr/pkg/actors/state/fake"
 	"github.com/dapr/dapr/pkg/actors/table"
@@ -33,7 +33,7 @@ import (
 type Fake struct {
 	fnInit                   func(actors.InitOptions) error
 	fnRun                    func(context.Context) error
-	fnEngine                 func(context.Context) (engine.Interface, error)
+	fnRouter                 func(context.Context) (router.Interface, error)
 	fnTable                  func(context.Context) (table.Interface, error)
 	fnState                  func(context.Context) (state.Interface, error)
 	fnTimers                 func(context.Context) (timers.Interface, error)
@@ -52,8 +52,8 @@ func New() *Fake {
 		fnRun: func(context.Context) error {
 			return nil
 		},
-		fnEngine: func(context.Context) (engine.Interface, error) {
-			return enginefake.New(), nil
+		fnRouter: func(context.Context) (router.Interface, error) {
+			return routerfake.New(), nil
 		},
 		fnTable: func(context.Context) (table.Interface, error) {
 			return nil, nil
@@ -90,8 +90,8 @@ func (f *Fake) WithRun(fn func(context.Context) error) *Fake {
 	return f
 }
 
-func (f *Fake) WithEngine(fn func(context.Context) (engine.Interface, error)) *Fake {
-	f.fnEngine = fn
+func (f *Fake) WithRouter(fn func(context.Context) (router.Interface, error)) *Fake {
+	f.fnRouter = fn
 	return f
 }
 
@@ -143,8 +143,8 @@ func (f *Fake) Run(ctx context.Context) error {
 	return f.fnRun(ctx)
 }
 
-func (f *Fake) Engine(ctx context.Context) (engine.Interface, error) {
-	return f.fnEngine(ctx)
+func (f *Fake) Router(ctx context.Context) (router.Interface, error) {
+	return f.fnRouter(ctx)
 }
 
 func (f *Fake) Table(ctx context.Context) (table.Interface, error) {

pkg/actors/internal/reminders/storage/statestore/statestore.go

@@ -31,10 +31,10 @@ import (
 
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/dapr/pkg/actors/api"
-	"github.com/dapr/dapr/pkg/actors/engine"
 	actorerrors "github.com/dapr/dapr/pkg/actors/errors"
 	"github.com/dapr/dapr/pkg/actors/internal/apilevel"
 	"github.com/dapr/dapr/pkg/actors/internal/key"
+	"github.com/dapr/dapr/pkg/actors/router"
 	actorstate "github.com/dapr/dapr/pkg/actors/state"
 	"github.com/dapr/dapr/pkg/actors/table"
 	diag "github.com/dapr/dapr/pkg/diagnostics"
@@ -74,7 +74,7 @@ type Statestore struct {
 	resiliency      resiliency.Provider
 	apiLevel        *apilevel.APILevel
 	table           table.Interface
-	engine          engine.Interface
+	router          router.Interface
 	closed          atomic.Bool
 	wg              sync.WaitGroup
 
@@ -1079,7 +1079,7 @@ func (r *Statestore) startReminder(reminder *api.Reminder, stop *reminderStop) e
 				break loop
 			}
 
-			err = r.engine.CallReminder(context.TODO(), reminder)
+			err = r.router.CallReminder(context.TODO(), reminder)
 			diag.DefaultMonitoring.ActorReminderFired(reminder.ActorType, err == nil)
 			if errors.Is(err, actorerrors.ErrReminderCanceled) {
 				nextTimer = nil
@@ -1197,8 +1197,8 @@ func (r *Statestore) updateReminderTrack(ctx context.Context, key string, repeti
 
 // TODO: :(
 // Statestore option will be removed completely in v1.16
-func (r *Statestore) SetEngine(engine engine.Interface) {
-	r.engine = engine
+func (r *Statestore) SetRouter(router router.Interface) {
+	r.router = router
 }
 
 func isEtagMismatchError(err error) bool {

pkg/actors/internal/timers/inmemory/inmemory.go

@@ -24,8 +24,8 @@ import (
 	"k8s.io/utils/clock"
 
 	"github.com/dapr/dapr/pkg/actors/api"
-	"github.com/dapr/dapr/pkg/actors/engine"
 	"github.com/dapr/dapr/pkg/actors/internal/timers"
+	"github.com/dapr/dapr/pkg/actors/router"
 	diag "github.com/dapr/dapr/pkg/diagnostics"
 	"github.com/dapr/kit/events/queue"
 	"github.com/dapr/kit/logger"
@@ -34,13 +34,13 @@ import (
 var log = logger.NewLogger("dapr.runtime.actors.timers.inmemory")
 
 type Options struct {
-	Engine engine.Interface
+	Router router.Interface
 }
 
 type inmemory struct {
 	clock clock.WithTicker
 
-	engine                engine.Interface
+	router                router.Interface
 	activeTimers          *sync.Map
 	activeTimersCount     map[string]*int64
 	activeTimersCountLock sync.RWMutex
@@ -51,7 +51,7 @@ type inmemory struct {
 // New returns a TimerProvider.
 func New(opts Options) timers.Storage {
 	i := &inmemory{
-		engine:            opts.Engine,
+		router:            opts.Router,
 		clock:             clock.RealClock{},
 		activeTimers:      &sync.Map{},
 		activeTimersCount: make(map[string]*int64),
@@ -70,7 +70,7 @@ func (i *inmemory) Close() error {
 
 // processorExecuteFn is invoked when the processor executes a reminder.
 func (i *inmemory) processorExecuteFn(reminder *api.Reminder) {
-	err := i.engine.CallReminder(context.TODO(), reminder)
+	err := i.router.CallReminder(context.TODO(), reminder)
 	diag.DefaultMonitoring.ActorTimerFired(reminder.ActorType, err == nil)
 	if err != nil {
 		// Successful and non-successful executions are treated as the same in

pkg/actors/engine/fake/fake.go renamed to pkg/actors/router/fake/fake.go

@@ -16,10 +16,10 @@ package fake
 import (
 	"testing"
 
-	"github.com/dapr/dapr/pkg/actors/engine"
+	"github.com/dapr/dapr/pkg/actors/router"
 )
 
 func Test_Fake(t *testing.T) {
 	t.Parallel()
-	var _ engine.Interface = New()
+	var _ router.Interface = New()
 }