refactor: in-line network stats package (#4887)

Signed-off-by: Jonathan Oppenheimer <147infiniti@gmail.com>
Signed-off-by: Jonathan Oppenheimer <jonathan.oppenheimer@avalabs.org>
Co-authored-by: Austin Larson <78000745+alarso16@users.noreply.github.com>

Author: JonathanOppenheimer

graft/coreth/network/network.go

@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/ava-labs/libevm/log"
+	"github.com/ava-labs/libevm/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sync/semaphore"
 
 	"github.com/ava-labs/avalanchego/codec"
-	"github.com/ava-labs/avalanchego/graft/coreth/network/stats"
 	"github.com/ava-labs/avalanchego/graft/evm/message"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/p2p"
@@ -34,13 +34,17 @@ const (
 )
 
 var (
-	errAcquiringSemaphore                      = errors.New("error acquiring semaphore")
-	errEmptyNodeID                             = errors.New("cannot send request to empty nodeID")
-	errExpiredRequest                          = errors.New("expired request")
-	errNoPeersFound                            = errors.New("no peers found matching version")
-	_                     Network              = (*network)(nil)
-	_                     validators.Connector = (*network)(nil)
-	_                     common.AppHandler    = (*network)(nil)
+	_ Network              = (*network)(nil)
+	_ validators.Connector = (*network)(nil)
+	_ common.AppHandler    = (*network)(nil)
+
+	errAcquiringSemaphore = errors.New("error acquiring semaphore")
+	errEmptyNodeID        = errors.New("cannot send request to empty nodeID")
+	errExpiredRequest     = errors.New("expired request")
+	errNoPeersFound       = errors.New("no peers found matching version")
+
+	timeUntilDeadline = metrics.GetOrRegisterTimer("net_req_time_until_deadline", nil)
+	droppedRequests   = metrics.GetOrRegisterCounter("net_req_deadline_dropped", nil)
 )
 
 // SyncedNetworkClient defines ability to send request / response through the Network
@@ -103,7 +107,6 @@ type network struct {
 	codec                      codec.Manager                      // Codec used for parsing messages
 	appRequestHandler          message.RequestHandler             // maps request type => handler
 	peers                      *peerTracker                       // tracking of peers & bandwidth
-	appStats                   stats.RequestHandlerStats          // Provide request handler metrics
 
 	// Set to true when Shutdown is called, after which all operations on this
 	// struct are no-ops.
@@ -150,7 +153,6 @@ func NewNetwork(
 		sdkNetwork:                 p2pNetwork,
 		appRequestHandler:          message.NoopRequestHandler{},
 		peers:                      NewPeerTracker(),
-		appStats:                   stats.NewRequestHandlerStats(),
 		p2pValidators:              p2pValidators,
 	}, nil
 }
@@ -280,8 +282,10 @@ func (n *network) AppRequest(ctx context.Context, nodeID ids.NodeID, requestID u
 		return n.sdkNetwork.AppRequest(ctx, nodeID, requestID, deadline, request)
 	}
 
-	bufferedDeadline, err := calculateTimeUntilDeadline(deadline, n.appStats)
+	bufferedDeadline, err := timeUntil(deadline)
 	if err != nil {
+		// Drop the request if we already missed the deadline to respond.
+		droppedRequests.Inc(1)
 		log.Debug("deadline to process AppRequest has expired, skipping", "nodeID", nodeID, "requestID", requestID, "err", err)
 		return nil
 	}
@@ -349,22 +353,20 @@ func (n *network) AppRequestFailed(ctx context.Context, nodeID ids.NodeID, reque
 	return handler.OnFailure()
 }
 
-// calculateTimeUntilDeadline calculates the time until deadline and drops it if we missed he deadline to response.
+// timeUntil calculates the time until deadline and returns an error if the deadline has passed.
 // This function updates metrics for app requests.
 // This is called by [AppRequest].
-func calculateTimeUntilDeadline(deadline time.Time, stats stats.RequestHandlerStats) (time.Time, error) {
+func timeUntil(deadline time.Time) (time.Time, error) {
 	// calculate how much time is left until the deadline
 	timeTillDeadline := time.Until(deadline)
-	stats.UpdateTimeUntilDeadline(timeTillDeadline)
+	timeUntilDeadline.Update(timeTillDeadline)
 
 	// bufferedDeadline is half the time till actual deadline so that the message has a reasonable chance
 	// of completing its processing and sending the response to the peer.
 	bufferedDeadline := time.Now().Add(timeTillDeadline / 2)
 
 	// check if we have enough time to handle this request
 	if time.Until(bufferedDeadline) < minRequestHandlingDuration {
-		// Drop the request if we already missed the deadline to respond.
-		stats.IncDeadlineDroppedRequest()
 		return time.Time{}, errExpiredRequest
 	}
 

graft/coreth/network/stats/stats.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/ava-labs/libevm/log"
+	"github.com/ava-labs/libevm/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sync/semaphore"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/graft/evm/message"
-	"github.com/ava-labs/avalanchego/graft/subnet-evm/network/stats"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/p2p"
 	"github.com/ava-labs/avalanchego/snow"
@@ -34,13 +34,17 @@ const (
 )
 
 var (
-	errAcquiringSemaphore                      = errors.New("error acquiring semaphore")
-	errEmptyNodeID                             = errors.New("cannot send request to empty nodeID")
-	errExpiredRequest                          = errors.New("expired request")
-	errNoPeersFound                            = errors.New("no peers found matching version")
-	_                     Network              = (*network)(nil)
-	_                     validators.Connector = (*network)(nil)
-	_                     common.AppHandler    = (*network)(nil)
+	_ Network              = (*network)(nil)
+	_ validators.Connector = (*network)(nil)
+	_ common.AppHandler    = (*network)(nil)
+
+	errAcquiringSemaphore = errors.New("error acquiring semaphore")
+	errEmptyNodeID        = errors.New("cannot send request to empty nodeID")
+	errExpiredRequest     = errors.New("expired request")
+	errNoPeersFound       = errors.New("no peers found matching version")
+
+	timeUntilDeadline = metrics.GetOrRegisterTimer("net_req_time_until_deadline", nil)
+	droppedRequests   = metrics.GetOrRegisterCounter("net_req_deadline_dropped", nil)
 )
 
 // SyncedNetworkClient defines ability to send request / response through the Network
@@ -103,7 +107,6 @@ type network struct {
 	codec                      codec.Manager                      // Codec used for parsing messages
 	appRequestHandler          message.RequestHandler             // maps request type => handler
 	peers                      *peerTracker                       // tracking of peers & bandwidth
-	appStats                   stats.RequestHandlerStats          // Provide request handler metrics
 
 	// Set to true when Shutdown is called, after which all operations on this
 	// struct are no-ops.
@@ -150,7 +153,6 @@ func NewNetwork(
 		sdkNetwork:                 p2pNetwork,
 		appRequestHandler:          message.NoopRequestHandler{},
 		peers:                      NewPeerTracker(),
-		appStats:                   stats.NewRequestHandlerStats(),
 		p2pValidators:              p2pValidators,
 	}, nil
 }
@@ -280,8 +282,10 @@ func (n *network) AppRequest(ctx context.Context, nodeID ids.NodeID, requestID u
 		return n.sdkNetwork.AppRequest(ctx, nodeID, requestID, deadline, request)
 	}
 
-	bufferedDeadline, err := calculateTimeUntilDeadline(deadline, n.appStats)
+	bufferedDeadline, err := timeUntil(deadline)
 	if err != nil {
+		// Drop the request if we already missed the deadline to respond.
+		droppedRequests.Inc(1)
 		log.Debug("deadline to process AppRequest has expired, skipping", "nodeID", nodeID, "requestID", requestID, "err", err)
 		return nil
 	}
@@ -349,22 +353,20 @@ func (n *network) AppRequestFailed(ctx context.Context, nodeID ids.NodeID, reque
 	return handler.OnFailure()
 }
 
-// calculateTimeUntilDeadline calculates the time until deadline and drops it if we missed he deadline to response.
+// timeUntil calculates the time until deadline and returns an error if the deadline has passed.
 // This function updates metrics for app requests.
 // This is called by [AppRequest].
-func calculateTimeUntilDeadline(deadline time.Time, stats stats.RequestHandlerStats) (time.Time, error) {
+func timeUntil(deadline time.Time) (time.Time, error) {
 	// calculate how much time is left until the deadline
 	timeTillDeadline := time.Until(deadline)
-	stats.UpdateTimeUntilDeadline(timeTillDeadline)
+	timeUntilDeadline.Update(timeTillDeadline)
 
 	// bufferedDeadline is half the time till actual deadline so that the message has a reasonable chance
 	// of completing its processing and sending the response to the peer.
 	bufferedDeadline := time.Now().Add(timeTillDeadline / 2)
 
 	// check if we have enough time to handle this request
 	if time.Until(bufferedDeadline) < minRequestHandlingDuration {
-		// Drop the request if we already missed the deadline to respond.
-		stats.IncDeadlineDroppedRequest()
 		return time.Time{}, errExpiredRequest
 	}