From 79a572de6bb649d31539ce67c8885c5cec6bacf9 Mon Sep 17 00:00:00 2001 From: Yu Xia Date: Thu, 1 Dec 2022 09:37:46 -0800 Subject: [PATCH] Remove empty visibility tag (#3681) --- .../persistence/visibility/visibility_manager_test.go | 10 ---------- .../visibility/visiblity_manager_metrics.go | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/common/persistence/visibility/visibility_manager_test.go b/common/persistence/visibility/visibility_manager_test.go index d684a321172..9a07481cc51 100644 --- a/common/persistence/visibility/visibility_manager_test.go +++ b/common/persistence/visibility/visibility_manager_test.go @@ -104,7 +104,6 @@ func (s *VisibilityManagerSuite) TestRecordWorkflowExecutionStarted() { WithTags( metrics.OperationTag(metrics.VisibilityPersistenceRecordWorkflowExecutionStartedScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) s.NoError(s.visibilityManager.RecordWorkflowExecutionStarted(context.Background(), request)) @@ -131,7 +130,6 @@ func (s *VisibilityManagerSuite) TestRecordWorkflowExecutionClosed() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceRecordWorkflowExecutionClosedScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) s.NoError(s.visibilityManager.RecordWorkflowExecutionClosed(context.Background(), request)) @@ -151,7 +149,6 @@ func (s *VisibilityManagerSuite) TestListOpenWorkflowExecutions() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListOpenWorkflowExecutionsScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListOpenWorkflowExecutions(context.Background(), request) @@ -173,7 +170,6 @@ func (s *VisibilityManagerSuite) TestListClosedWorkflowExecutions() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListClosedWorkflowExecutionsScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListClosedWorkflowExecutions(context.Background(), request) @@ -198,7 +194,6 @@ func (s *VisibilityManagerSuite) TestListOpenWorkflowExecutionsByType() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListOpenWorkflowExecutionsByTypeScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListOpenWorkflowExecutionsByType(context.Background(), request) @@ -223,7 +218,6 @@ func (s *VisibilityManagerSuite) TestListClosedWorkflowExecutionsByType() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListClosedWorkflowExecutionsByTypeScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListClosedWorkflowExecutionsByType(context.Background(), request) @@ -248,7 +242,6 @@ func (s *VisibilityManagerSuite) TestListOpenWorkflowExecutionsByWorkflowID() { WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListOpenWorkflowExecutionsByWorkflowIDScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListOpenWorkflowExecutionsByWorkflowID(context.Background(), request) @@ -273,7 +266,6 @@ func (s *VisibilityManagerSuite) TestListClosedWorkflowExecutionsByWorkflowID() WithTags(metrics.OperationTag( metrics.VisibilityPersistenceListClosedWorkflowExecutionsByWorkflowIDScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListClosedWorkflowExecutionsByWorkflowID(context.Background(), request) @@ -298,7 +290,6 @@ func (s *VisibilityManagerSuite) TestListClosedWorkflowExecutionsByStatus() { WithTags( metrics.OperationTag(metrics.VisibilityPersistenceListClosedWorkflowExecutionsByStatusScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.ListClosedWorkflowExecutionsByStatus(context.Background(), request) @@ -325,7 +316,6 @@ func (s *VisibilityManagerSuite) TestGetWorkflowExecution() { WithTags( metrics.OperationTag(metrics.VisibilityPersistenceGetWorkflowExecutionScope), metrics.StandardVisibilityTypeTag(), - metrics.VisibilityTypeTag(""), ). Return(metrics.NoopMetricsHandler).Times(2) _, err := s.visibilityManager.GetWorkflowExecution(context.Background(), request) diff --git a/common/persistence/visibility/visiblity_manager_metrics.go b/common/persistence/visibility/visiblity_manager_metrics.go index 54c4bf12650..9ab48647246 100644 --- a/common/persistence/visibility/visiblity_manager_metrics.go +++ b/common/persistence/visibility/visiblity_manager_metrics.go @@ -220,7 +220,7 @@ func (m *visibilityManagerMetrics) GetWorkflowExecution( } func (m *visibilityManagerMetrics) tagScope(operation string) (metrics.MetricsHandler, time.Time) { - taggedHandler := m.metricHandler.WithTags(metrics.OperationTag(operation), m.visibilityTypeMetricsTag, metrics.VisibilityTypeTag("")) + taggedHandler := m.metricHandler.WithTags(metrics.OperationTag(operation), m.visibilityTypeMetricsTag) taggedHandler.Counter(metrics.VisibilityPersistenceRequests.GetMetricName()).Record(1) return taggedHandler, time.Now().UTC() }