Merge pull request #74080 from dims/ensure-prometheus-metrics-are-not-registered-twice

pkg/cloudprovider/providers/aws/aws_metrics.go

@@ -16,7 +16,11 @@ limitations under the License.
 
 package aws
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"sync"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
 
 var (
 	awsAPIMetric = prometheus.NewHistogramVec(
@@ -53,8 +57,12 @@ func recordAWSThrottlesMetric(operation string) {
 	awsAPIThrottlesMetric.With(prometheus.Labels{"operation_name": operation}).Inc()
 }
 
+var registerOnce sync.Once
+
 func registerMetrics() {
-	prometheus.MustRegister(awsAPIMetric)
-	prometheus.MustRegister(awsAPIErrorMetric)
-	prometheus.MustRegister(awsAPIThrottlesMetric)
+	registerOnce.Do(func() {
+		prometheus.MustRegister(awsAPIMetric)
+		prometheus.MustRegister(awsAPIErrorMetric)
+		prometheus.MustRegister(awsAPIThrottlesMetric)
+	})
 }

pkg/cloudprovider/providers/openstack/openstack_metrics.go

@@ -16,7 +16,11 @@ limitations under the License.
 
 package openstack
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"sync"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
 
 const (
 	openstackSubsystem         = "openstack"
@@ -44,7 +48,11 @@ var (
 	)
 )
 
+var registerOnce sync.Once
+
 func registerMetrics() {
-	prometheus.MustRegister(openstackOperationsLatency)
-	prometheus.MustRegister(openstackAPIRequestErrors)
+	registerOnce.Do(func() {
+		prometheus.MustRegister(openstackOperationsLatency)
+		prometheus.MustRegister(openstackAPIRequestErrors)
+	})
 }