add peer label

yeya24 · yeya24 · commit 4053d7a38294 · 2019-08-14T16:12:58.000+08:00
remove some labels which are possibly cause cardinality problem

Signed-off-by: yeya24 &lt;yb532204897@gmail.com&gt;
diff --git a/dfdaemon/constant/constant.go b/dfdaemon/constant/constant.go
@@ -46,8 +46,8 @@ const (
 )
 
 const (
-	// Namespace is the prefix of the metricsutils' name of dragonfly
+	// Namespace is the prefix of metrics namespace of dragonfly
 	Namespace = "dragonfly"
-	// Subsystem represents metricsutils for dfdaemon
+	// Subsystem represents metrics for dfdaemon
 	Subsystem = "dfdaemon"
 )
diff --git a/dfdaemon/handler/root_handler.go b/dfdaemon/handler/root_handler.go
@@ -32,6 +32,6 @@ func New() *http.ServeMux {
 	s.HandleFunc("/args", getArgs)
 	s.HandleFunc("/env", getEnv)
 	s.HandleFunc("/debug/version", version.Handler)
-	s.HandleFunc("/metricsutils", promhttp.Handler().ServeHTTP)
+	s.HandleFunc("/metrics", promhttp.Handler().ServeHTTP)
 	return s
 }
diff --git a/docs/user_guide/metrics.md b/docs/user_guide/metrics.md
@@ -9,10 +9,10 @@ This doc contains all the metrics that Dragonfly components currently support. N
 - dragonfly_supernode_http_request_duration_seconds{code, handler, method} - http request latency in seconds
 - dragonfly_supernode_http_request_size_bytes{code, handler, method} - http request size in bytes
 - dragonfly_supernode_http_response_size_bytes{code, handler, method} - http response size in bytes
-- dragonfly_supernode_peers{hostname} - dragonfly peers
-- dragonfly_supernode_tasks{taskid, cdnstatus} - dragonfly tasks
-- dragonfly_supernode_dfgettasks{taskid, callsystem} - dragonfly dfget tasks
-- dragonfly_supernode_schedule_duration_milliseconds{taskid} - duration for task scheduling in milliseconds
+- dragonfly_supernode_peers{peer} - dragonfly peers, the label peer consists of the hostname and ip address of one peer.
+- dragonfly_supernode_tasks{cdnstatus} - dragonfly tasks
+- dragonfly_supernode_dfgettasks{callsystem} - dragonfly dfget tasks
+- dragonfly_supernode_schedule_duration_milliseconds{peer} - duration for task scheduling in milliseconds
 - dragonfly_supernode_trigger_cdn_total{} - total times of triggering cdn.
 - dragonfly_supernode_trigger_cdn_failed_total{} - total failed times of triggering cdn.
 
diff --git a/supernode/config/constants.go b/supernode/config/constants.go
@@ -70,8 +70,8 @@ const (
 )
 
 const (
-	// SubsystemSupernode represents metricsutils from supernode
+	// SubsystemSupernode represents metrics from supernode
 	SubsystemSupernode = "supernode"
-	// SubsystemDfget represents metricsutils from dfget
+	// SubsystemDfget represents metrics from dfget
 	SubsystemDfget = "dfget"
 )
diff --git a/supernode/daemon/mgr/dfgettask/manager.go b/supernode/daemon/mgr/dfgettask/manager.go
@@ -42,7 +42,7 @@ type metrics struct {
 func newMetrics(register prometheus.Registerer) *metrics {
 	return &metrics{
 		dfgetTasks: metricsutils.NewGauge(config.SubsystemSupernode, "dfgettasks",
-			"The number of dfget tasks", []string{"taskid", "callsystem"}, register),
+			"The number of dfget tasks", []string{"callsystem"}, register),
 	}
 }
 
@@ -89,7 +89,7 @@ func (dtm *Manager) Add(ctx context.Context, dfgetTask *types.DfGetTask) error {
 
 	dtm.ptoc.Add(generatePeerKey(dfgetTask.PeerID, dfgetTask.TaskID), dfgetTask.CID)
 	dtm.dfgetTaskStore.Put(key, dfgetTask)
-	dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.TaskID, dfgetTask.CallSystem).Inc()
+	dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.CallSystem).Inc()
 
 	return nil
 }
