Address review comments

Author: ulope

rolling-shutter/p2p/dht.go

@@ -87,12 +87,13 @@ func findPeers(ctx context.Context, h host.Host, d discovery.Discoverer, ns stri
 
 			newConnections := 0
 			failedDials := 0
+			ourId := h.ID().String()
 			for _, p := range peers {
 				collectPeerAddresses(p)
 				if p.ID == h.ID() {
 					continue
 				}
-				metricsP2PPeerConnectedness.WithLabelValues(p.ID.String()).Add(float64(h.Network().Connectedness(p.ID)))
+				metricsP2PPeerConnectedness.WithLabelValues(ourId, p.ID.String()).Add(float64(h.Network().Connectedness(p.ID)))
 				if h.Network().Connectedness(p.ID) != network.Connected {
 					_, err = h.Network().DialPeer(ctx, p.ID)
 					if err != nil {

rolling-shutter/p2p/metrics.go

@@ -31,7 +31,7 @@ var metricsP2PPeerTuples = prometheus.NewGaugeVec(
 	prometheus.GaugeOpts{
 		Namespace: "shutter",
 		Subsystem: "p2p",
-		Name:      "peer_candidate",
+		Name:      "peer_candidate_info",
 		Help:      "Collection of the encountered peer tuples.",
 	},
 	[]string{"peer_id", "peer_ip"})
@@ -43,7 +43,7 @@ var metricsP2PPeerConnectedness = prometheus.NewGaugeVec(
 		Name:      "peer_connectedness",
 		Help:      "Collection of the connectedness (0=NotConnected; 1=Connected; 2=CanConnect; 3=CannotConnect) to a peer ID.",
 	},
-	[]string{"peer_id"})
+	[]string{"our_id", "peer_id"})
 
 func collectPeerAddresses(p peer.AddrInfo) {
 	for _, multiAddr := range p.Addrs {
@@ -55,4 +55,5 @@ func init() {
 	prometheus.MustRegister(metricsP2PMessageValidationTime)
 	prometheus.MustRegister(metricsP2PMessageHandlingTime)
 	prometheus.MustRegister(metricsP2PPeerTuples)
+	prometheus.MustRegister(metricsP2PPeerConnectedness)
 }