Just measure at the beginning instead of disconnecting, for test purp…

…oses
vacp2p · Aug 2, 2023 · 9403349 · 9403349
1 parent a599759
commit 9403349
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim
@@ -374,7 +374,7 @@ proc rateLimit*(g: GossipSub, peer: PubSubPeer, rpcMsgOpt: Opt[RPCMsg], msgSize:
   # In this way we count even ignored fields by protobuf
   var rmsg = rpcMsgOpt.valueOr:
     if not peer.uselessAppBytesRate.tryConsume(msgSize):
-      discard g.disconnectPeer(peer)
+      libp2p_gossipsub_peers_rate_limit_disconnections.inc(labelValues = [peer.getAgent()]) # let's just measure at the beginning for test purposes. # discard g.disconnectPeer(peer)
     raise newException(PeerRateLimitError, "Peer sent too much useless data that couldn't be decoded")
 
   let usefulMsgBytesNum =
@@ -394,7 +394,7 @@ proc rateLimit*(g: GossipSub, peer: PubSubPeer, rpcMsgOpt: Opt[RPCMsg], msgSize:
 
   if not peer.uselessAppBytesRate.tryConsume(uselessAppBytesNum):
     debug "Peer sent too much useless application data", peer, msgSize, uselessAppBytesNum
-    discard g.disconnectPeer(peer)
+    libp2p_gossipsub_peers_rate_limit_disconnections.inc(labelValues = [peer.getAgent()]) # let's just measure at the beginning for test purposes. # discard g.disconnectPeer(peer)
     raise newException(PeerRateLimitError, "Peer sent too much useless application data.")
 
 method rpcHandler*(g: GossipSub,

diff --git a/libp2p/protocols/pubsub/gossipsub/scoring.nim b/libp2p/protocols/pubsub/gossipsub/scoring.nim
@@ -30,7 +30,7 @@ declareGauge(libp2p_gossipsub_peers_score_invalidMessageDeliveries, "Detailed go
 declareGauge(libp2p_gossipsub_peers_score_appScore, "Detailed gossipsub scoring metric", labels = ["agent"])
 declareGauge(libp2p_gossipsub_peers_score_behaviourPenalty, "Detailed gossipsub scoring metric", labels = ["agent"])
 declareGauge(libp2p_gossipsub_peers_score_colocationFactor, "Detailed gossipsub scoring metric", labels = ["agent"])
-declareCounter(libp2p_gossipsub_peers_badTrafficScorePeerDisconnections, "The number of peer disconnections by gossipsub because of bad traffic", labels = ["agent"])
+declarePublicCounter(libp2p_gossipsub_peers_rate_limit_disconnections, "The number of peer disconnections by gossipsub because of rate limit", labels = ["agent"])
 
 proc init*(_: type[TopicParams]): TopicParams =
   TopicParams(
@@ -242,7 +242,7 @@ proc scoringHeartbeat*(g: GossipSub) {.async.} =
 
 proc punishInvalidMessage*(g: GossipSub, peer: PubSubPeer, msg: Message) =
   if not peer.uselessAppBytesRate.tryConsume(len(msg.data)):
-    discard g.disconnectPeer(peer)
+    libp2p_gossipsub_peers_rate_limit_disconnections.inc(labelValues = [peer.getAgent()]) # let's just measure at the beginning for test purposes. # discard g.disconnectPeer(peer)
 
   for tt in msg.topicIds:
     let t = tt