@@ -121,7 +121,7 @@ func (dtm *Manager) Delete(ctx context.Context, clientID, taskID string) error {
 		return err
 	}
 	dtm.ptoc.Delete(generatePeerKey(dfgetTask.PeerID, dfgetTask.TaskID))
-	dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.TaskID, dfgetTask.CallSystem).Dec()
+	dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.CallSystem).Dec()
 	return dtm.dfgetTaskStore.Delete(key)
 }
 
diff --git a/supernode/daemon/mgr/dfgettask/manager_test.go b/supernode/daemon/mgr/dfgettask/manager_test.go
@@ -96,7 +96,7 @@ func (s *DfgetTaskMgrTestSuite) TestDfgetTaskAdd(c *check.C) {
 		c.Check(err, check.IsNil)
 		c.Assert(1, check.Equals,
 			int(prom_testutil.ToFloat64(
-				dfgetTasks.WithLabelValues(tc.dfgetTask.TaskID, tc.dfgetTask.CallSystem))))
+				dfgetTasks.WithLabelValues(tc.dfgetTask.CallSystem))))
 		dt, err := manager.Get(context.Background(), tc.dfgetTask.CID, tc.dfgetTask.TaskID)
 		c.Check(err, check.IsNil)
 		c.Check(dt, check.DeepEquals, tc.Expect)
@@ -207,7 +207,7 @@ func (s *DfgetTaskMgrTestSuite) TestDfgetTaskDelete(c *check.C) {
 		c.Check(err, check.IsNil)
 		c.Assert(0, check.Equals,
 			int(prom_testutil.ToFloat64(
-				dfgetTasks.WithLabelValues(tc.dfgetTask.TaskID, tc.dfgetTask.CallSystem))))
+				dfgetTasks.WithLabelValues(tc.dfgetTask.CallSystem))))
 
 		_, err = manager.Get(context.Background(), tc.dfgetTask.CID, tc.dfgetTask.TaskID)
 		c.Check(errortypes.IsDataNotFound(err), check.Equals, true)
diff --git a/supernode/daemon/mgr/peer/manager.go b/supernode/daemon/mgr/peer/manager.go
@@ -44,7 +44,7 @@ type metrics struct {
 func newMetrics(register prometheus.Registerer) *metrics {
 	return &metrics{
 		peers: metricsutils.NewGauge(config.SubsystemSupernode, "peers",
-			"The number of supernode peers", []string{"hostname"}, register),
+			"The number of supernode peers", []string{"peer"}, register),
 	}
 }
 
@@ -83,7 +83,7 @@ func (pm *Manager) Register(ctx context.Context, peerCreateRequest *types.PeerCr
 		Created:  strfmt.DateTime(time.Now()),
 	}
 	pm.peerStore.Put(id, peerInfo)
-	pm.metrics.peers.WithLabelValues(peerInfo.HostName.String()).Inc()
+	pm.metrics.peers.WithLabelValues(GeneratePeerName(peerInfo)).Inc()
 
 	return &types.PeerCreateResponse{
 		ID: id,
@@ -98,7 +98,7 @@ func (pm *Manager) DeRegister(ctx context.Context, peerID string) error {
 	}
 
 	pm.peerStore.Delete(peerID)
-	pm.metrics.peers.WithLabelValues(peerInfo.HostName.String()).Dec()
+	pm.metrics.peers.WithLabelValues(GeneratePeerName(peerInfo)).Dec()
 	return nil
 }
 
@@ -200,3 +200,8 @@ func getLessFunc(listResult []interface{}, desc bool) (less func(i, j int) bool)
 func generatePeerID(peerInfo *types.PeerCreateRequest) string {
 	return fmt.Sprintf("%s-%s-%d", peerInfo.HostName.String(), peerInfo.IP.String(), time.Now().UnixNano())
 }
