Remove initialization of metrics from init functions

Signed-off-by: Marc Tuduri <marctc@protonmail.com>

diff --git a/config/config.go b/config/config.go
index 99338843f56ea4c3bf85c10ba2c3791a64578653..1ce6ac9b2e157b94b979f5dec9100fb9c877b283 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -34,17 +34,18 @@ import (
        "github.com/go-kit/log/level"
        "github.com/miekg/dns"
        "github.com/prometheus/client_golang/prometheus"
+       "github.com/prometheus/client_golang/prometheus/promauto"
        "github.com/prometheus/common/config"
 )
 
 var (
-       configReloadSuccess = prometheus.NewGauge(prometheus.GaugeOpts{
+       configReloadSuccess = promauto.NewGauge(prometheus.GaugeOpts{
                Namespace: "blackbox_exporter",
                Name:      "config_last_reload_successful",
                Help:      "Blackbox exporter config loaded successfully.",
        })
 
-       configReloadSeconds = prometheus.NewGauge(prometheus.GaugeOpts{
+       configReloadSeconds = promauto.NewGauge(prometheus.GaugeOpts{
                Namespace: "blackbox_exporter",
                Name:      "config_last_reload_success_timestamp_seconds",
                Help:      "Timestamp of the last successful configuration reload.",
@@ -89,11 +90,6 @@ var (
        }
 )
 
-func init() {
-       prometheus.MustRegister(configReloadSuccess)
-       prometheus.MustRegister(configReloadSeconds)
-}
-
 type Config struct {
        Modules map[string]Module `yaml:"modules"`
 }

diff --git a/prober/handler.go b/prober/handler.go
index 2a8a1d9c5a16e286a55698bbf311c1bbbc220dce..6658d3fc0336067536c08dc3b9553a81d7993de9 100644 (file)
--- a/prober/handler.go
+++ b/prober/handler.go
@@ -27,6 +27,7 @@ import (
        "github.com/go-kit/log/level"
        "github.com/prometheus/blackbox_exporter/config"
        "github.com/prometheus/client_golang/prometheus"
+       "github.com/prometheus/client_golang/prometheus/promauto"
        "github.com/prometheus/client_golang/prometheus/promhttp"
        "github.com/prometheus/common/expfmt"
        "gopkg.in/yaml.v2"
@@ -40,16 +41,12 @@ var (
                "dns":  ProbeDNS,
                "grpc": ProbeGRPC,
        }
-       moduleUnknownCounter = prometheus.NewCounter(prometheus.CounterOpts{
+       moduleUnknownCounter = promauto.NewCounter(prometheus.CounterOpts{
                Name: "blackbox_module_unknown_total",
                Help: "Count of unknown modules requested by probes",
        })
 )
 
-func init() {
-       prometheus.MustRegister(moduleUnknownCounter)
-}
-
 func Handler(w http.ResponseWriter, r *http.Request, c *config.Config, logger log.Logger,
        rh *ResultHistory, timeoutOffset float64, params url.Values) {
        if params == nil {