autonat: add metrics

config/config.go

@@ -354,6 +354,7 @@ func (cfg *Config) NewNode() (host.Host, error) {
 		autonat.UsingAddresses(func() []ma.Multiaddr {
 			return addrF(h.AllAddrs())
 		}),
+		autonat.WithMetricsTracer(autonat.NewMetricsTracer()),
 	}
 	if cfg.AutoNATConfig.ThrottleInterval != 0 {
 		autonatOpts = append(autonatOpts,

p2p/host/autonat/autonat.go

@@ -143,6 +143,9 @@ func (as *AmbientAutoNAT) Status() network.Reachability {
 func (as *AmbientAutoNAT) emitStatus() {
 	status := as.status.Load()
 	as.emitReachabilityChanged.Emit(event.EvtLocalReachabilityChanged{Reachability: status.Reachability})
+	if as.metricsTracer != nil {
+		as.metricsTracer.ReachabilityStatus(status.Reachability)
+	}
 }
 
 // PublicAddr returns the publicly connectable Multiaddr of this node if one is known.
@@ -279,7 +282,9 @@ func (as *AmbientAutoNAT) scheduleProbe() time.Duration {
 			nextProbe = as.lastProbe.Add(untilNext)
 		}
 	}
-
+	if as.metricsTracer != nil {
+		as.metricsTracer.NextProbeTime(nextProbe)
+	}
 	return nextProbe.Sub(fixedNow)
 }
 
@@ -345,6 +350,9 @@ func (as *AmbientAutoNAT) recordObservation(observation autoNATResult) {
 			as.emitStatus()
 		}
 	}
+	if as.metricsTracer != nil {
+		as.metricsTracer.ReachabilityStatusConfidence(as.confidence)
+	}
 }
 
 func (as *AmbientAutoNAT) tryProbe(p peer.ID) bool {
@@ -372,7 +380,7 @@ func (as *AmbientAutoNAT) tryProbe(p peer.ID) bool {
 }
 
 func (as *AmbientAutoNAT) probe(pi *peer.AddrInfo) {
-	cli := NewAutoNATClient(as.host, as.config.addressFunc)
+	cli := NewAutoNATClient(as.host, as.config.addressFunc, as.metricsTracer)
 	ctx, cancel := context.WithTimeout(as.ctx, as.config.requestTimeout)
 	defer cancel()
 

p2p/host/autonat/client.go

@@ -17,16 +17,17 @@ import (
 
 // NewAutoNATClient creates a fresh instance of an AutoNATClient
 // If addrFunc is nil, h.Addrs will be used
-func NewAutoNATClient(h host.Host, addrFunc AddrFunc) Client {
+func NewAutoNATClient(h host.Host, addrFunc AddrFunc, mt MetricsTracer) Client {
 	if addrFunc == nil {
 		addrFunc = h.Addrs
 	}
-	return &client{h: h, addrFunc: addrFunc}
+	return &client{h: h, addrFunc: addrFunc, mt: mt}
 }
 
 type client struct {
 	h        host.Host
 	addrFunc AddrFunc
+	mt       MetricsTracer
 }
 
 // DialBack asks peer p to dial us back on all addresses returned by the addrFunc.
@@ -79,6 +80,9 @@ func (c *client) DialBack(ctx context.Context, p peer.ID) (ma.Multiaddr, error)
 	}
 
 	status := res.GetDialResponse().GetStatus()
+	if c.mt != nil {
+		c.mt.ReceivedDialResponse(status)
+	}
 	switch status {
 	case pb.Message_OK:
 		addr := res.GetDialResponse().GetAddr()