From a8cba4d1abc7e428a24ed6cea012eb806420fbde Mon Sep 17 00:00:00 2001 From: William Banfield Date: Thu, 4 Aug 2022 15:09:58 -0400 Subject: [PATCH] remove ambiguous metric --- consensus/metrics.go | 22 ---------------------- consensus/state.go | 5 ----- docs/tendermint-core/metrics.md | 1 - 3 files changed, 28 deletions(-) diff --git a/consensus/metrics.go b/consensus/metrics.go index 5f936cdd7..48d1a603b 100644 --- a/consensus/metrics.go +++ b/consensus/metrics.go @@ -73,11 +73,6 @@ type Metrics struct { StepDuration metrics.Histogram stepStart time.Time - // Histogram of time taken to receive a block in seconds, measured between when a new block is first - // discovered to when the block is completed. - BlockGossipReceiveLatency metrics.Histogram - blockGossipStart time.Time - // Number of block parts received by the node, separated by whether the part // was relevant to the block the node is trying to gather or not. BlockGossipPartsReceived metrics.Counter @@ -229,14 +224,6 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { Name: "block_parts", Help: "Number of blockparts transmitted by peer.", }, append(labels, "peer_id")).With(labelsAndValues...), - BlockGossipReceiveLatency: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{ - Namespace: namespace, - Subsystem: MetricsSubsystem, - Name: "block_gossip_receive_latency", - Help: "Difference in seconds between when the validator learns of a new block" + - "and when the validator receives the last piece of the block.", - Buckets: stdprometheus.ExponentialBucketsRange(0.1, 100, 8), - }, labels).With(labelsAndValues...), BlockGossipPartsReceived: prometheus.NewCounterFrom(stdprometheus.CounterOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, @@ -297,7 +284,6 @@ func NopMetrics() *Metrics { FastSyncing: discard.NewGauge(), StateSyncing: discard.NewGauge(), BlockParts: discard.NewCounter(), - BlockGossipReceiveLatency: discard.NewHistogram(), BlockGossipPartsReceived: discard.NewCounter(), QuorumPrevoteMessageDelay: discard.NewGauge(), FullPrevoteMessageDelay: discard.NewGauge(), @@ -312,14 +298,6 @@ func (m *Metrics) RecordConsMetrics(block *types.Block) { m.CommittedHeight.Set(float64(block.Height)) } -func (m *Metrics) MarkBlockGossipStarted() { - m.blockGossipStart = time.Now() -} - -func (m *Metrics) MarkBlockGossipComplete() { - m.BlockGossipReceiveLatency.Observe(time.Since(m.blockGossipStart).Seconds()) -} - func (m *Metrics) MarkRound(r int32, st time.Time) { m.Rounds.Set(float64(r)) roundTime := time.Since(st).Seconds() diff --git a/consensus/state.go b/consensus/state.go index c2e247e55..9823192bf 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1436,7 +1436,6 @@ func (cs *State) enterPrecommit(height int64, round int32) { if !cs.ProposalBlockParts.HasHeader(blockID.PartSetHeader) { cs.ProposalBlock = nil - cs.metrics.MarkBlockGossipStarted() cs.ProposalBlockParts = types.NewPartSetFromHeader(blockID.PartSetHeader) } @@ -1531,7 +1530,6 @@ func (cs *State) enterCommit(height int64, commitRound int32) { // We're getting the wrong block. // Set up ProposalBlockParts and keep waiting. cs.ProposalBlock = nil - cs.metrics.MarkBlockGossipStarted() cs.ProposalBlockParts = types.NewPartSetFromHeader(blockID.PartSetHeader) if err := cs.eventBus.PublishEventValidBlock(cs.RoundStateEvent()); err != nil { @@ -1845,7 +1843,6 @@ func (cs *State) defaultSetProposal(proposal *types.Proposal) error { // This happens if we're already in cstypes.RoundStepCommit or if there is a valid block in the current round. // TODO: We can check if Proposal is for a different block as this is a sign of misbehavior! if cs.ProposalBlockParts == nil { - cs.metrics.MarkBlockGossipStarted() cs.ProposalBlockParts = types.NewPartSetFromHeader(proposal.BlockID.PartSetHeader) } @@ -1897,7 +1894,6 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID p2p.ID) (add ) } if added && cs.ProposalBlockParts.IsComplete() { - cs.metrics.MarkBlockGossipComplete() bz, err := io.ReadAll(cs.ProposalBlockParts.GetReader()) if err != nil { return added, err @@ -2118,7 +2114,6 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error } if !cs.ProposalBlockParts.HasHeader(blockID.PartSetHeader) { - cs.metrics.MarkBlockGossipStarted() cs.ProposalBlockParts = types.NewPartSetFromHeader(blockID.PartSetHeader) } diff --git a/docs/tendermint-core/metrics.md b/docs/tendermint-core/metrics.md index 586b0c8ce..e4d50c5c6 100644 --- a/docs/tendermint-core/metrics.md +++ b/docs/tendermint-core/metrics.md @@ -41,7 +41,6 @@ The following metrics are available: | consensus_block_size_bytes | Gauge | | Block size in bytes | | consensus_step_duration | Histogram | step | Histogram of durations for each step in the consensus protocol | | consensus_round_duration | Histogram | | Histogram of durations for all the rounds that have occurred since the process started | -| consensus_block_gossip_receive_latency | Histogram | | Histogram of time taken to receive a block in seconds, measure between when a new block is first discovered to when the block is completed | | consensus_block_gossip_parts_received | Counter | matches_current | Number of block parts received by the node | | p2p_peers | Gauge | | Number of peers node's connected to | | p2p_peer_receive_bytes_total | counter | peer_id, chID | number of bytes per channel received from a given peer |