Fix: avoid panics on duplicate metrics registration (#74359)

ivana/go-lint
Serge Zaitsev 2 years ago committed by GitHub
parent 77bf8215d4
commit 7197ed9fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      pkg/services/sqlstore/sqlstore.go

@ -80,9 +80,13 @@ func ProvideService(cfg *setting.Cfg, cacheService *localcache.CacheService, mig
db := s.engine.DB().DB
// register the go_sql_stats_connections_* metrics
prometheus.MustRegister(sqlstats.NewStatsCollector("grafana", db))
if err := prometheus.Register(sqlstats.NewStatsCollector("grafana", db)); err != nil {
s.log.Warn("Failed to register sqlstore stats collector", "error", err)
}
// TODO: deprecate/remove these metrics
prometheus.MustRegister(newSQLStoreMetrics(db))
if err := prometheus.Register(newSQLStoreMetrics(db)); err != nil {
s.log.Warn("Failed to register sqlstore metrics", "error", err)
}
return s, nil
}

Loading…
Cancel
Save