Merge branch 'main' of github.com:temporalio/temporal into david/ei

service/history/api/multioperation/api.go

@@ -159,8 +159,8 @@ func (mo *multiOp) Invoke(ctx context.Context) (*historyservice.ExecuteMultiOper
 
 	testhooks.Call(testHooks, testhooks.UpdateWithStartInBetweenLockAndStart)
 
-	// workflow hasn't been started yet: start and then apply update
-	resp, err := startAndUpdateWorkflow(ctx, starter, updater)
+	// Workflow hasn't been started yet ...
+	resp, err := mo.startAndUpdateWorkflow(ctx)
 	var noStartErr *noStartError
 	if errors.As(err, &noStartErr) {
 		// The workflow was meant to be started - but was actually *not* started.

tests/testcore/functional_test_base.go

@@ -57,7 +57,10 @@ import (
 	"go.temporal.io/server/common/primitives"
 	"go.temporal.io/server/common/primitives/timestamp"
 	"go.temporal.io/server/common/rpc"
+	"go.temporal.io/server/common/testing/historyrequire"
+	"go.temporal.io/server/common/testing/protorequire"
 	"go.temporal.io/server/common/testing/testhooks"
+	"go.temporal.io/server/common/testing/updateutils"
 	"go.temporal.io/server/environment"
 	"go.uber.org/fx"
 	"gopkg.in/yaml.v3"

tests/testcore/onebox.go

@@ -69,6 +69,7 @@ import (
 	"go.temporal.io/server/common/rpc/encryption"
 	"go.temporal.io/server/common/sdk"
 	"go.temporal.io/server/common/searchattribute"
+	"go.temporal.io/server/common/telemetry"
 	"go.temporal.io/server/common/testing/testhooks"
 	"go.temporal.io/server/service/frontend"
 	"go.temporal.io/server/service/history"