Merge branch 'master' into create-workflow-retry-actor-not-found-master

Author: JoshVanL

.build-tools/go.mod

@@ -1,6 +1,6 @@
 module build-tools
 
-go 1.24.1
+go 1.24.4
 
 require (
 	github.com/google/go-containerregistry v0.11.1-0.20220802162123-c1f9836a4fa9

Makefile

@@ -424,7 +424,7 @@ MODFILES := $(shell find . -name go.mod)
 define modtidy-target
 .PHONY: modtidy-$(1)
 modtidy-$(1):
-	cd $(shell dirname $(1)); CGO_ENABLED=$(CGO) go mod tidy -compat=1.24.1; cd -
+	cd $(shell dirname $(1)); CGO_ENABLED=$(CGO) go mod tidy -compat=1.24.4; cd -
 endef
 
 # Generate modtidy target action for each go.mod file

docker/Dockerfile-debug

@@ -1,6 +1,6 @@
 # current directory must be ./dist
 
-FROM golang:1.24.1
+FROM golang:1.24.4
 
 ARG PKG_FILES
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

docker/Dockerfile-dev

@@ -1,7 +1,7 @@
 # Based on https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/go/.devcontainer/base.Dockerfile
 
-# [Choice] Go version: 1, 1.24.3, etc
-ARG GOVERSION=1.24.3
+# [Choice] Go version: 1, 1.24.4, etc
+ARG GOVERSION=1.24.4
 FROM golang:${GOVERSION}-bullseye
 
 # [Option] Install zsh

docker/README.md

@@ -12,7 +12,7 @@ This includes dockerfiles to build Dapr release and debug images and development
 
 The Dev Container can be rebuilt with custom options. Relevant args (and their default values) include:
 
-* `GOVERSION` (default: `1.24.1`)
+* `GOVERSION` (default: `1.24.4`)
 * `INSTALL_ZSH` (default: `true`)
 * `KUBECTL_VERSION` (default: `latest`)
 * `HELM_VERSION` (default: `latest`)

docs/development/setup-dapr-development-env.md

@@ -23,7 +23,7 @@ This document helps you get started developing Dapr. If you find any problems wh
 
 ## Go (Golang)
 
-1. Download and install [Go 1.24.1 or later](https://golang.org/doc/install#tarball).
+1. Download and install [Go 1.24.4 or later](https://golang.org/doc/install#tarball).
 
 2. Install [Delve](https://github.com/go-delve/delve/tree/master/Documentation/installation) for Go debugging, if desired.
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/dapr/dapr
 
-go 1.24.2
+go 1.24.4
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

pkg/actors/router/router.go

@@ -101,13 +101,9 @@ func New(opts Options) Interface {
 }
 
 func (r *router) Call(ctx context.Context, req *internalv1pb.InternalInvokeRequest) (*internalv1pb.InternalInvokeResponse, error) {
-	cancel, err := r.locker.LockRequest(req)
-	if err != nil {
-		return nil, err
-	}
-	defer cancel()
-
 	var res *internalv1pb.InternalInvokeResponse
+	var err error
+
 	if r.resiliency.PolicyDefined(req.GetActor().GetActorType(), resiliency.ActorPolicy{}) {
 		res, err = r.callActor(ctx, req)
 	} else {
@@ -129,25 +125,17 @@ func (r *router) Call(ctx context.Context, req *internalv1pb.InternalInvokeReque
 func (r *router) CallReminder(ctx context.Context, req *api.Reminder) error {
 	if req.SkipLock {
 		return r.callReminder(ctx, req)
-	} else {
-		cancel, err := r.locker.Lock(req.ActorType, req.ActorID)
-		if err != nil {
-			return err
-		}
-		defer cancel()
 	}
 
-	var err error
 	if r.resiliency.PolicyDefined(req.ActorType, resiliency.ActorPolicy{}) {
-		err = r.callReminder(ctx, req)
+		return r.callReminder(ctx, req)
 	} else {
 		policyRunner := resiliency.NewRunner[struct{}](ctx, r.resiliency.BuiltInPolicy(resiliency.BuiltInActorNotFoundRetries))
-		_, err = policyRunner(func(ctx context.Context) (struct{}, error) {
+		_, err := policyRunner(func(ctx context.Context) (struct{}, error) {
 			return struct{}{}, r.callReminder(ctx, req)
 		})
+		return err
 	}
-
-	return err
 }
 
 func (r *router) CallStream(ctx context.Context, req *internalv1pb.InternalInvokeRequest, stream chan<- *internalv1pb.InternalInvokeResponse) error {
@@ -196,6 +184,16 @@ func (r *router) callReminder(ctx context.Context, req *api.Reminder) error {
 		return err
 	}
 
+	if !req.SkipLock {
+		// Only lock the request if it is a local call.
+		var cancel context.CancelFunc
+		cancel, err = r.locker.Lock(req.ActorType, req.ActorID)
+		if err != nil {
+			return err
+		}
+		defer cancel()
+	}
+
 	target, _, err := r.table.GetOrCreate(req.ActorType, req.ActorID)
 	if err != nil {
 		return backoff.Permanent(err)
@@ -234,6 +232,14 @@ func (r *router) callActor(ctx context.Context, req *internalv1pb.InternalInvoke
 	}
 
 	if lar.Local {
+		// Only lock the request if it is a local call.
+		var cancel context.CancelFunc
+		cancel, err = r.locker.LockRequest(req)
+		if err != nil {
+			return nil, err
+		}
+		defer cancel()
+
 		var resp *internalv1pb.InternalInvokeResponse
 		resp, err = r.callLocalActor(ctx, req)
 		if err != nil {

pkg/actors/state/fake/fake.go

@@ -20,48 +20,48 @@ import (
 )
 
 type Fake struct {
-	getFn                         func(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error)
-	getBulkFn                     func(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error)
-	transactionalStateOperationFn func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error
+	getFn                         func(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error)
+	getBulkFn                     func(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error)
+	transactionalStateOperationFn func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error
 }
 
 func New() *Fake {
 	return &Fake{
-		getFn: func(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error) {
+		getFn: func(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error) {
 			return nil, nil
 		},
-		getBulkFn: func(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error) {
+		getBulkFn: func(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error) {
 			return api.BulkStateResponse{}, nil
 		},
-		transactionalStateOperationFn: func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error {
+		transactionalStateOperationFn: func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error {
 			return nil
 		},
 	}
 }
 
-func (f *Fake) WithGetFn(fn func(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error)) *Fake {
+func (f *Fake) WithGetFn(fn func(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error)) *Fake {
 	f.getFn = fn
 	return f
 }
 
-func (f *Fake) WithGetBulkFn(fn func(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error)) *Fake {
+func (f *Fake) WithGetBulkFn(fn func(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error)) *Fake {
 	f.getBulkFn = fn
 	return f
 }
 
-func (f *Fake) WithTransactionalStateOperationFn(fn func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error) *Fake {
+func (f *Fake) WithTransactionalStateOperationFn(fn func(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error) *Fake {
 	f.transactionalStateOperationFn = fn
 	return f
 }
 
-func (f *Fake) Get(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error) {
-	return f.getFn(ctx, req)
+func (f *Fake) Get(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error) {
+	return f.getFn(ctx, req, lock)
 }
 
-func (f *Fake) GetBulk(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error) {
-	return f.getBulkFn(ctx, req)
+func (f *Fake) GetBulk(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error) {
+	return f.getBulkFn(ctx, req, lock)
 }
 
-func (f *Fake) TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error {
-	return f.transactionalStateOperationFn(ctx, ignoreHosted, req)
+func (f *Fake) TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error {
+	return f.transactionalStateOperationFn(ctx, ignoreHosted, req, lock)
 }

pkg/actors/state/state.go

@@ -40,13 +40,13 @@ var ErrTransactionsTooManyOperations = errors.New("the transaction contains more
 
 type Interface interface {
 	// Get retrieves actor state.
-	Get(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error)
+	Get(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error)
 
 	// GetBulk retrieves actor state in bulk.
-	GetBulk(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error)
+	GetBulk(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error)
 
 	// TransactionalStateOperation performs a transactional state operation with the actor state store.
-	TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error
+	TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error
 }
 
 type Backend interface {
@@ -90,12 +90,16 @@ func New(opts Options) Interface {
 	}
 }
 
-func (s *state) Get(ctx context.Context, req *api.GetStateRequest) (*api.StateResponse, error) {
-	ctx, cancel, err := s.placement.Lock(ctx)
-	if err != nil {
-		return nil, err
+func (s *state) Get(ctx context.Context, req *api.GetStateRequest, lock bool) (*api.StateResponse, error) {
+	if lock {
+		var cancel context.CancelFunc
+		var err error
+		ctx, cancel, err = s.placement.Lock(ctx)
+		if err != nil {
+			return nil, err
+		}
+		defer cancel()
 	}
-	defer cancel()
 
 	storeName, store, err := s.stateStore()
 	if err != nil {
@@ -133,12 +137,16 @@ func (s *state) Get(ctx context.Context, req *api.GetStateRequest) (*api.StateRe
 	}, nil
 }
 
-func (s *state) GetBulk(ctx context.Context, req *api.GetBulkStateRequest) (api.BulkStateResponse, error) {
-	ctx, cancel, err := s.placement.Lock(ctx)
-	if err != nil {
-		return nil, err
+func (s *state) GetBulk(ctx context.Context, req *api.GetBulkStateRequest, lock bool) (api.BulkStateResponse, error) {
+	if lock {
+		var cancel context.CancelFunc
+		var err error
+		ctx, cancel, err = s.placement.Lock(ctx)
+		if err != nil {
+			return nil, err
+		}
+		defer cancel()
 	}
-	defer cancel()
 
 	storeName, store, err := s.stateStore()
 	if err != nil {
@@ -183,12 +191,16 @@ func (s *state) GetBulk(ctx context.Context, req *api.GetBulkStateRequest) (api.
 	return bulkRes, nil
 }
 
-func (s *state) TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest) error {
-	ctx, cancel, err := s.placement.Lock(ctx)
-	if err != nil {
-		return err
+func (s *state) TransactionalStateOperation(ctx context.Context, ignoreHosted bool, req *api.TransactionalRequest, lock bool) error {
+	if lock {
+		var cancel context.CancelFunc
+		var err error
+		ctx, cancel, err = s.placement.Lock(ctx)
+		if err != nil {
+			return err
+		}
+		defer cancel()
 	}
-	defer cancel()
 
 	if !ignoreHosted {
 		if _, ok := s.table.HostedTarget(req.ActorType, req.ActorID); !ok {
@@ -200,6 +212,7 @@ func (s *state) TransactionalStateOperation(ctx context.Context, ignoreHosted bo
 	baseKey := key.ConstructComposite(s.appID, req.ActorKey())
 	metadata := map[string]string{metadataPartitionKey: baseKey}
 	baseKey += api.DaprSeparator
+	var err error
 	for i, o := range req.Operations {
 		operations[i], err = o.StateOperation(baseKey, api.StateOperationOpts{
 			Metadata: metadata,