Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add p2p SDK Router metrics #2000

Merged
merged 12 commits into from
Sep 11, 2023
Merged

Add p2p SDK Router metrics #2000

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
48ea175
router metrics
joshua-kim Sep 11, 2023
032c23d
nits
joshua-kim Sep 11, 2023
bbc7ea0
nit
joshua-kim Sep 11, 2023
7015322
nit
joshua-kim Sep 11, 2023
7a14225
nit
StephenButtolph Sep 11, 2023
462b9fc
oops
StephenButtolph Sep 11, 2023
5c22b15
Merge branch 'dev' into router-metrics
StephenButtolph Sep 11, 2023
6a41e4e
nit
joshua-kim Sep 11, 2023
32dd796
nit
joshua-kim Sep 11, 2023
7dcdf0e
lint
joshua-kim Sep 11, 2023
b5e300f
fix spacing
StephenButtolph Sep 11, 2023
a1f988e
Merge branch 'router-metrics' of github.com:ava-labs/avalanchego into…
StephenButtolph Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions network/p2p/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type CrossChainAppResponseCallback func(
)

type Client struct {
handlerID uint64
handlerPrefix []byte
router *Router
sender common.AppSender
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions network/p2p/gossip/gossip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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()).
Expand Down
4 changes: 3 additions & 1 deletion network/p2p/peers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"context"
"testing"

"github.com/prometheus/client_golang/prometheus"

"github.com/stretchr/testify/require"

"go.uber.org/mock/gomock"
Expand Down Expand Up @@ -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))
Expand Down
Loading