Skip to content

Commit d2c8a7a

Browse files
committed
Fix replication lag histogram metric collision
1 parent 128dd79 commit d2c8a7a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

common/metrics/defs.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2727,6 +2727,7 @@ const (
27272727
ReplicationTasksFailed
27282728
ReplicationTasksLag
27292729
ExponentialReplicationTasksLag
2730+
ExponentialReplicationTasksLagCounts
27302731
ReplicationTasksLagRaw
27312732
ExponentialReplicationTasksLagRaw
27322733
ReplicationTasksDelay
@@ -3547,7 +3548,8 @@ var MetricDefs = map[ServiceIdx]map[MetricIdx]metricDefinition{
35473548
ReplicationTasksApplied: {metricName: "replication_tasks_applied", metricType: Counter},
35483549
ReplicationTasksFailed: {metricName: "replication_tasks_failed", metricType: Counter},
35493550
ReplicationTasksLag: {metricName: "replication_tasks_lag", metricType: Timer},
3550-
ExponentialReplicationTasksLag: {metricName: "replication_tasks_lag_counts", metricType: Histogram, intExponentialBuckets: Mid1To16k},
3551+
ExponentialReplicationTasksLag: {metricName: "replication_tasks_lag_ns", metricType: Histogram, exponentialBuckets: Mid1ms24h},
3552+
ExponentialReplicationTasksLagCounts: {metricName: "replication_tasks_lag_counts", metricType: Histogram, intExponentialBuckets: Mid1To16k},
35513553
ReplicationTasksLagRaw: {metricName: "replication_tasks_lag_raw", metricType: Timer},
35523554
ExponentialReplicationTasksLagRaw: {metricName: "replication_tasks_lag_raw_counts", metricType: Histogram, intExponentialBuckets: Mid1To16k},
35533555
ReplicationTasksDelay: {metricName: "replication_tasks_delay", metricType: Histogram, buckets: ReplicationTaskDelayBucket},

service/history/replication/task_ack_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (t *TaskAckManager) getTasks(ctx context.Context, pollingCluster string, la
205205

206206
lag := maxReadLevel - msgs.LastRetrievedMessageID
207207
t.scope.RecordTimer(metrics.ReplicationTasksLag, time.Duration(lag))
208-
t.scope.IntExponentialHistogram(metrics.ExponentialReplicationTasksLag, clampInt64ToInt(lag))
208+
t.scope.IntExponentialHistogram(metrics.ExponentialReplicationTasksLagCounts, clampInt64ToInt(lag))
209209

210210
t.scope.RecordTimer(metrics.ReplicationTasksReturned, time.Duration(len(msgs.ReplicationTasks)))
211211
t.scope.IntExponentialHistogram(metrics.ExponentialReplicationTasksReturned, len(msgs.ReplicationTasks))

0 commit comments

Comments
 (0)