Switch away from deprecated prometheus collectors (#6025)

As of the update from 1.7.1 to 1.12.1 (#5974), the `prometheus.NewFooCollector` methods have been deprecated and replaced by equivalent `collectors.NewFooCollector` methods.
letsencrypt · Mar 31, 2022 · 9b7f292 · 9b7f292
1 parent f1e56cf
commit 9b7f292
Show file tree

Hide file tree

Showing 9 changed files with 380 additions and 3 deletions.
diff --git a/cmd/shell.go b/cmd/shell.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"github.com/letsencrypt/boulder/core"
@@ -182,9 +183,9 @@ func NewLogger(logConf SyslogConfig) blog.Logger {
 
 func newStatsRegistry(addr string, logger blog.Logger) prometheus.Registerer {
 	registry := prometheus.NewRegistry()
-	registry.MustRegister(prometheus.NewGoCollector())
-	registry.MustRegister(prometheus.NewProcessCollector(
-		prometheus.ProcessCollectorOpts{}))
+	registry.MustRegister(collectors.NewGoCollector())
+	registry.MustRegister(collectors.NewProcessCollector(
+		collectors.ProcessCollectorOpts{}))
 
 	mux := http.NewServeMux()
 	// Register the available pprof handlers. These are all registered on

diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/collectors.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/collectors.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector_go115.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector_go115.go
diff --git a/.../github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector_pre_go115.go b/.../github.com/prometheus/client_golang/prometheus/collectors/dbstats_collector_pre_go115.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/expvar_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/expvar_collector.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/collectors/go_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/collectors/go_collector.go