From df2fda3f884ba64b58fbd2039c8b9decd037855b Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Tue, 20 Oct 2020 09:25:22 +0200 Subject: [PATCH] remove status label from histogram (#28387) Signed-off-by: bergquist (cherry picked from commit b036112444d896ccc8fc636da5d1e98a7177c274) --- pkg/services/sqlstore/database_wrapper.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/sqlstore/database_wrapper.go b/pkg/services/sqlstore/database_wrapper.go index 3f416298de2..c270de433b1 100644 --- a/pkg/services/sqlstore/database_wrapper.go +++ b/pkg/services/sqlstore/database_wrapper.go @@ -18,7 +18,7 @@ import ( var ( databaseQueryCounter *prometheus.CounterVec - databaseQueryHistogram *prometheus.HistogramVec + databaseQueryHistogram prometheus.Histogram ) func init() { @@ -28,12 +28,12 @@ func init() { Help: "The total amount of Database queries", }, []string{"status"}) - databaseQueryHistogram = prometheus.NewHistogramVec(prometheus.HistogramOpts{ + databaseQueryHistogram = prometheus.NewHistogram(prometheus.HistogramOpts{ Namespace: "grafana", Name: "database_queries_duration_seconds", Help: "Database query histogram", Buckets: prometheus.ExponentialBuckets(0.0001, 4, 9), - }, []string{"status"}) + }) prometheus.MustRegister(databaseQueryCounter, databaseQueryHistogram) } @@ -78,7 +78,7 @@ func (h *databaseQueryWrapper) After(ctx context.Context, query string, args ... begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time) elapsed := time.Since(begin) databaseQueryCounter.WithLabelValues("success").Inc() - databaseQueryHistogram.WithLabelValues("success").Observe(elapsed.Seconds()) + databaseQueryHistogram.Observe(elapsed.Seconds()) h.log.Debug("query finished", "status", "success", "elapsed time", elapsed, "sql", query) return ctx, nil } @@ -94,7 +94,7 @@ func (h *databaseQueryWrapper) OnError(ctx context.Context, err error, query str begin := ctx.Value(databaseQueryWrapperKey{}).(time.Time) elapsed := time.Since(begin) databaseQueryCounter.WithLabelValues(status).Inc() - databaseQueryHistogram.WithLabelValues(status).Observe(elapsed.Seconds()) + databaseQueryHistogram.Observe(elapsed.Seconds()) h.log.Debug("query finished", "status", status, "elapsed time", elapsed, "sql", query, "error", err) return err }