fix: address PR comments

Author: sbackend123

pkg/bzz/transport_test.go

@@ -283,6 +283,21 @@ func TestClassifyTransport(t *testing.T) {
 			addr:     mustMultiaddr("/ip6/::1/tcp/1635/tls/sni/0--1.k2k4r8pr3m3aug5nudg2y039qfj2gxw6wnlx0e0ghzxufcn38soyp9z4.libp2p.direct/ws/p2p/QmfSx1ujzboapD5h2CiqTJqUy46FeTDwXBszB3XUCfKEEj"),
 			expected: bzz.TransportWSS,
 		},
+		{
+			name:     "WSS address with deprecated /wss component",
+			addr:     mustMultiaddr("/ip4/104.28.194.73/tcp/443/wss/p2p/QmfSx1ujzboapD5h2CiqTJqUy46FeTDwXBszB3XUCfKEEj"),
+			expected: bzz.TransportWSS,
+		},
+		{
+			name:     "QUIC v1 address",
+			addr:     mustMultiaddr("/ip4/1.2.3.4/udp/1234/quic-v1"),
+			expected: bzz.TransportQUICV1,
+		},
+		{
+			name:     "legacy QUIC address",
+			addr:     mustMultiaddr("/ip4/1.2.3.4/udp/1234/quic"),
+			expected: bzz.TransportQUIC,
+		},
 		{
 			name:     "UDP address returns unknown",
 			addr:     mustMultiaddr("/ip4/127.0.0.1/udp/8080"),
@@ -315,6 +330,8 @@ func TestTransportTypePriority(t *testing.T) {
 		{bzz.TransportTCP, 0},
 		{bzz.TransportWS, 1},
 		{bzz.TransportWSS, 2},
+		{bzz.TransportQUICV1, 3},
+		{bzz.TransportQUIC, 3},
 		{bzz.TransportUnknown, 3},
 	}
 
@@ -326,15 +343,24 @@ func TestTransportTypePriority(t *testing.T) {
 		})
 	}
 
-	// Verify priority ordering: TCP < WS < WSS < Unknown
+	// Verify priority ordering: TCP < WS < WSS < QUIC/Unknown
 	if bzz.TransportTCP.Priority() >= bzz.TransportWS.Priority() {
 		t.Error("TCP priority should be lower (better) than WS")
 	}
 	if bzz.TransportWS.Priority() >= bzz.TransportWSS.Priority() {
 		t.Error("WS priority should be lower (better) than WSS")
 	}
-	if bzz.TransportWSS.Priority() >= bzz.TransportUnknown.Priority() {
-		t.Error("WSS priority should be lower (better) than Unknown")
+	if bzz.TransportWSS.Priority() >= bzz.TransportQUICV1.Priority() {
+		t.Error("WSS priority should be lower (better) than QUIC v1")
+	}
+	if bzz.TransportWSS.Priority() >= bzz.TransportQUIC.Priority() {
+		t.Error("WSS priority should be lower (better) than legacy QUIC")
+	}
+	if bzz.TransportQUICV1.Priority() != bzz.TransportUnknown.Priority() {
+		t.Error("QUIC v1 priority should match Unknown")
+	}
+	if bzz.TransportQUIC.Priority() != bzz.TransportUnknown.Priority() {
+		t.Error("legacy QUIC priority should match Unknown")
 	}
 }
 

pkg/p2p/libp2p/metrics.go

@@ -20,12 +20,11 @@ const (
 )
 
 var (
+	// TCP/WS/WSS only: bee does not register QUIC today.
 	transportLabelValues = []string{
 		bzz.TransportTCP.String(),
 		bzz.TransportWS.String(),
 		bzz.TransportWSS.String(),
-		bzz.TransportQUICV1.String(),
-		bzz.TransportQUIC.String(),
 		bzz.TransportUnknown.String(),
 	}
 	publicLabelValues = []string{"true", "false"}
@@ -56,14 +55,16 @@ func newMetrics() metrics {
 	transportHelp := "The 'transport' label is one of: " + strings.Join(transportLabelValues, ", ")
 	publicHelp := "The 'public' label is one of: " + strings.Join(publicLabelValues, ", ") + " (true = public remote multiaddr)."
 
+	connectionLabels := []string{connectionTransportLabelName, connectionPublicLabelName}
+
 	createdConnectionCount := prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "created_connection_count",
-			Help:      "Number of initiated outgoing libp2p connections. " + transportHelp,
+			Help:      "Number of initiated outgoing libp2p connections. " + transportHelp + " " + publicHelp,
 		},
-		[]string{connectionTransportLabelName},
+		connectionLabels,
 	)
 
 	handledConnectionCount := prometheus.NewCounterVec(
@@ -73,14 +74,14 @@ func newMetrics() metrics {
 			Name:      "handled_connection_count",
 			Help:      "Number of handled incoming libp2p connections. " + transportHelp + " " + publicHelp,
 		},
-		[]string{connectionTransportLabelName, connectionPublicLabelName},
+		connectionLabels,
 	)
 
 	// Ensure all expected label value combinations exist as 0-valued series,
 	// so Grafana shows a flat line instead of "No Data".
 	for _, transport := range transportLabelValues {
-		createdConnectionCount.WithLabelValues(transport).Add(0)
 		for _, public := range publicLabelValues {
+			createdConnectionCount.WithLabelValues(transport, public).Add(0)
 			handledConnectionCount.WithLabelValues(transport, public).Add(0)
 		}
 	}
@@ -164,21 +165,24 @@ func newMetrics() metrics {
 }
 
 func (m metrics) incCreatedConnection(addr ma.Multiaddr) {
-	m.CreatedConnectionCount.WithLabelValues(connectionTransportLabel(addr)).Inc()
+	m.CreatedConnectionCount.WithLabelValues(connectionTransportLabel(addr), connectionPublicLabel(addr)).Inc()
 }
 
 func (m metrics) observeHandledConnection(addr ma.Multiaddr) {
-	public := "false"
-	if manet.IsPublicAddr(addr) {
-		public = "true"
-	}
-	m.HandledConnectionCount.WithLabelValues(connectionTransportLabel(addr), public).Inc()
+	m.HandledConnectionCount.WithLabelValues(connectionTransportLabel(addr), connectionPublicLabel(addr)).Inc()
 }
 
 func connectionTransportLabel(addr ma.Multiaddr) string {
 	return bzz.ClassifyTransport(addr).String()
 }
 
+func connectionPublicLabel(addr ma.Multiaddr) string {
+	if manet.IsPublicAddr(addr) {
+		return "true"
+	}
+	return "false"
+}
+
 func (s *Service) Metrics() []prometheus.Collector {
 	collectors := append(m.PrometheusCollectorsFromFields(s.metrics), s.handshakeService.Metrics()...)
 	if mc, ok := s.reacher.(interface{ Metrics() []prometheus.Collector }); ok {