From 2c890310a9a07e52088333f648e920060d5655a2 Mon Sep 17 00:00:00 2001
From: Vishal <1117327+vishalchangrani@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:01:39 -0800
Subject: [PATCH] changing ping metrics NodeID to only include the flow node
 identifier; Adding a new label nodeaddress to the ping metrics reported by
 the access node (#278)

---
 module/metrics/labels.go | 19 ++++++++++---------
 module/metrics/ping.go   |  9 +++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/module/metrics/labels.go b/module/metrics/labels.go
index 777bb004933..9660027f28a 100644
--- a/module/metrics/labels.go
+++ b/module/metrics/labels.go
@@ -1,15 +1,16 @@
 package metrics
 
 const (
-	LabelChannel  = "topic"
-	LabelChain    = "chain"
-	EngineLabel   = "engine"
-	LabelResource = "resource"
-	LabelMessage  = "message"
-	LabelNodeID   = "nodeid"
-	LabelNodeRole = "noderole"
-	LabelNodeInfo = "nodeinfo"
-	LabelPriority = "priority"
+	LabelChannel     = "topic"
+	LabelChain       = "chain"
+	EngineLabel      = "engine"
+	LabelResource    = "resource"
+	LabelMessage     = "message"
+	LabelNodeID      = "nodeid"
+	LabelNodeAddress = "nodeaddress"
+	LabelNodeRole    = "noderole"
+	LabelNodeInfo    = "nodeinfo"
+	LabelPriority    = "priority"
 )
 
 const (
diff --git a/module/metrics/ping.go b/module/metrics/ping.go
index 2261238593e..f70e0179fcc 100644
--- a/module/metrics/ping.go
+++ b/module/metrics/ping.go
@@ -20,7 +20,7 @@ func NewPingCollector() *PingCollector {
 			Namespace: namespaceNetwork,
 			Subsystem: subsystemGossip,
 			Help:      "report whether a node is reachable",
-		}, []string{LabelNodeID, LabelNodeRole, LabelNodeInfo}),
+		}, []string{LabelNodeID, LabelNodeAddress, LabelNodeRole, LabelNodeInfo}),
 	}
 	return pc
 }
@@ -34,8 +34,9 @@ func (pc *PingCollector) NodeReachable(node *flow.Identity, nodeInfo string, rtt
 	}
 
 	pc.reachable.With(prometheus.Labels{
-		LabelNodeID:   node.String(),
-		LabelNodeRole: node.Role.String(),
-		LabelNodeInfo: nodeInfo}).
+		LabelNodeID:      node.NodeID.String(),
+		LabelNodeAddress: node.Address,
+		LabelNodeRole:    node.Role.String(),
+		LabelNodeInfo:    nodeInfo}).
 		Set(rttValue)
 }