From ea6b00edca512dc5b279e58128be344a891ce65d Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Thu, 14 Oct 2021 18:24:13 -0400 Subject: [PATCH] always expoe loki_build_info --- cmd/loki/main.go | 5 ----- pkg/loki/modules.go | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/loki/main.go b/cmd/loki/main.go index 53e17d56f02d..61853700d2ca 100644 --- a/cmd/loki/main.go +++ b/cmd/loki/main.go @@ -7,7 +7,6 @@ import ( "reflect" "github.com/go-kit/kit/log/level" - "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/version" "github.com/weaveworks/common/logging" "github.com/weaveworks/common/tracing" @@ -21,10 +20,6 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" ) -func init() { - prometheus.MustRegister(version.NewCollector("loki")) -} - func main() { var config loki.ConfigWrapper diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index fd9a6fb712db..bfa8207daa5a 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -27,6 +27,7 @@ import ( "github.com/grafana/dskit/runtimeconfig" "github.com/grafana/dskit/services" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/version" "github.com/thanos-io/thanos/pkg/discovery/dns" "github.com/weaveworks/common/middleware" "github.com/weaveworks/common/server" @@ -82,6 +83,8 @@ const ( ) func (t *Loki) initServer() (services.Service, error) { + prometheus.MustRegister(version.NewCollector("loki")) + // Loki handles signals on its own. cortex.DisableSignalHandling(&t.Cfg.Server) serv, err := server.New(t.Cfg.Server)