From 1635f94c835bcda895c3b74b43cfe81236eeb77a Mon Sep 17 00:00:00 2001 From: yzang2019 Date: Fri, 12 Apr 2024 15:06:48 +0800 Subject: [PATCH] Fix metrics labeling issue --- internal/consensus/metrics.gen.go | 2 +- internal/consensus/metrics.go | 2 +- internal/state/metrics.gen.go | 10 +++++----- internal/state/metrics.go | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/consensus/metrics.gen.go b/internal/consensus/metrics.gen.go index 6ea1680fd..34d9562d5 100644 --- a/internal/consensus/metrics.gen.go +++ b/internal/consensus/metrics.gen.go @@ -277,7 +277,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "ApplyBlockLatency measures how long it takes to execute ApplyBlock in finalize commit step", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "apply_block_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), } } diff --git a/internal/consensus/metrics.go b/internal/consensus/metrics.go index 17c573864..b428ab60d 100644 --- a/internal/consensus/metrics.go +++ b/internal/consensus/metrics.go @@ -172,7 +172,7 @@ type Metrics struct { CompleteProposalTime metrics.Histogram // ApplyBlockLatency measures how long it takes to execute ApplyBlock in finalize commit step - ApplyBlockLatency metrics.Histogram `metrics_labels:"apply_block_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + ApplyBlockLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` } // RecordConsMetrics uses for recording the block related metrics during fast-sync. diff --git a/internal/state/metrics.gen.go b/internal/state/metrics.gen.go index 237484ed5..0dd0f9fbd 100644 --- a/internal/state/metrics.gen.go +++ b/internal/state/metrics.gen.go @@ -59,7 +59,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "FinalizeBlockLatency measures how long it takes to run abci FinalizeBlock", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "finalize_blocks_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), SaveBlockResponseLatency: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, @@ -67,7 +67,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "SaveBlockResponseLatency measures how long it takes to run save the FinalizeBlockRes", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "save_block_response_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), SaveBlockLatency: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, @@ -75,7 +75,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "SaveBlockLatency measure how long it takes to save the block", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "save_block_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), PruneBlockLatency: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, @@ -83,7 +83,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "PruneBlockLatency measures how long it takes to prune block from blockstore", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "prune_block_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), FireEventsLatency: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, @@ -91,7 +91,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Help: "FireEventsLatency measures how long it takes to fire events for indexing", Buckets: stdprometheus.ExponentialBucketsRange(0.01, 10, 10), - }, append(labels, "prune_block_ms")).With(labelsAndValues...), + }, labels).With(labelsAndValues...), } } diff --git a/internal/state/metrics.go b/internal/state/metrics.go index e6b47c726..da9460e97 100644 --- a/internal/state/metrics.go +++ b/internal/state/metrics.go @@ -39,17 +39,17 @@ type Metrics struct { UpdateMempoolTime metrics.Histogram // FinalizeBlockLatency measures how long it takes to run abci FinalizeBlock - FinalizeBlockLatency metrics.Histogram `metrics_labels:"finalize_blocks_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + FinalizeBlockLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` // SaveBlockResponseLatency measures how long it takes to run save the FinalizeBlockRes - SaveBlockResponseLatency metrics.Histogram `metrics_labels:"save_block_response_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + SaveBlockResponseLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` // SaveBlockLatency measure how long it takes to save the block - SaveBlockLatency metrics.Histogram `metrics_labels:"save_block_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + SaveBlockLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` // PruneBlockLatency measures how long it takes to prune block from blockstore - PruneBlockLatency metrics.Histogram `metrics_labels:"prune_block_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + PruneBlockLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` // FireEventsLatency measures how long it takes to fire events for indexing - FireEventsLatency metrics.Histogram `metrics_labels:"prune_block_ms" metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` + FireEventsLatency metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"` }