Remove worker_instance_key as it is not needed

rkannan82 · rkannan82 · commit 0f8e48e73f6c · 2026-02-17T19:31:50.000-08:00
diff --git a/api/persistence/v1/executions.pb.go b/api/persistence/v1/executions.pb.go
diff --git a/proto/internal/temporal/server/api/persistence/v1/executions.proto b/proto/internal/temporal/server/api/persistence/v1/executions.proto
@@ -632,11 +632,8 @@ message ActivityInfo {
 
     int64 start_version = 50;
 
-    // Unique identifier of the worker that is this activity.
-    string worker_instance_key = 51;
-
     // The task queue on which the server will send control tasks to the worker running this activity.
-    string worker_control_task_queue = 52;
+    string worker_control_task_queue = 51;
 }
 
 // timer_map column
diff --git a/service/history/api/recordactivitytaskstarted/api.go b/service/history/api/recordactivitytaskstarted/api.go
@@ -242,7 +242,6 @@ func recordActivityTaskStarted(
 	if _, err := mutableState.AddActivityTaskStartedEvent(
 		ai, scheduledEventID, requestID, request.PollRequest.GetIdentity(),
 		versioningStamp, pollerDeployment, request.GetBuildIdRedirectInfo(),
-		request.PollRequest.GetWorkerInstanceKey(),
 		request.PollRequest.GetWorkerControlTaskQueue(),
 	); err != nil {
 		return nil, rejectCodeUndefined, err
diff --git a/service/history/api/respondactivitytaskcompleted/api.go b/service/history/api/respondactivitytaskcompleted/api.go
@@ -98,7 +98,6 @@ func Invoke(
 					// TODO (shahab): do we need to do anything with wf redirect in this case or any
 					// other case where an activity starts?
 					nil,
-					"", // workerInstanceKey not available for force complete
 					"", // workerControlTaskQueue not available for force complete
 				)
 				if err != nil {
diff --git a/service/history/api/respondworkflowtaskcompleted/api.go b/service/history/api/respondworkflowtaskcompleted/api.go
@@ -389,7 +389,6 @@ func (handler *WorkflowTaskCompletedHandler) Invoke(
 
 		workflowTaskHandler := newWorkflowTaskCompletedHandler(
 			request.GetIdentity(),
-			request.GetWorkerInstanceKey(),
 			request.GetWorkerControlTaskQueue(),
 			completedEvent.GetEventId(), // If completedEvent is nil, then GetEventId() returns 0 and this value shouldn't be used in workflowTaskHandler.
 			ms,
diff --git a/service/history/api/respondworkflowtaskcompleted/workflow_task_completed_handler.go b/service/history/api/respondworkflowtaskcompleted/workflow_task_completed_handler.go
@@ -53,7 +53,6 @@ type (
 
 	workflowTaskCompletedHandler struct {
 		identity                string
-		workerInstanceKey       string
 		workerControlTaskQueue  string
 		workflowTaskCompletedID int64
 
@@ -106,7 +105,6 @@ type (
 
 func newWorkflowTaskCompletedHandler(
 	identity string,
-	workerInstanceKey string,
 	workerControlTaskQueue string,
 	workflowTaskCompletedID int64,
 	mutableState historyi.MutableState,
@@ -127,7 +125,6 @@ func newWorkflowTaskCompletedHandler(
 ) *workflowTaskCompletedHandler {
 	return &workflowTaskCompletedHandler{
 		identity:                identity,
-		workerInstanceKey:       workerInstanceKey,
 		workerControlTaskQueue:  workerControlTaskQueue,
 		workflowTaskCompletedID: workflowTaskCompletedID,
 
@@ -565,7 +562,6 @@ func (handler *workflowTaskCompletedHandler) handlePostCommandEagerExecuteActivi
 		stamp,
 		nil,
 		nil,
-		handler.workerInstanceKey,
 		handler.workerControlTaskQueue,
 	); err != nil {
 		return nil, err
diff --git a/service/history/api/respondworkflowtaskcompleted/workflow_task_completed_handler_test.go b/service/history/api/respondworkflowtaskcompleted/workflow_task_completed_handler_test.go
@@ -84,7 +84,6 @@ func TestCommandProtocolMessage(t *testing.T) {
 		)
 		out.handler = newWorkflowTaskCompletedHandler( // 😲
 			t.Name(), // identity
-			"",       // workerInstanceKey
 			"",       // workerControlTaskQueue
 			123,      // workflowTaskCompletedID
 			out.ms,
diff --git a/service/history/history_engine_test.go b/service/history/history_engine_test.go
@@ -6680,7 +6680,6 @@ func addActivityTaskStartedEvent(ms historyi.MutableState, scheduledEventID int6
 		nil,
 		nil,
 		"",
-		"",
 	)
 	return event
 }
diff --git a/service/history/interfaces/mutable_state.go b/service/history/interfaces/mutable_state.go
@@ -57,7 +57,6 @@ type (
 			*commonpb.WorkerVersionStamp,
 			*deploymentpb.Deployment,
 			*taskqueuespb.BuildIdRedirectInfo,
-			string, // workerInstanceKey
 			string, // workerControlTaskQueue
 		) (*historypb.HistoryEvent, error)
 		AddActivityTaskTimedOutEvent(int64, int64, *failurepb.Failure, enumspb.RetryState) (*historypb.HistoryEvent, error)
diff --git a/service/history/interfaces/mutable_state_mock.go b/service/history/interfaces/mutable_state_mock.go
diff --git a/service/history/workflow/mutable_state_impl.go b/service/history/workflow/mutable_state_impl.go
@@ -4057,7 +4057,6 @@ func (ms *MutableStateImpl) AddActivityTaskStartedEvent(
 	versioningStamp *commonpb.WorkerVersionStamp,
 	deployment *deploymentpb.Deployment,
 	redirectInfo *taskqueuespb.BuildIdRedirectInfo,
-	workerInstanceKey string,
 	workerControlTaskQueue string,
 ) (*historypb.HistoryEvent, error) {
 	opTag := tag.WorkflowActionActivityTaskStarted
@@ -4087,7 +4086,6 @@ func (ms *MutableStateImpl) AddActivityTaskStartedEvent(
 		ai.LastDeploymentVersion = worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(deployment)
 	}
 
-	ai.WorkerInstanceKey = workerInstanceKey
 	ai.WorkerControlTaskQueue = workerControlTaskQueue
 
 	if !ai.HasRetryPolicy {
diff --git a/service/history/workflow/mutable_state_impl_restart_activity_test.go b/service/history/workflow/mutable_state_impl_restart_activity_test.go
@@ -420,7 +420,6 @@ func (s *retryActivitySuite) makeActivityAndPutIntoFailingState() *persistencesp
 		nil,
 		nil,
 		"",
-		"",
 	)
 	s.NoError(err)
 
diff --git a/service/history/workflow/mutable_state_impl_test.go b/service/history/workflow/mutable_state_impl_test.go
@@ -2879,7 +2879,6 @@ func (s *mutableStateSuite) TestRetryActivity_TruncateRetryableFailure() {
 		nil,
 		nil,
 		"",
-		"",
 	)
 	s.NoError(err)
 
@@ -2946,7 +2945,6 @@ func (s *mutableStateSuite) TestRetryActivity_PausedIncrementsStamp() {
 		nil,
 		nil,
 		"",
-		"",
 	)
 	s.NoError(err)
 
@@ -6155,7 +6153,7 @@ func (s *mutableStateSuite) TestSetContextMetadata() {
 	s.Equal(taskQueue, tq)
 }
 
-func (s *mutableStateSuite) TestAddActivityTaskStartedEventStoresWorkerInstanceKey() {
+func (s *mutableStateSuite) TestAddActivityTaskStartedEventStoresWorkerControlTaskQueue() {
 	s.mockEventsCache.EXPECT().PutEvent(gomock.Any(), gomock.Any()).AnyTimes()
 
 	// Setup workflow execution
@@ -6206,10 +6204,9 @@ func (s *mutableStateSuite) TestAddActivityTaskStartedEventStoresWorkerInstanceK
 		false,
 	)
 	s.NoError(err)
-	s.Empty(activityInfo.WorkerInstanceKey, "WorkerInstanceKey should be empty before activity starts")
+	s.Empty(activityInfo.WorkerControlTaskQueue, "WorkerControlTaskQueue should be empty before activity starts")
 
-	// Start activity with workerInstanceKey and workerControlTaskQueue
-	expectedWorkerInstanceKey := "test-worker-instance-key-12345"
+	// Start activity with workerControlTaskQueue
 	expectedWorkerControlTaskQueue := "test-control-queue"
 	_, err = s.mutableState.AddActivityTaskStartedEvent(
 		activityInfo,
@@ -6219,14 +6216,12 @@ func (s *mutableStateSuite) TestAddActivityTaskStartedEventStoresWorkerInstanceK
 		nil,
 		nil,
 		nil,
-		expectedWorkerInstanceKey,
 		expectedWorkerControlTaskQueue,
 	)
 	s.NoError(err)
 
-	// Verify workerInstanceKey and workerControlTaskQueue are stored
+	// Verify workerControlTaskQueue is stored
 	updatedActivityInfo, ok := s.mutableState.GetActivityInfo(activityInfo.ScheduledEventId)
 	s.True(ok)
-	s.Equal(expectedWorkerInstanceKey, updatedActivityInfo.WorkerInstanceKey)
 	s.Equal(expectedWorkerControlTaskQueue, updatedActivityInfo.WorkerControlTaskQueue)
 }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ func Invoke(`
`98`	`98`	`// TODO (shahab): do we need to do anything with wf redirect in this case or any`
`99`	`99`	`// other case where an activity starts?`
`100`	`100`	`nil,`
`101`		`- "", // workerInstanceKey not available for force complete`
`102`	`101`	`"", // workerControlTaskQueue not available for force complete`
`103`	`102`	`)`
`104`	`103`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ func TestCommandProtocolMessage(t *testing.T) {`
`84`	`84`	`)`
`85`	`85`	`out.handler = newWorkflowTaskCompletedHandler( // 😲`
`86`	`86`	`t.Name(), // identity`
`87`		`- "", // workerInstanceKey`
`88`	`87`	`"", // workerControlTaskQueue`
`89`	`88`	`123, // workflowTaskCompletedID`
`90`	`89`	`out.ms,`
Original file line number	Diff line number	Diff line change
`@@ -6680,7 +6680,6 @@ func addActivityTaskStartedEvent(ms historyi.MutableState, scheduledEventID int6`
`6680`	`6680`	`nil,`
`6681`	`6681`	`nil,`
`6682`	`6682`	`"",`
`6683`		`- "",`
`6684`	`6683`	`)`
`6685`	`6684`	`return event`
`6686`	`6685`	`}`