From 0faf11835b5adb8935624ab7be13a55b4fecc4d2 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:30:44 -0500
Subject: [PATCH] [release-11.5.2] Metrics: Use correct gatherer in graphite
 bridge (#100628)

Metrics: Use correct gatherer in graphite bridge (#100624)

(cherry picked from commit 5a74a1a0f6b795e943865f9ac2a473611578b855)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
---
 pkg/infra/metrics/service.go  | 6 ++++--
 pkg/infra/metrics/settings.go | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/infra/metrics/service.go b/pkg/infra/metrics/service.go
index f704ab9248b..99c1e048d4f 100644
--- a/pkg/infra/metrics/service.go
+++ b/pkg/infra/metrics/service.go
@@ -26,12 +26,13 @@ func (lw *logWrapper) Println(v ...any) {
 	lw.logger.Info("graphite metric bridge", v...)
 }
 
-func ProvideService(cfg *setting.Cfg, reg prometheus.Registerer) (*InternalMetricsService, error) {
+func ProvideService(cfg *setting.Cfg, reg prometheus.Registerer, gatherer prometheus.Gatherer) (*InternalMetricsService, error) {
 	initMetricVars(reg)
 	initFrontendMetrics(reg)
 
 	s := &InternalMetricsService{
-		Cfg: cfg,
+		Cfg:      cfg,
+		gatherer: gatherer,
 	}
 	return s, s.readSettings()
 }
@@ -41,6 +42,7 @@ type InternalMetricsService struct {
 
 	intervalSeconds int64
 	graphiteCfg     *graphitebridge.Config
+	gatherer        prometheus.Gatherer
 }
 
 func (im *InternalMetricsService) Run(ctx context.Context) error {
diff --git a/pkg/infra/metrics/settings.go b/pkg/infra/metrics/settings.go
index 54715db249e..587956158f2 100644
--- a/pkg/infra/metrics/settings.go
+++ b/pkg/infra/metrics/settings.go
@@ -5,8 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
-
 	"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
 )
 
@@ -40,7 +38,7 @@ func (im *InternalMetricsService) parseGraphiteSettings() error {
 		URL:             address,
 		Prefix:          graphiteSection.Key("prefix").MustString("prod.grafana.%(instance_name)s"),
 		CountersAsDelta: true,
-		Gatherer:        prometheus.DefaultGatherer,
+		Gatherer:        im.gatherer,
 		Interval:        time.Duration(im.intervalSeconds) * time.Second,
 		Timeout:         10 * time.Second,
 		Logger:          &logWrapper{logger: metricsLogger},