use controller runtime metrics registry (kubeflow#4683)

jlewi · Jan 23, 2020 · 34aa47c · 34aa47c
1 parent 251542a
commit 34aa47c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/components/profile-controller/controllers/moniotring.go b/components/profile-controller/controllers/moniotring.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -44,9 +45,9 @@ var (
 
 func init() {
 	// Register prometheus counters
-	prometheus.MustRegister(requestCounter)
-	prometheus.MustRegister(requestErrorCounter)
-	prometheus.MustRegister(serviceHeartbeat)
+	metrics.Registry.MustRegister(requestCounter)
+	metrics.Registry.MustRegister(requestErrorCounter)
+	metrics.Registry.MustRegister(serviceHeartbeat)
 	// Count heartbeat
 	go func() {
 		labels := prometheus.Labels{COMPONENT: PROFILE, SEVERITY: SEVERITY_CRITICAL}

diff --git a/components/profile-controller/go.mod b/components/profile-controller/go.mod
@@ -10,8 +10,9 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
+	github.com/prometheus/client_golang v0.9.0
 	github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e
-	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/sirupsen/logrus v1.4.2
 	golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	google.golang.org/api v0.10.0