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.

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

p2p: add a per-message type send and receive metric (backport #9622) #9640

Open
wants to merge 31 commits into
base: v0.37.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2022

This is an automatic backport of pull request #9622 done by Mergify.
Cherry-pick of 09b8708 has failed:

On branch mergify/bp/v0.37.x/pr-9622
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 09b870831.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/lint.yml
	modified:   blocksync/msgs.go
	modified:   blocksync/reactor.go
	modified:   cmd/tendermint/commands/debug/util.go
	modified:   consensus/byzantine_test.go
	modified:   consensus/invalid_test.go
	modified:   consensus/msgs.go
	modified:   consensus/msgs_test.go
	modified:   consensus/reactor.go
	modified:   consensus/reactor_test.go
	modified:   evidence/reactor.go
	modified:   evidence/reactor_test.go
	modified:   libs/rand/random.go
	modified:   mempool/v0/reactor.go
	modified:   mempool/v0/reactor_test.go
	modified:   mempool/v1/reactor.go
	modified:   p2p/base_reactor.go
	modified:   p2p/conn/connection.go
	modified:   p2p/metrics.gen.go
	modified:   p2p/metrics.go
	modified:   p2p/mock/peer.go
	modified:   p2p/mock/reactor.go
	modified:   p2p/mocks/peer.go
	modified:   p2p/peer_test.go
	modified:   p2p/pex/pex_reactor.go
	modified:   p2p/pex/pex_reactor_test.go
	modified:   p2p/switch.go
	modified:   p2p/switch_test.go
	modified:   p2p/test_util.go
	modified:   p2p/transport.go
	modified:   p2p/types.go
	new file:   proto/tendermint/blocksync/message.go
	new file:   proto/tendermint/consensus/message.go
	new file:   proto/tendermint/mempool/message.go
	new file:   proto/tendermint/p2p/pex.go
	new file:   proto/tendermint/statesync/message.go
	modified:   statesync/messages.go
	modified:   statesync/messages_test.go
	modified:   statesync/reactor.go
	modified:   statesync/reactor_test.go
	modified:   statesync/syncer.go
	modified:   statesync/syncer_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/tendermint/commands/rollback.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   p2p/peer.go
	both modified:   p2p/peer_set_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* p2p: ressurrect the p2p envelope and use to calculate message metric

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
(cherry picked from commit 09b8708)

# Conflicts:
#	cmd/tendermint/commands/rollback.go
#	go.mod
#	go.sum
#	p2p/peer.go
#	p2p/peer_set_test.go
@mergify mergify bot requested a review from a team October 27, 2022 19:47
@mergify mergify bot added the conflicts label Oct 27, 2022
@thanethomson thanethomson added the S:wip Work in progress (prevents stalebot from automatically closing) label Nov 1, 2022
@thanethomson
Copy link
Contributor

Will we be rolling this out with v0.37.0? If not, and if we roll it out with v0.37.1, please ensure there are no breaking changes between those two versions.

cc @sergio-mena

@williambanfield
Copy link
Contributor

Will we be rolling this out with v0.37.0? If not, and if we roll it out with v0.37.1, please ensure there are no breaking changes between those two versions.

cc @sergio-mena

I was planning to just port the changes made to keep v0.34 from breaking onto this branch. Should be straightforward enough and doesn't change our release process.

@sergio-mena
Copy link
Contributor

I am 50-50 on this. I know having coherent metrics in v0.37.x, and later branches is desirable but I took a look at this patch and there's some degree of refactoring here (the PR is of +1.5k -1k size), so I'm a bit nervous about merging it in release branches as a "nice to have".

At the very least, I agree with @thanethomson this should only be merged after the first release in v0.37.x.

@thanethomson
Copy link
Contributor

Sure thing @sergio-mena - perhaps it makes sense to defer merging this to v0.37.1. I've already added the S:wip label here to prevent stalebot from closing it and have marked it as blocked for now on the project board.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts S:wip Work in progress (prevents stalebot from automatically closing)
Projects
Status: Blocked
Development

Successfully merging this pull request may close these issues.

None yet

3 participants