feat: metrics around block execution + trace flight recorder

baseapp/abci.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/InjectiveLabs/metrics"
 	abcitypes "github.com/cometbft/cometbft/abci/types"
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
@@ -529,6 +530,15 @@ func (app *BaseApp) ProcessProposal(req *abci.ProcessProposalRequest) (resp *abc
 		app.setState(execModeFinalize, header)
 	}
 
+	// metrics and trace
+	heightStr := strconv.Itoa(int(req.Height))
+	metricsCtx, doneFn := metrics.ReportFuncCallAndTimingSdkCtx(app.processProposalState.Context(), metrics.Tags{"svc": "app", "height": heightStr})
+	defer doneFn()
+	if app.traceFlightRecorder != nil {
+		defer app.traceFlightRecorder.StartRegion("process-proposal", heightStr)() //nolint:errcheck // debug only
+	}
+	app.processProposalState.SetContext(metricsCtx)
+
 	app.processProposalState.SetContext(app.getContextForProposal(app.processProposalState.Context(), req.Height).
 		WithVoteInfos(req.ProposedLastCommit.Votes). // this is a set of votes that are not finalized yet, wait for commit
 		WithBlockHeight(req.Height).
@@ -779,6 +789,15 @@ func (app *BaseApp) internalFinalizeBlock(ctx context.Context, req *abci.Finaliz
 		app.setState(execModeFinalize, header)
 	}
 
+	// metrics and trace
+	heightStr := strconv.Itoa(int(req.Height))
+	metricsCtx, doneFn := metrics.ReportFuncCallAndTimingSdkCtx(app.finalizeBlockState.Context(), metrics.Tags{"svc": "app", "height": heightStr})
+	defer doneFn()
+	if app.traceFlightRecorder != nil {
+		defer app.traceFlightRecorder.StartRegion("finalize-block", heightStr)() //nolint:errcheck // debug only
+	}
+	app.finalizeBlockState.SetContext(metricsCtx)
+
 	// Context is now updated with Header information.
 	app.finalizeBlockState.SetContext(app.finalizeBlockState.Context().
 		WithBlockHeader(header).

baseapp/baseapp.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/InjectiveLabs/metrics"
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
 	"github.com/cometbft/cometbft/crypto/tmhash"
@@ -192,6 +193,8 @@ type BaseApp struct {
 	// StreamEvents
 	EnableStreamer bool
 	StreamEvents   chan StreamEvents
+
+	traceFlightRecorder *metrics.TraceRecorder
 }
 
 // NewBaseApp returns a reference to an initialized BaseApp. It accepts a

baseapp/options.go

@@ -7,9 +7,11 @@ import (
 	"io"
 	"math"
 
+	"github.com/InjectiveLabs/metrics"
+
 	"cosmossdk.io/core/server"
 	corestore "cosmossdk.io/core/store"
-	"cosmossdk.io/store/metrics"
+	storemetrics "cosmossdk.io/store/metrics"
 	pruningtypes "cosmossdk.io/store/pruning/types"
 	"cosmossdk.io/store/snapshots"
 	snapshottypes "cosmossdk.io/store/snapshots/types"
@@ -385,7 +387,7 @@ func (app *BaseApp) SetVerifyVoteExtensionHandler(handler sdk.VerifyVoteExtensio
 }
 
 // SetStoreMetrics sets the prepare proposal function for the BaseApp.
-func (app *BaseApp) SetStoreMetrics(gatherer metrics.StoreMetrics) {
+func (app *BaseApp) SetStoreMetrics(gatherer storemetrics.StoreMetrics) {
 	if app.sealed {
 		panic("SetStoreMetrics() on sealed BaseApp")
 	}
@@ -407,3 +409,11 @@ func (app *BaseApp) SetMsgServiceRouter(msgServiceRouter *MsgServiceRouter) {
 func (app *BaseApp) SetGRPCQueryRouter(grpcQueryRouter *GRPCQueryRouter) {
 	app.grpcQueryRouter = grpcQueryRouter
 }
+
+func (app *BaseApp) SetTraceFlightRecorder(tr *metrics.TraceRecorder) {
+	app.traceFlightRecorder = tr
+}
+
+func SetTraceFlightRecorder(tr *metrics.TraceRecorder) func(*BaseApp) {
+	return func(app *BaseApp) { app.traceFlightRecorder = tr }
+}