Merge tag 'v1.6.9' into release/1.11

wXwcoder · wXwcoder · commit fb3ef08463da · 2024-08-09T15:31:13.000+08:00
# Conflicts:
#	actor/actor.go
#	actor/manager/container.go
#	actor/manager/manager.go
#	actor/mock/mock_server.go
diff --git a/actor/manager/container.go b/actor/manager/container.go
@@ -80,7 +80,7 @@ func NewDefaultActorContainerContext(ctx context.Context, actorID string, impl a
 	impl.SetID(actorID)
 	daprClient, _ := dapr.NewClient()
 	// create state manager for this new actor
-	impl.SetStateManager(state.NewActorStateManager(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
+	impl.SetStateManager(state.NewActorStateManagerContext(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
 	// move out for Activate param
 	/*err := impl.Activate(ctx)
 	if err != nil {
