Add tasklist type tag for all metrics from tasklistmgr scope

cadence-workflow · Jul 20, 2024 · eba09fc · eba09fc
1 parent 4a51fb4
commit eba09fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/service/matching/handler/engine_integration_test.go b/service/matching/handler/engine_integration_test.go
@@ -647,7 +647,7 @@ func (s *matchingEngineSuite) SyncMatchTasks(taskType int, enableIsolation bool)
 	s.True(expectedRange <= s.taskManager.GetRangeID(testParam.TaskListID))
 
 	if throttledTaskCount > 0 {
-		syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name]
+		syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name+",tasklistType=activity"]
 		s.EqualValues(throttledTaskCount, int(syncCtr.Value()))
 	}
 
@@ -790,8 +790,8 @@ func (s *matchingEngineSuite) ConcurrentAddAndPollTasks(taskType int, workerCoun
 	mgr.Stop()
 	s.EqualValues(0, s.taskManager.GetTaskCount(testParam.TaskListID))
 
-	syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name]
-	bufCtr := scope.Snapshot().Counters()["test.buffer_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name]
+	syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name+",tasklistType=activity"]
+	bufCtr := scope.Snapshot().Counters()["test.buffer_throttle_count_per_tl+domain="+matchingTestDomainName+",operation=TaskListMgr,tasklist="+testParam.TaskList.Name+",tasklistType=activity"]
 	total := int64(0)
 	if syncCtr != nil {
 		total += syncCtr.Value()

diff --git a/service/matching/tasklist/task_list_manager.go b/service/matching/tasklist/task_list_manager.go
@@ -154,7 +154,8 @@ func NewManager(
 		taskListKind = &normalTaskListKind
 	}
 
-	scope := NewPerTaskListScope(domainName, taskList.GetName(), *taskListKind, metricsClient, metrics.MatchingTaskListMgrScope)
+	scope := NewPerTaskListScope(domainName, taskList.GetName(), *taskListKind, metricsClient, metrics.MatchingTaskListMgrScope).
+		Tagged(getTaskListTypeTag(taskList.GetType()))
 	db := newTaskListDB(taskManager, taskList.GetDomainID(), domainName, taskList.GetName(), taskList.GetType(), int(*taskListKind), logger)
 
 	tlMgr := &taskListManagerImpl{
@@ -177,11 +178,8 @@ func NewManager(
 		closeCallback:       closeCallback,
 	}
 
-	taskListTypeMetricScope := tlMgr.scope.Tagged(
-		getTaskListTypeTag(taskList.GetType()),
-	)
 	tlMgr.pollerHistory = poller.NewPollerHistory(func() {
-		taskListTypeMetricScope.UpdateGauge(metrics.PollerPerTaskListCounter,
+		scope.UpdateGauge(metrics.PollerPerTaskListCounter,
 			float64(len(tlMgr.pollerHistory.GetPollerInfo(time.Time{}))))
 	}, timeSource)
 

diff --git a/service/matching/tasklist/task_reader.go b/service/matching/tasklist/task_reader.go
@@ -220,8 +220,7 @@ getTasksPumpLoop:
 			{
 				ackLevel := tr.taskAckManager.GetAckLevel()
 				if size, err := tr.db.GetTaskListSize(ackLevel); err == nil {
-					tr.scope.Tagged(getTaskListTypeTag(tr.taskListID.GetType())).
-						UpdateGauge(metrics.TaskCountPerTaskListGauge, float64(size))
+					tr.scope.UpdateGauge(metrics.TaskCountPerTaskListGauge, float64(size))
 				}
 				if err := tr.handleErr(tr.persistAckLevel()); err != nil {
 					tr.logger.Error("Persistent store operation failure",
@@ -233,8 +232,7 @@ getTasksPumpLoop:
 				updateAckTimer = time.NewTimer(tr.config.UpdateAckInterval())
 			}
 		}
-		scope := tr.scope.Tagged(getTaskListTypeTag(tr.taskListID.GetType()))
-		scope.UpdateGauge(metrics.TaskBacklogPerTaskListGauge, float64(tr.taskAckManager.GetBacklogCount()))
+		tr.scope.UpdateGauge(metrics.TaskBacklogPerTaskListGauge, float64(tr.taskAckManager.GetBacklogCount()))
 	}
 }
 
@@ -334,10 +332,9 @@ func (tr *taskReader) persistAckLevel() error {
 	ackLevel := tr.taskAckManager.GetAckLevel()
 	if ackLevel >= 0 {
 		maxReadLevel := tr.taskWriter.GetMaxReadLevel()
-		scope := tr.scope.Tagged(getTaskListTypeTag(tr.taskListID.GetType()))
 		// note: this metrics is only an estimation for the lag. taskID in DB may not be continuous,
 		// especially when task list ownership changes.
-		scope.UpdateGauge(metrics.TaskLagPerTaskListGauge, float64(maxReadLevel-ackLevel))
+		tr.scope.UpdateGauge(metrics.TaskLagPerTaskListGauge, float64(maxReadLevel-ackLevel))
 
 		return tr.db.UpdateState(ackLevel)
 	}