Add tasklist type tag for all metrics from tasklistmgr scope

uber · Jul 20, 2024 · 8330493 · 8330493
1 parent 4a51fb4
commit 8330493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
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)
  }