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

@@ -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 (

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)
 }