Add p2p SDK Router metrics (#2000)

Author: joshua-kim

network/p2p/client.go

@@ -40,6 +40,7 @@ type CrossChainAppResponseCallback func(
 )
 
 type Client struct {
+	handlerID     uint64
 	handlerPrefix []byte
 	router        *Router
 	sender        common.AppSender
@@ -95,7 +96,10 @@ func (c *Client) AppRequest(
 			return err
 		}
 
-		c.router.pendingAppRequests[requestID] = onResponse
+		c.router.pendingAppRequests[requestID] = pendingAppRequest{
+			AppResponseCallback: onResponse,
+			metrics:             c.router.handlers[c.handlerID].metrics,
+		}
 		c.router.requestID += 2
 	}
 
@@ -155,7 +159,10 @@ func (c *Client) CrossChainAppRequest(
 		return err
 	}
 
-	c.router.pendingCrossChainAppRequests[requestID] = onResponse
+	c.router.pendingCrossChainAppRequests[requestID] = pendingCrossChainAppRequest{
+		CrossChainAppResponseCallback: onResponse,
+		metrics:                       c.router.handlers[c.handlerID].metrics,
+	}
 	c.router.requestID += 2
 
 	return nil

network/p2p/gossip/gossip_test.go

@@ -116,7 +116,7 @@ func TestGossiperGossip(t *testing.T) {
 			ctrl := gomock.NewController(t)
 
 			responseSender := common.NewMockSender(ctrl)
-			responseRouter := p2p.NewRouter(logging.NoLog{}, responseSender)
+			responseRouter := p2p.NewRouter(logging.NoLog{}, responseSender, prometheus.NewRegistry(), "")
 			responseBloom, err := NewBloomFilter(1000, 0.01)
 			require.NoError(err)
 			responseSet := testSet{
@@ -135,7 +135,7 @@ func TestGossiperGossip(t *testing.T) {
 			require.NoError(err)
 
 			requestSender := common.NewMockSender(ctrl)
-			requestRouter := p2p.NewRouter(logging.NoLog{}, requestSender)
+			requestRouter := p2p.NewRouter(logging.NoLog{}, requestSender, prometheus.NewRegistry(), "")
 
 			gossiped := make(chan struct{})
 			requestSender.EXPECT().SendAppRequest(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).

network/p2p/peers_test.go

@@ -7,6 +7,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/stretchr/testify/require"
 
 	"go.uber.org/mock/gomock"
@@ -132,7 +134,7 @@ func TestAppRequestAnyNodeSelection(t *testing.T) {
 			}
 			mockAppSender.EXPECT().SendAppRequest(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(expectedCalls)
 
-			r := NewRouter(logging.NoLog{}, mockAppSender)
+			r := NewRouter(logging.NoLog{}, mockAppSender, prometheus.NewRegistry(), "")
 			peers := &Peers{}
 			for _, peer := range tt.peers {
 				require.NoError(peers.Connected(context.Background(), peer, nil))