Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lag and pending tasks metrics for visibility queue #2328

Merged
merged 2 commits into from
Dec 29, 2021
Merged

Add lag and pending tasks metrics for visibility queue #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5fec0c
Add lag and pending tasks metrics for visibility queue
yycptt Dec 28, 2021
3d4b740
Merge branch 'master' into vis-queue-metrics
yycptt Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions common/metrics/defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1944,9 +1944,11 @@ const (
ShardInfoTransferStandbyPendingTasksTimer
ShardInfoTimerActivePendingTasksTimer
ShardInfoTimerStandbyPendingTasksTimer
ShardInfoVisibilityPendingTasksTimer
ShardInfoReplicationLagHistogram
ShardInfoTransferLagHistogram
ShardInfoTimerLagTimer
ShardInfoVisibilityLagHistogram
ShardInfoTransferDiffHistogram
ShardInfoTimerDiffTimer
ShardInfoTransferFailoverInProgressHistogram
Expand Down Expand Up @@ -2399,9 +2401,11 @@ var MetricDefs = map[ServiceIdx]map[int]metricDefinition{
ShardInfoTransferStandbyPendingTasksTimer: NewDimensionlessHistogramDef("shardinfo_transfer_standby_pending_task"),
ShardInfoTimerActivePendingTasksTimer: NewDimensionlessHistogramDef("shardinfo_timer_active_pending_task"),
ShardInfoTimerStandbyPendingTasksTimer: NewDimensionlessHistogramDef("shardinfo_timer_standby_pending_task"),
ShardInfoVisibilityPendingTasksTimer: NewDimensionlessHistogramDef("shardinfo_visibility_pending_task"),
ShardInfoReplicationLagHistogram: NewDimensionlessHistogramDef("shardinfo_replication_lag"),
ShardInfoTransferLagHistogram: NewDimensionlessHistogramDef("shardinfo_transfer_lag"),
ShardInfoTimerLagTimer: NewTimerDef("shardinfo_timer_lag"),
ShardInfoVisibilityLagHistogram: NewDimensionlessHistogramDef("shardinfo_visibility_lag"),
ShardInfoTransferDiffHistogram: NewDimensionlessHistogramDef("shardinfo_transfer_diff"),
ShardInfoTimerDiffTimer: NewTimerDef("shardinfo_timer_diff"),
ShardInfoTransferFailoverInProgressHistogram: NewDimensionlessHistogramDef("shardinfo_transfer_failover_in_progress"),
Expand Down
10 changes: 7 additions & 3 deletions service/history/queueAckMgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,17 @@ func (a *queueAckMgrImpl) updateQueueAckLevel() error {
if pendingTasks > warnPendingTasks {
a.logger.Warn("Too many pending tasks")
}

metricsScope := a.metricsClient.Scope(metrics.ShardInfoScope)
switch a.options.MetricScope {
case metrics.ReplicatorQueueProcessorScope:
a.metricsClient.RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoReplicationPendingTasksTimer, pendingTasks)
metricsScope.RecordDistribution(metrics.ShardInfoReplicationPendingTasksTimer, pendingTasks)
case metrics.TransferActiveQueueProcessorScope:
a.metricsClient.RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTransferActivePendingTasksTimer, pendingTasks)
metricsScope.RecordDistribution(metrics.ShardInfoTransferActivePendingTasksTimer, pendingTasks)
case metrics.TransferStandbyQueueProcessorScope:
a.metricsClient.RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTransferStandbyPendingTasksTimer, pendingTasks)
metricsScope.RecordDistribution(metrics.ShardInfoTransferStandbyPendingTasksTimer, pendingTasks)
case metrics.VisibilityQueueProcessorScope:
metricsScope.RecordDistribution(metrics.ShardInfoVisibilityPendingTasksTimer, pendingTasks)
}

MoveAckLevelLoop:
Expand Down
17 changes: 10 additions & 7 deletions service/history/shard/context_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,7 @@ func (s *ContextImpl) emitShardInfoMetricsLogsLocked() {
replicationLag := s.transferMaxReadLevel - s.shardInfo.ReplicationAckLevel
transferLag := s.transferMaxReadLevel - s.shardInfo.TransferAckLevel
timerLag := time.Since(timestamp.TimeValue(s.shardInfo.TimerAckLevelTime))
visibilityLag := s.transferMaxReadLevel - s.shardInfo.VisibilityAckLevel
yycptt marked this conversation as resolved.
Show resolved Hide resolved

transferFailoverInProgress := len(s.shardInfo.TransferFailoverLevels)
timerFailoverInProgress := len(s.shardInfo.TimerFailoverLevels)
Expand All @@ -1046,15 +1047,17 @@ func (s *ContextImpl) emitShardInfoMetricsLogsLocked() {
tag.ShardTransferAcks(s.shardInfo.ClusterTransferAckLevel))
}

s.GetMetricsClient().RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTransferDiffHistogram, int(diffTransferLevel))
s.GetMetricsClient().RecordTimer(metrics.ShardInfoScope, metrics.ShardInfoTimerDiffTimer, diffTimerLevel)
metricsScope := s.GetMetricsClient().Scope(metrics.ShardInfoScope)
metricsScope.RecordDistribution(metrics.ShardInfoTransferDiffHistogram, int(diffTransferLevel))
metricsScope.RecordTimer(metrics.ShardInfoTimerDiffTimer, diffTimerLevel)

s.GetMetricsClient().RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoReplicationLagHistogram, int(replicationLag))
s.GetMetricsClient().RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTransferLagHistogram, int(transferLag))
s.GetMetricsClient().RecordTimer(metrics.ShardInfoScope, metrics.ShardInfoTimerLagTimer, timerLag)
metricsScope.RecordDistribution(metrics.ShardInfoReplicationLagHistogram, int(replicationLag))
metricsScope.RecordDistribution(metrics.ShardInfoTransferLagHistogram, int(transferLag))
metricsScope.RecordTimer(metrics.ShardInfoTimerLagTimer, timerLag)
metricsScope.RecordDistribution(metrics.ShardInfoVisibilityLagHistogram, int(visibilityLag))

s.GetMetricsClient().RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTransferFailoverInProgressHistogram, transferFailoverInProgress)
s.GetMetricsClient().RecordDistribution(metrics.ShardInfoScope, metrics.ShardInfoTimerFailoverInProgressHistogram, timerFailoverInProgress)
metricsScope.RecordDistribution(metrics.ShardInfoTransferFailoverInProgressHistogram, transferFailoverInProgress)
metricsScope.RecordDistribution(metrics.ShardInfoTimerFailoverInProgressHistogram, timerFailoverInProgress)
}

func (s *ContextImpl) allocateTaskIDsLocked(
Expand Down