From 2f8ee38c5e8090a01405d6aa9cee0a5ec40465cb Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Tue, 28 Feb 2023 16:12:23 +0100
Subject: [PATCH] Chore: Let wire inject prometheus.Registerer (#62195)

let wire inject prometheus.Registerer
---
 pkg/infra/metrics/service.go | 4 ++++
 pkg/server/wire.go           | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/pkg/infra/metrics/service.go b/pkg/infra/metrics/service.go
index 843be0551d3..3c92064dda0 100644
--- a/pkg/infra/metrics/service.go
+++ b/pkg/infra/metrics/service.go
@@ -6,6 +6,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 var metricsLogger log.Logger = log.New("metrics")
@@ -53,3 +54,6 @@ func (im *InternalMetricsService) Run(ctx context.Context) error {
 	<-ctx.Done()
 	return ctx.Err()
 }
+
+func ProvideRegisterer() prometheus.Registerer        { return prometheus.DefaultRegisterer }
+func ProvideRegistererForTest() prometheus.Registerer { return prometheus.NewRegistry() }
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 13d870ae48b..e4875379983 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -373,6 +373,7 @@ var wireBasicSet = wire.NewSet(
 
 var wireSet = wire.NewSet(
 	wireBasicSet,
+	metrics.ProvideRegisterer,
 	sqlstore.ProvideService,
 	ngmetrics.ProvideService,
 	wire.Bind(new(notifications.Service), new(*notifications.NotificationService)),
@@ -387,6 +388,7 @@ var wireSet = wire.NewSet(
 var wireTestSet = wire.NewSet(
 	wireBasicSet,
 	ProvideTestEnv,
+	metrics.ProvideRegistererForTest,
 	sqlstore.ProvideServiceForTests,
 	ngmetrics.ProvideServiceForTest,
 	notifications.MockNotificationService,