You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/04/24 15:41:55 UTC

[dubbo-go] branch master updated: clean code (#1858)

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/master by this push:
     new 8bea4b3e1 clean code (#1858)
8bea4b3e1 is described below

commit 8bea4b3e1607e13ed88b55300599e43274b6022f
Author: Alkaid <38...@users.noreply.github.com>
AuthorDate: Sun Apr 24 23:41:48 2022 +0800

    clean code (#1858)
    
    Signed-off-by: jyz0309 <45...@qq.com>
---
 metrics/prometheus/reporter.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/metrics/prometheus/reporter.go b/metrics/prometheus/reporter.go
index 845f6a8fc..57df38455 100644
--- a/metrics/prometheus/reporter.go
+++ b/metrics/prometheus/reporter.go
@@ -30,7 +30,6 @@ import (
 	ocprom "contrib.go.opencensus.io/exporter/prometheus"
 
 	"github.com/prometheus/client_golang/prometheus"
-	prom "github.com/prometheus/client_golang/prometheus"
 )
 
 import (
@@ -217,9 +216,9 @@ func newPrometheusReporter(reporterConfig *metrics.ReporterConfig) metrics.Repor
 				providerRTGaugeVec: newGaugeVec(providerPrefix+serviceKey+rtSuffix, reporterConfig.Namespace, labelNames),
 			}
 
-			prom.DefaultRegisterer.MustRegister(reporterInstance.consumerRTGaugeVec, reporterInstance.providerRTGaugeVec)
+			prometheus.DefaultRegisterer.MustRegister(reporterInstance.consumerRTGaugeVec, reporterInstance.providerRTGaugeVec)
 			metricsExporter, err := ocprom.NewExporter(ocprom.Options{
-				Registry: prom.DefaultRegisterer.(*prom.Registry),
+				Registry: prometheus.DefaultRegisterer.(*prometheus.Registry),
 			})
 			if err != nil {
 				logger.Errorf("new prometheus reporter with error = %s", err)
@@ -250,7 +249,7 @@ func (reporter *PrometheusReporter) setGauge(gaugeName string, toSetValue float6
 		// gauge
 		if val, exist := reporter.userGauge.Load(gaugeName); !exist {
 			newGauge := newGauge(gaugeName, reporter.namespace)
-			_ = prom.DefaultRegisterer.Register(newGauge)
+			_ = prometheus.DefaultRegisterer.Register(newGauge)
 
 			reporter.userGauge.Store(gaugeName, newGauge)
 			newGauge.Set(toSetValue)
@@ -267,7 +266,7 @@ func (reporter *PrometheusReporter) setGauge(gaugeName string, toSetValue float6
 			keyList = append(keyList, k)
 		}
 		newGaugeVec := newGaugeVec(gaugeName, reporter.namespace, keyList)
-		_ = prom.DefaultRegisterer.Register(newGaugeVec)
+		_ = prometheus.DefaultRegisterer.Register(newGaugeVec)
 		reporter.userGaugeVec.Store(gaugeName, newGaugeVec)
 		newGaugeVec.With(labelMap).Set(toSetValue)
 	} else {
@@ -282,7 +281,7 @@ func (reporter *PrometheusReporter) incCounter(counterName string, labelMap prom
 		// counter
 		if val, exist := reporter.userCounter.Load(counterName); !exist {
 			newCounter := newCounter(counterName, reporter.namespace)
-			_ = prom.DefaultRegisterer.Register(newCounter)
+			_ = prometheus.DefaultRegisterer.Register(newCounter)
 			reporter.userCounter.Store(counterName, newCounter)
 			newCounter.Inc()
 		} else {
@@ -298,7 +297,7 @@ func (reporter *PrometheusReporter) incCounter(counterName string, labelMap prom
 			keyList = append(keyList, k)
 		}
 		newCounterVec := newCounterVec(counterName, reporter.namespace, keyList)
-		_ = prom.DefaultRegisterer.Register(newCounterVec)
+		_ = prometheus.DefaultRegisterer.Register(newCounterVec)
 		reporter.userCounterVec.Store(counterName, newCounterVec)
 		newCounterVec.With(labelMap).Inc()
 	} else {
@@ -313,7 +312,7 @@ func (reporter *PrometheusReporter) incSummary(summaryName string, toSetValue fl
 		// summary
 		if val, exist := reporter.userSummary.Load(summaryName); !exist {
 			newSummary := newSummary(summaryName, reporter.namespace)
-			_ = prom.DefaultRegisterer.Register(newSummary)
+			_ = prometheus.DefaultRegisterer.Register(newSummary)
 			reporter.userSummary.Store(summaryName, newSummary)
 			newSummary.Observe(toSetValue)
 		} else {
@@ -329,7 +328,7 @@ func (reporter *PrometheusReporter) incSummary(summaryName string, toSetValue fl
 			keyList = append(keyList, k)
 		}
 		newSummaryVec := newSummaryVec(summaryName, reporter.namespace, keyList)
-		_ = prom.DefaultRegisterer.Register(newSummaryVec)
+		_ = prometheus.DefaultRegisterer.Register(newSummaryVec)
 		reporter.userSummaryVec.Store(summaryName, newSummaryVec)
 		newSummaryVec.With(labelMap).Observe(toSetValue)
 	} else {