diff --git a/go.mod b/go.mod index 214a08ced9b..f7f41801c93 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( go.opentelemetry.io/otel/sdk v1.4.0 go.opentelemetry.io/otel/sdk/export/metric v0.27.0 go.opentelemetry.io/otel/sdk/metric v0.27.0 - go.temporal.io/api v1.7.1-0.20220322230426-36cd7fadac67 + go.temporal.io/api v1.7.1-0.20220324004000-817724af565a go.temporal.io/sdk v1.14.0 go.temporal.io/version v0.3.0 go.uber.org/atomic v1.9.0 @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220322021311-435b647f9ef2 // indirect + google.golang.org/genproto v0.0.0-20220323144105-ec3c684e5b14 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect ) diff --git a/go.sum b/go.sum index d6d1d931158..d71470010f2 100644 --- a/go.sum +++ b/go.sum @@ -439,8 +439,8 @@ go.opentelemetry.io/otel/trace v1.4.0 h1:4OOUrPZdVFQkbzl/JSdvGCWIdw5ONXXxzHlaLlW go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.temporal.io/api v1.7.1-0.20220223032354-6e6fe738916a/go.mod h1:OnUq5eS+Nyx+irKb3Ws5YB7yjGFf5XmI3WcVRU9COEo= -go.temporal.io/api v1.7.1-0.20220322230426-36cd7fadac67 h1:FgGiyUQ0iR2B4iktL7mFaDpq6FRR6rqx5/hQeMZrp5I= -go.temporal.io/api v1.7.1-0.20220322230426-36cd7fadac67/go.mod h1:WTzSbbNciKViPgr9W7g2QHw/7m8dORozCaZjiA4kdfw= +go.temporal.io/api v1.7.1-0.20220324004000-817724af565a h1:ngzS9r49+h8nHh4snDiyk+W+16Qwh9y74D/NTUlYyMM= +go.temporal.io/api v1.7.1-0.20220324004000-817724af565a/go.mod h1:jNlSFcVPp8AngbI9JCE307fYjQN8Z/SqxzX4M2GLlIU= go.temporal.io/sdk v1.14.0 h1:7tJO72gK4xmsZ8W3Xp1rwKYdkwQ/mgnKN5LmROyZTac= go.temporal.io/sdk v1.14.0/go.mod h1:7rvvSS6oCXp19JSFQtSOhLxCX3wpEQSJZJlyCGleo9M= go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig= @@ -846,8 +846,8 @@ google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220322021311-435b647f9ef2 h1:3n0D2NdPGm0g0wrVJzXJWW5CBOoqgGBkDX9cRMJHZAY= -google.golang.org/genproto v0.0.0-20220322021311-435b647f9ef2/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220323144105-ec3c684e5b14 h1:17TOyVD+9MLIDtDJW9PdtMuVT7gNLEkN+G/xFYjZmr8= +google.golang.org/genproto v0.0.0-20220323144105-ec3c684e5b14/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= diff --git a/proto/api b/proto/api index 53ed805cb3c..00a5bcedfbf 160000 --- a/proto/api +++ b/proto/api @@ -1 +1 @@ -Subproject commit 53ed805cb3c00c3640fd9bd4418efd55da1080bd +Subproject commit 00a5bcedfbfb5e64cf8b53e980b389c46405e079 diff --git a/service/history/historyEngine_test.go b/service/history/historyEngine_test.go index 8d9598ca8d2..1be8a6fd629 100644 --- a/service/history/historyEngine_test.go +++ b/service/history/historyEngine_test.go @@ -1677,7 +1677,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityLocalDispatch() { ScheduleToStartTimeout: scheduleToStartTimeout, StartToCloseTimeout: startToCloseTimeout, HeartbeatTimeout: heartbeatTimeout, - RequestStart: false, + RequestEagerExecution: false, }}, }, { @@ -1691,7 +1691,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityLocalDispatch() { ScheduleToStartTimeout: scheduleToStartTimeout, StartToCloseTimeout: startToCloseTimeout, HeartbeatTimeout: heartbeatTimeout, - RequestStart: true, + RequestEagerExecution: true, }}, }, } diff --git a/service/history/workflowTaskHandler.go b/service/history/workflowTaskHandler.go index 23099308ca3..ae3fb464cad 100644 --- a/service/history/workflowTaskHandler.go +++ b/service/history/workflowTaskHandler.go @@ -252,7 +252,7 @@ func (handler *workflowTaskHandlerImpl) handleCommandScheduleActivity( localDispatchActivity := false namespace := handler.mutableState.GetNamespaceEntry().Name().String() - if attr.RequestStart && handler.config.EnableActivityLocalDispatch(namespace) { + if attr.RequestEagerExecution && handler.config.EnableActivityLocalDispatch(namespace) { localDispatchActivity = true }