bugfix: workflow already started error metrics is not handled correct…

…ly (#518) * bugfix: workflow already started error metrics is not handled correctly
cadence-workflow · Jan 22, 2018 · 6ce4fdc · 6ce4fdc
1 parent bd9eb9f
commit 6ce4fdc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/common/persistence/persistenceMetricClients.go b/common/persistence/persistenceMetricClients.go
@@ -300,7 +300,7 @@ func (p *workflowExecutionPersistenceClient) CompleteTimerTask(request *Complete
 
 func (p *workflowExecutionPersistenceClient) updateErrorMetric(scope int, err error) {
 	switch err.(type) {
-	case *workflow.WorkflowExecutionAlreadyStartedError:
+	case *WorkflowExecutionAlreadyStartedError:
 		p.metricClient.IncCounter(scope, metrics.CadenceErrExecutionAlreadyStartedCounter)
 	case *ShardOwnershipLostError:
 		p.metricClient.IncCounter(scope, metrics.PersistenceErrShardOwnershipLostCounter)

diff --git a/service/history/handler.go b/service/history/handler.go
@@ -748,6 +748,8 @@ func (h *Handler) updateErrorMetric(scope int, err error) {
 		h.metricsClient.IncCounter(scope, metrics.CadenceErrEventAlreadyStartedCounter)
 	case *gen.BadRequestError:
 		h.metricsClient.IncCounter(scope, metrics.CadenceErrBadRequestCounter)
+	case *gen.WorkflowExecutionAlreadyStartedError:
+		h.metricsClient.IncCounter(scope, metrics.CadenceErrExecutionAlreadyStartedCounter)
 	case *gen.EntityNotExistsError:
 		h.metricsClient.IncCounter(scope, metrics.CadenceErrEntityNotExistsCounter)
 	case *gen.CancellationAlreadyRequestedError:

diff --git a/service/history/historyEngine2_test.go b/service/history/historyEngine2_test.go
@@ -789,7 +789,9 @@ func (s *engine2Suite) TestStartWorkflowExecution_StillRunning_NonDeDup() {
 			RequestId:                           common.StringPtr("newRequestID"),
 		},
 	})
-	s.NotNil(err)
+	if _, ok := err.(*workflow.WorkflowExecutionAlreadyStartedError); !ok {
+		s.Fail("return err is not *shared.WorkflowExecutionAlreadyStartedError")
+	}
 	s.Nil(resp)
 }
 
@@ -848,7 +850,9 @@ func (s *engine2Suite) TestStartWorkflowExecution_NotRunning_PrevSuccess() {
 		})
 
 		if expecedErrs[index] {
-			s.NotNil(err)
+			if _, ok := err.(*workflow.WorkflowExecutionAlreadyStartedError); !ok {
+				s.Fail("return err is not *shared.WorkflowExecutionAlreadyStartedError")
+			}
 			s.Nil(resp)
 		} else {
 			s.Nil(err)
@@ -922,7 +926,9 @@ func (s *engine2Suite) TestStartWorkflowExecution_NotRunning_PrevFail() {
 			})
 
 			if expecedErrs[j] {
-				s.NotNil(err)
+				if _, ok := err.(*workflow.WorkflowExecutionAlreadyStartedError); !ok {
+					s.Fail("return err is not *shared.WorkflowExecutionAlreadyStartedError")
+				}
 				s.Nil(resp)
 			} else {
 				s.Nil(err)