Remove direct reference to Prometheus.

RainbowMango · RainbowMango · commit 96a930c9bf3b · 2019-09-29T10:06:59.000+08:00
diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_metrics.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_metrics.go
@@ -21,8 +21,6 @@ package aws
 import (
 	"sync"
 
-	"github.com/prometheus/client_golang/prometheus"
-
 	"k8s.io/component-base/metrics"
 	"k8s.io/component-base/metrics/legacyregistry"
 )
@@ -55,14 +53,14 @@ var (
 
 func recordAWSMetric(actionName string, timeTaken float64, err error) {
 	if err != nil {
-		awsAPIErrorMetric.With(prometheus.Labels{"request": actionName}).Inc()
+		awsAPIErrorMetric.With(metrics.Labels{"request": actionName}).Inc()
 	} else {
-		awsAPIMetric.With(prometheus.Labels{"request": actionName}).Observe(timeTaken)
+		awsAPIMetric.With(metrics.Labels{"request": actionName}).Observe(timeTaken)
 	}
 }
 
 func recordAWSThrottlesMetric(operation string) {
-	awsAPIThrottlesMetric.With(prometheus.Labels{"operation_name": operation}).Inc()
+	awsAPIThrottlesMetric.With(metrics.Labels{"operation_name": operation}).Inc()
 }
 
 var registerOnce sync.Once

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ package aws`
`21`	`21`	`import (`
`22`	`22`	`"sync"`
`23`	`23`
`24`		`- "github.com/prometheus/client_golang/prometheus"`
`25`		`-`
`26`	`24`	`"k8s.io/component-base/metrics"`
`27`	`25`	`"k8s.io/component-base/metrics/legacyregistry"`
`28`	`26`	`)`
`@@ -55,14 +53,14 @@ var (`
`55`	`53`
`56`	`54`	`func recordAWSMetric(actionName string, timeTaken float64, err error) {`
`57`	`55`	`if err != nil {`
`58`		`- awsAPIErrorMetric.With(prometheus.Labels{"request": actionName}).Inc()`
	`56`	`+ awsAPIErrorMetric.With(metrics.Labels{"request": actionName}).Inc()`
`59`	`57`	`} else {`
`60`		`- awsAPIMetric.With(prometheus.Labels{"request": actionName}).Observe(timeTaken)`
	`58`	`+ awsAPIMetric.With(metrics.Labels{"request": actionName}).Observe(timeTaken)`
`61`	`59`	`}`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`func recordAWSThrottlesMetric(operation string) {`
`65`		`- awsAPIThrottlesMetric.With(prometheus.Labels{"operation_name": operation}).Inc()`
	`63`	`+ awsAPIThrottlesMetric.With(metrics.Labels{"operation_name": operation}).Inc()`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`var registerOnce sync.Once`