+
+// GeneratePeerName extracts the hostname and ip from peerInfo.
+func GeneratePeerName(info *types.PeerInfo) string {
+	return info.HostName.String() + "-" + info.IP.String()
+}
diff --git a/supernode/daemon/mgr/peer/manager_test.go b/supernode/daemon/mgr/peer/manager_test.go
@@ -56,7 +56,7 @@ func (s *PeerMgrTestSuite) TestPeerMgr(c *check.C) {
 	c.Check(err, check.IsNil)
 
 	c.Assert(1, check.Equals,
-		int(prom_testutil.ToFloat64(peers.WithLabelValues("foo"))))
+		int(prom_testutil.ToFloat64(peers.WithLabelValues("foo-192.168.10.11"))))
 
 	// get
 	id := resp.ID
@@ -82,7 +82,7 @@ func (s *PeerMgrTestSuite) TestPeerMgr(c *check.C) {
 	c.Check(err, check.IsNil)
 
 	c.Assert(0, check.Equals,
-		int(prom_testutil.ToFloat64(peers.WithLabelValues("foo"))))
+		int(prom_testutil.ToFloat64(peers.WithLabelValues("foo-192.168.10.11"))))
 
 	// get
 	info, err = manager.Get(context.Background(), id)
diff --git a/supernode/daemon/mgr/task/manager.go b/supernode/daemon/mgr/task/manager.go
@@ -53,7 +53,7 @@ type metrics struct {
 func newMetrics(register prometheus.Registerer) *metrics {
 	return &metrics{
 		tasks: metricsutils.NewGauge(config.SubsystemSupernode, "tasks",
-			"The status of Supernode tasks", []string{"taskid", "cdnstatus"}, register),
+			"The status of Supernode tasks", []string{"cdnstatus"}, register),
 
 		triggerCdnCount: metricsutils.NewCounter(config.SubsystemSupernode, "trigger_cdn_total",
 			"The number of triggering cdn", []string{}, register),
@@ -62,8 +62,8 @@ func newMetrics(register prometheus.Registerer) *metrics {
 			"The number of triggering cdn failure", []string{}, register),
 
 		scheduleDurationMilliSeconds: metricsutils.NewHistogram(config.SubsystemSupernode, "schedule_duration_milliseconds",
-			"duration for task scheduling in milliseconds", []string{"taskid"},
-			prometheus.ExponentialBuckets(0.02, 2, 7), register),
+			"Duration for task scheduling in milliseconds", []string{"peer"},
+			prometheus.ExponentialBuckets(0.02, 2, 6), register),
 	}
 }
 
diff --git a/supernode/daemon/mgr/task/manager_util.go b/supernode/daemon/mgr/task/manager_util.go
@@ -30,6 +30,7 @@ import (
 	"github.com/dragonflyoss/Dragonfly/pkg/timeutils"
 	"github.com/dragonflyoss/Dragonfly/supernode/config"
 	"github.com/dragonflyoss/Dragonfly/supernode/daemon/mgr"
+	"github.com/dragonflyoss/Dragonfly/supernode/daemon/mgr/peer"
 	"github.com/dragonflyoss/Dragonfly/supernode/util"
 
 	"github.com/pkg/errors"
@@ -110,7 +111,7 @@ func (tm *Manager) addOrUpdateTask(ctx context.Context, req *types.TaskCreateReq
 	task.PieceTotal = int32((fileLength + (int64(pieceSize) - 1)) / int64(pieceSize))
 
 	tm.taskStore.Put(taskID, task)
-	tm.metrics.tasks.WithLabelValues(taskID, task.CdnStatus).Inc()
+	tm.metrics.tasks.WithLabelValues(task.CdnStatus).Inc()
 	return task, nil
 }
 
@@ -162,8 +163,8 @@ func (tm *Manager) updateTask(taskID string, updateTaskInfo *types.TaskInfo) err
 
 		// only update the task CdnStatus when the new CDNStatus and
 		// the origin CDNStatus both not equals success
-		tm.metrics.tasks.WithLabelValues(taskID, task.CdnStatus).Dec()
-		tm.metrics.tasks.WithLabelValues(taskID, updateTaskInfo.CdnStatus).Inc()
+		tm.metrics.tasks.WithLabelValues(task.CdnStatus).Dec()
+		tm.metrics.tasks.WithLabelValues(updateTaskInfo.CdnStatus).Inc()
 		task.CdnStatus = updateTaskInfo.CdnStatus
 		return nil
 	}
