diff --git a/components/blobserve/cmd/run.go b/components/blobserve/cmd/run.go index 1400411e966673..f85774c452749a 100644 --- a/components/blobserve/cmd/run.go +++ b/components/blobserve/cmd/run.go @@ -5,17 +5,19 @@ package cmd import ( - "github.com/gitpod-io/gitpod/blobserve/pkg/config" "net/http" "os" "os/signal" "path/filepath" "syscall" + "github.com/gitpod-io/gitpod/blobserve/pkg/config" + "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/docker/cli/cli/config/configfile" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" @@ -82,8 +84,8 @@ var runCmd = &cobra.Command{ } if cfg.PrometheusAddr != "" { reg.MustRegister( - prometheus.NewGoCollector(), - prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}), + collectors.NewGoCollector(), + collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}), ) handler := http.NewServeMux() diff --git a/components/content-service/cmd/run.go b/components/content-service/cmd/run.go index 3728427f30a3ce..76a1a3a8b2b73f 100644 --- a/components/content-service/cmd/run.go +++ b/components/content-service/cmd/run.go @@ -13,6 +13,7 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" "google.golang.org/grpc" @@ -100,8 +101,8 @@ var runCmd = &cobra.Command{ if cfg.Prometheus.Addr != "" { reg.MustRegister( - prometheus.NewGoCollector(), - prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}), + collectors.NewGoCollector(), + collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}), ) handler := http.NewServeMux() diff --git a/components/openvsx-proxy/pkg/prometheus.go b/components/openvsx-proxy/pkg/prometheus.go index 408f082d743e73..b7e3d700296d3e 100644 --- a/components/openvsx-proxy/pkg/prometheus.go +++ b/components/openvsx-proxy/pkg/prometheus.go @@ -11,6 +11,7 @@ import ( "github.com/gitpod-io/gitpod/common-go/log" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" ) @@ -33,8 +34,8 @@ func (p *Prometheus) Start(cfg *Config) { if cfg.PrometheusAddr != "" { p.reg.MustRegister( - prometheus.NewGoCollector(), - prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}), + collectors.NewGoCollector(), + collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}), ) handler := http.NewServeMux() diff --git a/components/ws-daemon/cmd/run.go b/components/ws-daemon/cmd/run.go index bebb9dbee8ee32..f2181656f7bfbb 100644 --- a/components/ws-daemon/cmd/run.go +++ b/components/ws-daemon/cmd/run.go @@ -13,6 +13,7 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" "google.golang.org/grpc" @@ -73,8 +74,8 @@ var runCmd = &cobra.Command{ if cfg.Prometheus.Addr != "" { reg.MustRegister( - prometheus.NewGoCollector(), - prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}), + collectors.NewGoCollector(), + collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}), ) handler := http.NewServeMux()