swarm: fix swarm closed connection count

p2p/net/swarm/limiter.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/transport"
 
@@ -20,11 +21,12 @@ type dialResult struct {
 }
 
 type dialJob struct {
-	addr    ma.Multiaddr
-	peer    peer.ID
-	ctx     context.Context
-	resp    chan dialResult
-	timeout time.Duration
+	addr          ma.Multiaddr
+	peer          peer.ID
+	ctx           context.Context
+	resp          chan dialResult
+	timeout       time.Duration
+	metricsTracer MetricsTracer
 }
 
 func (dj *dialJob) cancelled() bool {
@@ -217,11 +219,15 @@ func (dl *dialLimiter) executeDial(j *dialJob) {
 	defer cancel()
 
 	con, err := dl.dialFunc(dctx, j.peer, j.addr)
+	st := time.Now()
 	select {
 	case j.resp <- dialResult{Conn: con, Addr: j.addr, Err: err}:
 	case <-j.ctx.Done():
 		if con != nil {
 			con.Close()
+			if j.metricsTracer != nil {
+				j.metricsTracer.ClosedConnection(network.DirOutbound, time.Since(st), con.ConnState(), con.LocalMultiaddr())
+			}
 		}
 	}
 }

p2p/net/swarm/swarm.go

@@ -297,6 +297,9 @@ func (s *Swarm) addConn(tc transport.CapableConn, dir network.Direction) (*Conn,
 			if err != nil {
 				log.Warnf("failed to close connection with peer %s and addr %s; err: %s", p.Pretty(), addr, err)
 			}
+			if s.metricsTracer != nil {
+				s.metricsTracer.ClosedConnection(dir, time.Since(stat.Opened), c.ConnState(), c.LocalMultiaddr())
+			}
 			return nil, ErrGaterDisallowedConnection
 		}
 	}
@@ -315,6 +318,9 @@ func (s *Swarm) addConn(tc transport.CapableConn, dir network.Direction) (*Conn,
 	if s.conns.m == nil {
 		s.conns.Unlock()
 		tc.Close()
+		if s.metricsTracer != nil {
+			s.metricsTracer.ClosedConnection(dir, time.Since(stat.Opened), c.ConnState(), c.LocalMultiaddr())
+		}
 		return nil, ErrSwarmClosed
 	}
 

p2p/net/swarm/swarm_dial.go

@@ -468,11 +468,12 @@ func (s *Swarm) limitedDial(ctx context.Context, p peer.ID, a ma.Multiaddr, resp
 		timeout = s.dialTimeoutLocal
 	}
 	s.limiter.AddDialJob(&dialJob{
-		addr:    a,
-		peer:    p,
-		resp:    resp,
-		ctx:     ctx,
-		timeout: timeout,
+		addr:          a,
+		peer:          p,
+		resp:          resp,
+		ctx:           ctx,
+		timeout:       timeout,
+		metricsTracer: s.metricsTracer,
 	})
 }