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,