chore(deps): fix lint issue

grafana · Mar 20, 2024 · 0c2a2c7 · 0c2a2c7
1 parent ef212d9
commit 0c2a2c7
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/clients/cmd/promtail/main.go b/clients/cmd/promtail/main.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/dskit/log"
 	"github.com/grafana/dskit/tracing"
 	"github.com/prometheus/client_golang/prometheus"
+	collectors_version "github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/common/version"
 
 	"github.com/grafana/loki/clients/pkg/logentry/stages"
@@ -32,7 +33,7 @@ import (
 )
 
 func init() {
-	prometheus.MustRegister(version.NewCollector("promtail"))
+	prometheus.MustRegister(collectors_version.NewCollector("promtail"))
 }
 
 var mtx sync.Mutex

diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go
@@ -30,8 +30,8 @@ import (
 	gerrors "github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
+	"github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/common/model"
-	"github.com/prometheus/common/version"
 
 	"github.com/grafana/loki/pkg/bloomcompactor"
 	"github.com/grafana/loki/pkg/logqlmodel/stats"

diff --git a/tools/tsdb/helpers/setup.go b/tools/tsdb/helpers/setup.go
@@ -10,7 +10,7 @@ import (
 	"github.com/grafana/dskit/services"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
-	"github.com/prometheus/common/version"
+	"github.com/prometheus/client_golang/prometheus/collectors/version"
 
 	"github.com/grafana/loki/pkg/loki"
 	"github.com/grafana/loki/pkg/storage"

diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/version/version.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/version/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1257,6 +1257,7 @@ github.com/prometheus/client_golang/api
 github.com/prometheus/client_golang/api/prometheus/v1
 github.com/prometheus/client_golang/prometheus
 github.com/prometheus/client_golang/prometheus/collectors
+github.com/prometheus/client_golang/prometheus/collectors/version
 github.com/prometheus/client_golang/prometheus/internal
 github.com/prometheus/client_golang/prometheus/promauto
 github.com/prometheus/client_golang/prometheus/promhttp