Fix app name in metric is unknown_ go_ service (alibaba#453)

kklinan · Jan 26, 2022 · ce23393 · ce23393
1 parent ea8c74f
commit ce23393
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 25 deletions.
diff --git a/api/init.go b/api/init.go
@@ -19,8 +19,11 @@ import (
 	"net"
 	"net/http"
 
+	"github.com/alibaba/sentinel-golang/core/circuitbreaker"
 	"github.com/alibaba/sentinel-golang/core/config"
+	"github.com/alibaba/sentinel-golang/core/flow"
 	"github.com/alibaba/sentinel-golang/core/log/metric"
+	"github.com/alibaba/sentinel-golang/core/stat"
 	"github.com/alibaba/sentinel-golang/core/system_metric"
 	metric_exporter "github.com/alibaba/sentinel-golang/exporter/metric"
 	"github.com/alibaba/sentinel-golang/util"
@@ -87,6 +90,11 @@ func initCoreComponents() error {
 		}
 	}
 
+	flow.Init()
+	stat.Init()
+	system_metric.Init()
+	circuitbreaker.Init()
+
 	systemStatInterval := config.SystemStatCollectIntervalMs()
 	loadStatInterval := systemStatInterval
 	cpuStatInterval := systemStatInterval

diff --git a/core/circuitbreaker/circuit_breaker.go b/core/circuitbreaker/circuit_breaker.go
@@ -49,19 +49,20 @@ const (
 )
 
 var (
+	stateChangedCounter metric_exporter.Counter
+)
+
+func Init() {
 	stateChangedCounter = metric_exporter.NewCounter(
 		"circuit_breaker_state_changed_total",
 		"Circuit breaker total state change count",
-		[]string{"resource", "from_state", "to_state"})
-)
-
-func init() {
+		[]string{"resource", "from_state", "to_state"},
+	)
 	metric_exporter.Register(stateChangedCounter)
 }
 
 func newState() *State {
-	var state State
-	state = Closed
+	state := Closed
 
 	return &state
 }

diff --git a/core/flow/traffic_shaping.go b/core/flow/traffic_shaping.go
@@ -20,13 +20,15 @@ import (
 )
 
 var (
+	resourceFlowThresholdGauge metric_exporter.Gauge
+)
+
+func Init() {
 	resourceFlowThresholdGauge = metric_exporter.NewGauge(
 		"resource_flow_threshold",
 		"Resource flow threshold",
-		[]string{"resource"})
-)
-
-func init() {
+		[]string{"resource"},
+	)
 	metric_exporter.Register(resourceFlowThresholdGauge)
 }
 

diff --git a/core/stat/stat_slot.go b/core/stat/stat_slot.go
@@ -29,13 +29,15 @@ const (
 var (
 	DefaultSlot = &Slot{}
 
+	handledCounter metric_exporter.Counter
+)
+
+func Init() {
 	handledCounter = metric_exporter.NewCounter(
 		"handled_total",
 		"Total handled count",
-		[]string{"resource", "result", "block_type"})
-)
-
-func init() {
+		[]string{"resource", "result", "block_type"},
+	)
 	metric_exporter.Register(handledCounter)
 }
 

diff --git a/core/system_metric/sys_metric_stat.go b/core/system_metric/sys_metric_stat.go
@@ -50,14 +50,8 @@ var (
 
 	ssStopChan = make(chan struct{})
 
-	cpuRatioGauge = metric_exporter.NewGauge(
-		"cpu_ratio",
-		"Process cpu ratio",
-		[]string{})
-	processMemoryGauge = metric_exporter.NewGauge(
-		"process_memory_bytes",
-		"Process memory in bytes",
-		[]string{})
+	cpuRatioGauge      metric_exporter.Gauge
+	processMemoryGauge metric_exporter.Gauge
 )
 
 func init() {
@@ -73,8 +67,21 @@ func init() {
 	currentProcessOnce.Do(func() {
 		currentProcess.Store(p)
 	})
+}
 
+func Init() {
+	cpuRatioGauge = metric_exporter.NewGauge(
+		"cpu_ratio",
+		"Process cpu ratio",
+		[]string{},
+	)
 	metric_exporter.Register(cpuRatioGauge)
+
+	processMemoryGauge = metric_exporter.NewGauge(
+		"process_memory_bytes",
+		"Process memory in bytes",
+		[]string{},
+	)
 	metric_exporter.Register(processMemoryGauge)
 }
 

diff --git a/exporter/metric/exporter.go b/exporter/metric/exporter.go
@@ -27,7 +27,6 @@ var (
 	exporter Exporter
 
 	host      string
-	app       string
 	pid       string
 	namespace string
 )
@@ -39,7 +38,6 @@ func init() {
 	if host == "" {
 		host = "unknown"
 	}
-	app = config.AppName()
 	pid = strconv.Itoa(os.Getpid())
 	namespace = "sentinel_go"
 }
@@ -111,8 +109,8 @@ func (e *prometheusExporter) HTTPHandler() http.Handler {
 func newConstLabels() map[string]string {
 	return map[string]string{
 		"host": host,
-		"app":  app,
 		"pid":  pid,
+		"app":  config.AppName(),
 	}
 }