should use initiated event ID instead of control / signal ID (#415)

Author: wxing1292

internal/internal_decision_state_machine.go

@@ -107,6 +107,8 @@ type (
 		decisions        map[decisionID]decisionStateMachine
 
 		scheduledEventIDToActivityID map[int64]string
+
+		scheduledEventIDToSignalID map[int64]string
 	}
 )
 
@@ -636,6 +638,8 @@ func newDecisionsHelper() *decisionsHelper {
 		decisions:        make(map[decisionID]decisionStateMachine),
 
 		scheduledEventIDToActivityID: make(map[int64]string),
+
+		scheduledEventIDToSignalID: make(map[int64]string),
 	}
 }
 
@@ -844,23 +848,32 @@ func (h *decisionsHelper) signalExternalWorkflowExecution(domain, workflowID, ru
 	return decision
 }
 
-func (h *decisionsHelper) handleSignalExternalWorkflowExecutionInitiated(signalID string) {
+func (h *decisionsHelper) handleSignalExternalWorkflowExecutionInitiated(initiatedEventID int64, signalID string) {
+	h.scheduledEventIDToSignalID[initiatedEventID] = signalID
 	decision := h.getDecision(makeDecisionID(decisionTypeSignal, signalID))
 	decision.handleInitiatedEvent()
 }
 
-func (h *decisionsHelper) handleSignalExternalWorkflowExecutionCompleted(signalID string) decisionStateMachine {
-	decision := h.getDecision(makeDecisionID(decisionTypeSignal, signalID))
+func (h *decisionsHelper) handleSignalExternalWorkflowExecutionCompleted(initiatedEventID int64) decisionStateMachine {
+	decision := h.getDecision(makeDecisionID(decisionTypeSignal, h.getSignalID(initiatedEventID)))
 	decision.handleCompletionEvent()
 	return decision
 }
 
-func (h *decisionsHelper) handleSignalExternalWorkflowExecutionFailed(signalID string) decisionStateMachine {
-	decision := h.getDecision(makeDecisionID(decisionTypeSignal, signalID))
+func (h *decisionsHelper) handleSignalExternalWorkflowExecutionFailed(initiatedEventID int64) decisionStateMachine {
+	decision := h.getDecision(makeDecisionID(decisionTypeSignal, h.getSignalID(initiatedEventID)))
 	decision.handleCompletionEvent()
 	return decision
 }
 
+func (h *decisionsHelper) getSignalID(initiatedEventID int64) string {
+	signalID, ok := h.scheduledEventIDToSignalID[initiatedEventID]
+	if !ok {
+		panic(fmt.Sprintf("unable to find signal ID: %v", initiatedEventID))
+	}
+	return signalID
+}
+
 func (h *decisionsHelper) startTimer(attributes *s.StartTimerDecisionAttributes) decisionStateMachine {
 	decision := newTimerDecisionStateMachine(attributes)
 	h.addDecision(decision)

internal/internal_event_handlers.go

@@ -616,7 +616,7 @@ func (weh *workflowExecutionEventHandlerImpl) ProcessEvent(
 
 	case m.EventTypeSignalExternalWorkflowExecutionInitiated:
 		signalID := string(event.SignalExternalWorkflowExecutionInitiatedEventAttributes.Control)
-		weh.decisionsHelper.handleSignalExternalWorkflowExecutionInitiated(signalID)
+		weh.decisionsHelper.handleSignalExternalWorkflowExecutionInitiated(event.GetEventId(), signalID)
 
 	case m.EventTypeSignalExternalWorkflowExecutionFailed:
 		weh.handleSignalExternalWorkflowExecutionFailed(event)
@@ -980,8 +980,7 @@ func (weh *workflowExecutionEventHandlerImpl) handleChildWorkflowExecutionTermin
 
 func (weh *workflowExecutionEventHandlerImpl) handleSignalExternalWorkflowExecutionCompleted(event *m.HistoryEvent) error {
 	attributes := event.ExternalWorkflowExecutionSignaledEventAttributes
-	signalID := string(attributes.Control)
-	decision := weh.decisionsHelper.handleSignalExternalWorkflowExecutionCompleted(signalID)
+	decision := weh.decisionsHelper.handleSignalExternalWorkflowExecutionCompleted(attributes.GetInitiatedEventId())
 	signal := decision.getData().(*scheduledSignal)
 	if signal.handled {
 		return nil
@@ -993,8 +992,7 @@ func (weh *workflowExecutionEventHandlerImpl) handleSignalExternalWorkflowExecut
 
 func (weh *workflowExecutionEventHandlerImpl) handleSignalExternalWorkflowExecutionFailed(event *m.HistoryEvent) error {
 	attributes := event.SignalExternalWorkflowExecutionFailedEventAttributes
-	signalID := string(attributes.Control)
-	decision := weh.decisionsHelper.handleSignalExternalWorkflowExecutionFailed(signalID)
+	decision := weh.decisionsHelper.handleSignalExternalWorkflowExecutionFailed(attributes.GetInitiatedEventId())
 	signal := decision.getData().(*scheduledSignal)
 	if signal.handled {
 		return nil