From 86c957fbe85116867659fcae766752434cad80ec Mon Sep 17 00:00:00 2001 From: blanet Date: Sun, 20 Dec 2020 16:33:50 +0800 Subject: [PATCH 1/2] fix prometheus metirc labels for ratelimit handler --- internal/middleware/limithandler/metrics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/middleware/limithandler/metrics.go b/internal/middleware/limithandler/metrics.go index 78c628cb94a..f561f27355d 100644 --- a/internal/middleware/limithandler/metrics.go +++ b/internal/middleware/limithandler/metrics.go @@ -100,8 +100,8 @@ func (c *promMonitor) Exit(ctx context.Context) { func NewPromMonitor(system string, fullMethod string) ConcurrencyMonitor { serviceName, methodName := splitMethodName(fullMethod) - queuedGauge := queuedGaugeVec.WithLabelValues(serviceName, methodName, system) - inprogressGauge := inprogressGaugeVec.WithLabelValues(serviceName, methodName, system) + queuedGauge := queuedGaugeVec.WithLabelValues(system, serviceName, methodName) + inprogressGauge := inprogressGaugeVec.WithLabelValues(system, serviceName, methodName) var histogram prometheus.Observer if histogramVec != nil { -- GitLab From a071261193749934507820b919b615e8aa3dceb1 Mon Sep 17 00:00:00 2001 From: blanet Date: Thu, 31 Dec 2020 14:53:12 +0800 Subject: [PATCH 2/2] changelog: Fix wrongly labeled prometheus metrics for limithandler --- changelogs/unreleased/xx-fix-limithandler-metrics.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/xx-fix-limithandler-metrics.yml diff --git a/changelogs/unreleased/xx-fix-limithandler-metrics.yml b/changelogs/unreleased/xx-fix-limithandler-metrics.yml new file mode 100644 index 00000000000..1186b1e1b06 --- /dev/null +++ b/changelogs/unreleased/xx-fix-limithandler-metrics.yml @@ -0,0 +1,5 @@ +--- +title: Fix wrongly labeled prometheus metrics for limithandler +merge_request: 2955 +author: +type: fixed -- GitLab