@@ -178,27 +179,15 @@ func (tm *Manager) updateTask(taskID string, updateTaskInfo *types.TaskInfo) err
 		task.RealMd5 = updateTaskInfo.RealMd5
 	}
 
-	// only update the task info when the new CDNStatus equals success
-	// and the origin CDNStatus not equals success.
-	if isSuccessCDN(updateTaskInfo.CdnStatus) {
-		if updateTaskInfo.FileLength != 0 {
-			task.FileLength = updateTaskInfo.FileLength
-		}
-
-		if !stringutils.IsEmptyStr(updateTaskInfo.RealMd5) {
-			task.RealMd5 = updateTaskInfo.RealMd5
-		}
-
-		var pieceTotal int32
-		if updateTaskInfo.FileLength > 0 {
-			pieceTotal = int32((updateTaskInfo.FileLength + int64(task.PieceSize-1)) / int64(task.PieceSize))
-		}
-		if pieceTotal != 0 {
-			task.PieceTotal = pieceTotal
-		}
+	var pieceTotal int32
+	if updateTaskInfo.FileLength > 0 {
+		pieceTotal = int32((updateTaskInfo.FileLength + int64(task.PieceSize-1)) / int64(task.PieceSize))
 	}
-	tm.metrics.tasks.WithLabelValues(taskID, task.CdnStatus).Dec()
-	tm.metrics.tasks.WithLabelValues(taskID, updateTaskInfo.CdnStatus).Inc()
+	if pieceTotal != 0 {
+		task.PieceTotal = pieceTotal
+	}
+	tm.metrics.tasks.WithLabelValues(task.CdnStatus).Dec()
+	tm.metrics.tasks.WithLabelValues(updateTaskInfo.CdnStatus).Inc()
 	task.CdnStatus = updateTaskInfo.CdnStatus
 
 	return nil
@@ -342,14 +331,18 @@ func (tm *Manager) parseAvailablePeers(ctx context.Context, clientID string, tas
 		return true, finishInfo, nil
 	}
 
+	// Get peerName to represent peer in metrics.
+	p, _ := tm.peerMgr.Get(context.Background(), dfgetTask.PeerID)
+	peerName := peer.GeneratePeerName(p)
+
 	// get scheduler pieceResult
 	logrus.Debugf("start scheduler for taskID: %s clientID: %s", task.ID, clientID)
 	startTime := time.Now()
 	pieceResult, err := tm.schedulerMgr.Schedule(ctx, task.ID, clientID, dfgetTask.PeerID)
 	if err != nil {
 		return false, nil, err
 	}
-	tm.metrics.scheduleDurationMilliSeconds.WithLabelValues(task.ID).Observe(timeutils.SinceInMilliseconds(startTime))
+	tm.metrics.scheduleDurationMilliSeconds.WithLabelValues(peerName).Observe(timeutils.SinceInMilliseconds(startTime))
 	logrus.Debugf("get scheduler result length(%d) with taskID(%s) and clientID(%s)", len(pieceResult), task.ID, clientID)
 
 	var pieceInfos []*types.PieceInfo
diff --git a/supernode/daemon/mgr/task/manager_util_test.go b/supernode/daemon/mgr/task/manager_util_test.go
@@ -18,6 +18,7 @@ package task
 
 import (
 	"context"
+
 	"github.com/dragonflyoss/Dragonfly/apis/types"
 	"github.com/dragonflyoss/Dragonfly/supernode/config"
 	"github.com/dragonflyoss/Dragonfly/supernode/daemon/mgr/mock"
diff --git a/supernode/server/metrics.go b/supernode/server/metrics.go
@@ -26,7 +26,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-// metricsutils defines three prometheus metricsutils for monitoring http handler status
+// metrics defines three prometheus metrics for monitoring http handler status
 type metrics struct {
 	requestCounter  *prometheus.CounterVec
 	requestDuration *prometheus.HistogramVec
@@ -37,24 +37,24 @@ type metrics struct {
 func newMetrics(register prometheus.Registerer) *metrics {
 	return &metrics{
 		requestCounter: metricsutils.NewCounter(config.SubsystemSupernode, "http_requests_total",
-			"Counter of HTTP requests.", []string{"code", "handler", "method"}, register,
+			"Counter of HTTP requests.", []string{"code", "handler"}, register,
 		),
 		requestDuration: metricsutils.NewHistogram(config.SubsystemSupernode, "http_request_duration_seconds",
-			"Histogram of latencies for HTTP requests.", []string{"code", "handler", "method"},
+			"Histogram of latencies for HTTP requests.", []string{"handler"},
 			[]float64{.1, .2, .4, 1, 3, 8, 20, 60, 120}, register,
 		),
 		requestSize: metricsutils.NewHistogram(config.SubsystemSupernode, "http_request_size_bytes",
-			"Histogram of request size for HTTP requests.", []string{"code", "handler", "method"},
+			"Histogram of request size for HTTP requests.", []string{"handler"},
 			prometheus.ExponentialBuckets(100, 10, 8), register,
 		),
 		responseSize: metricsutils.NewHistogram(config.SubsystemSupernode, "http_response_size_bytes",
-			"Histogram of response size for HTTP requests.", []string{"code", "handler", "method"},
+			"Histogram of response size for HTTP requests.", []string{"handler"},
 			prometheus.ExponentialBuckets(100, 10, 8), register,
 		),
 	}
 }
 
-// instrumentHandler will update metricsutils for every http request
+// instrumentHandler will update metrics for every http request
 func (m *metrics) instrumentHandler(handlerName string, handler http.HandlerFunc) http.HandlerFunc {
 	return promhttp.InstrumentHandlerDuration(
 		m.requestDuration.MustCurryWith(prometheus.Labels{"handler": handlerName}),
diff --git a/supernode/server/router.go b/supernode/server/router.go
@@ -55,7 +55,8 @@ func initRoute(s *Server) *mux.Router {
 		{Method: http.MethodGet, Path: "/peers/{id}", HandlerFunc: s.getPeer},
 		{Method: http.MethodGet, Path: "/peers", HandlerFunc: s.listPeers},
 
-		{Method: http.MethodGet, Path: "/metricsutils", HandlerFunc: handleMetrics},
+		// metrics
+		{Method: http.MethodGet, Path: "/metrics", HandlerFunc: handleMetrics},
 	}
 
 	// register API
diff --git a/supernode/server/router_test.go b/supernode/server/router_test.go
@@ -129,20 +129,20 @@ func (rs *RouterTestSuite) TestVersionHandler(c *check.C) {
 }
 
 func (rs *RouterTestSuite) TestHTTPMetrics(c *check.C) {
-	// ensure /metricsutils is accessible
-	code, _, err := httputils.Get("http://"+rs.addr+"/metricsutils", 0)
+	// ensure /metrics is accessible
+	code, _, err := httputils.Get("http://"+rs.addr+"/metrics", 0)
 	c.Check(err, check.IsNil)
 	c.Assert(code, check.Equals, 200)
 
 	counter := m.requestCounter
 	c.Assert(1, check.Equals,
-		int(prom_testutil.ToFloat64(counter.WithLabelValues(strconv.Itoa(http.StatusOK), "/metricsutils", "get"))))
+		int(prom_testutil.ToFloat64(counter.WithLabelValues(strconv.Itoa(http.StatusOK), "/metrics"))))
 
 	for i := 0; i < 5; i++ {
 		code, _, err := httputils.Get("http://"+rs.addr+"/_ping", 0)
 		c.Check(err, check.IsNil)
 		c.Assert(code, check.Equals, 200)
 		c.Assert(i+1, check.Equals,
-			int(prom_testutil.ToFloat64(counter.WithLabelValues(strconv.Itoa(http.StatusOK), "/_ping", "get"))))
+			int(prom_testutil.ToFloat64(counter.WithLabelValues(strconv.Itoa(http.StatusOK), "/_ping"))))
 	}
 }
diff --git a/test/api_metrics_test.go b/test/api_metrics_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/go-check/check"
 )
 
-// APIMetricsSuite is the test suite for Prometheus metricsutils.
+// APIMetricsSuite is the test suite for Prometheus metrics.
 type APIMetricsSuite struct {
 	starter *command.Starter
 }
@@ -46,37 +46,37 @@ func (s *APIMetricsSuite) TearDownSuite(c *check.C) {
 	s.starter.Clean()
 }
 
-// TestMetrics tests /metricsutils API.
+// TestMetrics tests /metrics API.
 func (s *APIMetricsSuite) TestMetrics(c *check.C) {
-	resp, err := request.Get("/metricsutils")
+	resp, err := request.Get("/metrics")
 	c.Assert(err, check.IsNil)
 	defer resp.Body.Close()
 
 	CheckRespStatus(c, resp, 200)
 }
 
-// TestMetricsRequestTotal tests http-related metricsutils.
+// TestMetricsRequestTotal tests http-related metrics.
 func (s *APIMetricsSuite) TestHttpMetrics(c *check.C) {
-	requestCounter := `dragonfly_supernode_http_requests_total{code="%d",handler="%s",method="%s"}`
-	responseSizeSum := `dragonfly_supernode_http_response_size_bytes_sum{code="%d",handler="%s",method="%s"}`
-	responseSizeCount := `dragonfly_supernode_http_response_size_bytes_count{code="%d",handler="%s",method="%s"}`
-	requestSizeCount := `dragonfly_supernode_http_request_size_bytes_count{code="%d",handler="%s",method="%s"}`
+	requestCounter := `dragonfly_supernode_http_requests_total{code="%d",handler="%s"}`
+	responseSizeSum := `dragonfly_supernode_http_response_size_bytes_sum{handler="%s"}`
+	responseSizeCount := `dragonfly_supernode_http_response_size_bytes_count{handler="%s"}`
+	requestSizeCount := `dragonfly_supernode_http_request_size_bytes_count{handler="%s"}`
 
 	resp, err := request.Get("/_ping")
 	c.Assert(err, check.IsNil)
 	CheckRespStatus(c, resp, 200)
 
 	// Get httpRequest counter value equals 1.
-	CheckMetric(c, fmt.Sprintf(requestCounter, 200, "/_ping", "get"), 1)
+	CheckMetric(c, fmt.Sprintf(requestCounter, 200, "/_ping"), 1)
 
 	// Get httpResponse size sum value equals 2.
-	CheckMetric(c, fmt.Sprintf(responseSizeSum, 200, "/_ping", "get"), 2)
+	CheckMetric(c, fmt.Sprintf(responseSizeSum, "/_ping"), 2)
 
 	// Get httpResponse size count value equals 1.
-	CheckMetric(c, fmt.Sprintf(responseSizeCount, 200, "/_ping", "get"), 1)
+	CheckMetric(c, fmt.Sprintf(responseSizeCount, "/_ping"), 1)
 
 	// Get httpRequest size count value equals 1.
-	CheckMetric(c, fmt.Sprintf(requestSizeCount, 200, "/_ping", "get"), 1)
+	CheckMetric(c, fmt.Sprintf(requestSizeCount, "/_ping"), 1)
 }
 
 // TestBuildInfoMetrics tests build info metric.
diff --git a/test/util_api.go b/test/util_api.go

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ const (`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`const (`
`49`		`- // Namespace is the prefix of the metricsutils' name of dragonfly`
	`49`	`+ // Namespace is the prefix of metrics namespace of dragonfly`
`50`	`50`	`Namespace = "dragonfly"`
`51`		`- // Subsystem represents metricsutils for dfdaemon`
	`51`	`+ // Subsystem represents metrics for dfdaemon`
`52`	`52`	`Subsystem = "dfdaemon"`
`53`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ func New() *http.ServeMux {`
`32`	`32`	`s.HandleFunc("/args", getArgs)`
`33`	`33`	`s.HandleFunc("/env", getEnv)`
`34`	`34`	`s.HandleFunc("/debug/version", version.Handler)`
`35`		`- s.HandleFunc("/metricsutils", promhttp.Handler().ServeHTTP)`
	`35`	`+ s.HandleFunc("/metrics", promhttp.Handler().ServeHTTP)`
`36`	`36`	`return s`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ const (`
`70`	`70`	`)`
`71`	`71`
`72`	`72`	`const (`
`73`		`- // SubsystemSupernode represents metricsutils from supernode`
	`73`	`+ // SubsystemSupernode represents metrics from supernode`
`74`	`74`	`SubsystemSupernode = "supernode"`
`75`		`- // SubsystemDfget represents metricsutils from dfget`
	`75`	`+ // SubsystemDfget represents metrics from dfget`
`76`	`76`	`SubsystemDfget = "dfget"`
`77`	`77`	`)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type metrics struct {`
`42`	`42`	`func newMetrics(register prometheus.Registerer) *metrics {`
`43`	`43`	`return &metrics{`
`44`	`44`	`dfgetTasks: metricsutils.NewGauge(config.SubsystemSupernode, "dfgettasks",`
`45`		`- "The number of dfget tasks", []string{"taskid", "callsystem"}, register),`
	`45`	`+ "The number of dfget tasks", []string{"callsystem"}, register),`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -89,7 +89,7 @@ func (dtm Manager) Add(ctx context.Context, dfgetTask types.DfGetTask) error {`
`89`	`89`
`90`	`90`	`dtm.ptoc.Add(generatePeerKey(dfgetTask.PeerID, dfgetTask.TaskID), dfgetTask.CID)`
`91`	`91`	`dtm.dfgetTaskStore.Put(key, dfgetTask)`
`92`		`- dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.TaskID, dfgetTask.CallSystem).Inc()`
	`92`	`+ dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.CallSystem).Inc()`
`93`	`93`
`94`	`94`	`return nil`
`95`	`95`	`}`
`@@ -121,7 +121,7 @@ func (dtm *Manager) Delete(ctx context.Context, clientID, taskID string) error {`
`121`	`121`	`return err`
`122`	`122`	`}`
`123`	`123`	`dtm.ptoc.Delete(generatePeerKey(dfgetTask.PeerID, dfgetTask.TaskID))`
`124`		`- dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.TaskID, dfgetTask.CallSystem).Dec()`
	`124`	`+ dtm.metrics.dfgetTasks.WithLabelValues(dfgetTask.CallSystem).Dec()`
`125`	`125`	`return dtm.dfgetTaskStore.Delete(key)`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ type metrics struct {`
`44`	`44`	`func newMetrics(register prometheus.Registerer) *metrics {`
`45`	`45`	`return &metrics{`
`46`	`46`	`peers: metricsutils.NewGauge(config.SubsystemSupernode, "peers",`
`47`		`- "The number of supernode peers", []string{"hostname"}, register),`
	`47`	`+ "The number of supernode peers", []string{"peer"}, register),`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`@@ -83,7 +83,7 @@ func (pm Manager) Register(ctx context.Context, peerCreateRequest types.PeerCr`
`83`	`83`	`Created: strfmt.DateTime(time.Now()),`
`84`	`84`	`}`
`85`	`85`	`pm.peerStore.Put(id, peerInfo)`
`86`		`- pm.metrics.peers.WithLabelValues(peerInfo.HostName.String()).Inc()`
	`86`	`+ pm.metrics.peers.WithLabelValues(GeneratePeerName(peerInfo)).Inc()`
`87`	`87`
`88`	`88`	`return &types.PeerCreateResponse{`
`89`	`89`	`ID: id,`
`@@ -98,7 +98,7 @@ func (pm *Manager) DeRegister(ctx context.Context, peerID string) error {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`pm.peerStore.Delete(peerID)`
`101`		`- pm.metrics.peers.WithLabelValues(peerInfo.HostName.String()).Dec()`
	`101`	`+ pm.metrics.peers.WithLabelValues(GeneratePeerName(peerInfo)).Dec()`
`102`	`102`	`return nil`
`103`	`103`	`}`
`104`	`104`
`@@ -200,3 +200,8 @@ func getLessFunc(listResult []interface{}, desc bool) (less func(i, j int) bool)`
`200`	`200`	`func generatePeerID(peerInfo *types.PeerCreateRequest) string {`
`201`	`201`	`return fmt.Sprintf("%s-%s-%d", peerInfo.HostName.String(), peerInfo.IP.String(), time.Now().UnixNano())`
`202`	`202`	`}`
	`203`	`+`
	`204`	`+// GeneratePeerName extracts the hostname and ip from peerInfo.`
	`205`	`+func GeneratePeerName(info *types.PeerInfo) string {`
	`206`	`+ return info.HostName.String() + "-" + info.IP.String()`
	`207`	`+}`