Revert "Add more tendermint metrics for block processing (#223)"

This reverts commit 124468c.

Author: stevenlanders

internal/consensus/metrics.gen.go

@@ -170,9 +170,6 @@ type Metrics struct {
 	// processing all of its parts. Note that this means it also includes network latency from
 	// block parts gossip
 	CompleteProposalTime metrics.Histogram
-
-	// ApplyBlockLatency measures how long it takes to execute ApplyBlock in finalize commit step
-	ApplyBlockLatency metrics.Histogram `metrics_labels:"apply_block_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
 }
 
 // RecordConsMetrics uses for recording the block related metrics during fast-sync.

internal/consensus/metrics.go

@@ -2184,7 +2184,7 @@ func (cs *State) finalizeCommit(ctx context.Context, height int64) {
 
 	// Execute and commit the block, update and save the state, and update the mempool.
 	// NOTE The block.AppHash won't reflect these txs until the next block.
-	startTime := time.Now()
+
 	stateCopy, err := cs.blockExec.ApplyBlock(spanCtx,
 		stateCopy,
 		types.BlockID{
@@ -2194,7 +2194,6 @@ func (cs *State) finalizeCommit(ctx context.Context, height int64) {
 		block,
 		cs.tracer,
 	)
-	cs.metrics.ApplyBlockLatency.Observe(float64(time.Since(startTime).Milliseconds()))
 	if err != nil {
 		logger.Error("failed to apply block", "err", err)
 		return

internal/consensus/state.go

@@ -246,7 +246,6 @@ func (blockExec *BlockExecutor) ApplyBlock(
 		defer finalizeBlockSpan.End()
 	}
 	txs := block.Data.Txs.ToSliceOfBytes()
-	finalizeBlockStartTime := time.Now()
 	fBlockRes, err := blockExec.appClient.FinalizeBlock(
 		ctx,
 		&abci.RequestFinalizeBlock{
@@ -270,7 +269,6 @@ func (blockExec *BlockExecutor) ApplyBlock(
 			LastResultsHash:       block.LastResultsHash,
 		},
 	)
-	blockExec.metrics.FinalizeBlockLatency.Observe(float64(time.Since(finalizeBlockStartTime).Milliseconds()))
 	if finalizeBlockSpan != nil {
 		finalizeBlockSpan.End()
 	}
@@ -288,9 +286,7 @@ func (blockExec *BlockExecutor) ApplyBlock(
 	)
 
 	// Save the results before we commit.
-	saveBlockResponseTime := time.Now()
 	err = blockExec.store.SaveFinalizeBlockResponses(block.Height, fBlockRes)
-	blockExec.metrics.SaveBlockResponseLatency.Observe(float64(time.Since(saveBlockResponseTime).Milliseconds()))
 	if err != nil && !errors.Is(err, ErrNoFinalizeBlockResponsesForHeight{block.Height}) {
 		// It is correct to have an empty ResponseFinalizeBlock for ApplyBlock,
 		// but not for saving it to the state store
@@ -344,14 +340,12 @@ func (blockExec *BlockExecutor) ApplyBlock(
 	blockExec.evpool.Update(ctx, state, block.Evidence)
 
 	// Update the app hash and save the state.
-	saveBlockTime := time.Now()
 	state.AppHash = fBlockRes.AppHash
 	if err := blockExec.store.Save(state); err != nil {
 		return state, err
 	}
-	blockExec.metrics.SaveBlockLatency.Observe(float64(time.Since(saveBlockTime).Milliseconds()))
+
 	// Prune old heights, if requested by ABCI app.
-	pruneBlockTime := time.Now()
 	if retainHeight > 0 {
 		pruned, err := blockExec.pruneBlocks(retainHeight)
 		if err != nil {
@@ -360,15 +354,14 @@ func (blockExec *BlockExecutor) ApplyBlock(
 			blockExec.logger.Debug("pruned blocks", "pruned", pruned, "retain_height", retainHeight)
 		}
 	}
-	blockExec.metrics.PruneBlockLatency.Observe(float64(time.Since(pruneBlockTime).Milliseconds()))
+
 	// reset the verification cache
 	blockExec.cache = make(map[string]struct{})
 
 	// Events are fired after everything else.
 	// NOTE: if we crash between Commit and Save, events wont be fired during replay
-	fireEventsStartTime := time.Now()
 	FireEvents(blockExec.logger, blockExec.eventBus, block, blockID, fBlockRes, validatorUpdates)
-	blockExec.metrics.FireEventsLatency.Observe(float64(time.Since(fireEventsStartTime).Milliseconds()))
+
 	return state, nil
 }
 

internal/state/execution.go

@@ -37,19 +37,4 @@ type Metrics struct {
 	// UpdateMempoolTime meaures how long it takes to update mempool after commiting, including
 	// reCheckTx
 	UpdateMempoolTime metrics.Histogram
-
-	// FinalizeBlockLatency measures how long it takes to run abci FinalizeBlock
-	FinalizeBlockLatency metrics.Histogram `metrics_labels:"finalize_blocks_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
-
-	// SaveBlockResponseLatency measures how long it takes to run save the FinalizeBlockRes
-	SaveBlockResponseLatency metrics.Histogram `metrics_labels:"save_block_response_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
-
-	// SaveBlockLatency measure how long it takes to save the block
-	SaveBlockLatency metrics.Histogram `metrics_labels:"save_block_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
-
-	// PruneBlockLatency measures how long it takes to prune block from blockstore
-	PruneBlockLatency metrics.Histogram `metrics_labels:"prune_block_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
-
-	// FireEventsLatency measures how long it takes to fire events for indexing
-	FireEventsLatency metrics.Histogram `metrics_labels:"prune_block_ms"  metrics_buckettype:"exprange" metrics_bucketsizes:"0.01, 10, 10"`
 }