add more instrumentation

Author: aaronc

baseapp/baseapp.go

@@ -66,8 +66,8 @@ const (
 var _ servertypes.ABCI = (*BaseApp)(nil)
 
 var (
-	tracer    = otel.Tracer("baseapp")
-	meter     = otel.Meter("baseapp")
+	tracer    = otel.Tracer("cosmos-sdk/baseapp")
+	meter     = otel.Meter("cosmos-sdk/baseapp")
 	blockCnt  metric.Int64Counter
 	txCnt     metric.Int64Counter
 	blockTime metric.Float64Histogram

types/module/module.go

@@ -39,6 +39,8 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/trace"
 
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/genesis"
@@ -52,6 +54,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
+var (
+	tracer = otel.Tracer("cosmos-sdk/types/module")
+)
+
 // AppModuleBasic is the standard form for basic non-dependent elements of an application module.
 type AppModuleBasic interface {
 	HasName
@@ -752,8 +758,14 @@ func (m Manager) RunMigrations(ctx context.Context, cfg Configurator, fromVM Ver
 // It takes the current context as a parameter and returns a boolean value
 // indicating whether the migration was successfully executed or not.
 func (m *Manager) PreBlock(ctx sdk.Context) (*sdk.ResponsePreBlock, error) {
+	var span trace.Span
+	ctx, span = ctx.StartSpan(tracer, "Manager.PreBlock")
+	defer span.End()
+
 	paramsChanged := false
 	for _, moduleName := range m.OrderPreBlockers {
+		var modSpan trace.Span
+		ctx, modSpan = ctx.StartSpan(tracer, fmt.Sprintf("PreBlock.%s", moduleName))
 		if module, ok := m.Modules[moduleName].(appmodule.HasPreBlocker); ok {
 			rsp, err := module.PreBlock(ctx)
 			if err != nil {
@@ -763,6 +775,7 @@ func (m *Manager) PreBlock(ctx sdk.Context) (*sdk.ResponsePreBlock, error) {
 				paramsChanged = true
 			}
 		}
+		modSpan.End()
 	}
 	return &sdk.ResponsePreBlock{
 		ConsensusParamsChanged: paramsChanged,
@@ -773,13 +786,20 @@ func (m *Manager) PreBlock(ctx sdk.Context) (*sdk.ResponsePreBlock, error) {
 // child context with an event manager to aggregate events emitted from all
 // modules.
 func (m *Manager) BeginBlock(ctx sdk.Context) (sdk.BeginBlock, error) {
+	var span trace.Span
+	ctx, span = ctx.StartSpan(tracer, "Manager.BeginBlock")
+	defer span.End()
+
 	ctx = ctx.WithEventManager(sdk.NewEventManager())
 	for _, moduleName := range m.OrderBeginBlockers {
+		var modSpan trace.Span
+		ctx, modSpan = ctx.StartSpan(tracer, fmt.Sprintf("BeginBlock.%s", moduleName))
 		if module, ok := m.Modules[moduleName].(appmodule.HasBeginBlocker); ok {
 			if err := module.BeginBlock(ctx); err != nil {
 				return sdk.BeginBlock{}, err
 			}
 		}
+		modSpan.End()
 	}
 
 	return sdk.BeginBlock{
@@ -791,10 +811,16 @@ func (m *Manager) BeginBlock(ctx sdk.Context) (sdk.BeginBlock, error) {
 // child context with an event manager to aggregate events emitted from all
 // modules.
 func (m *Manager) EndBlock(ctx sdk.Context) (sdk.EndBlock, error) {
+	var span trace.Span
+	ctx, span = ctx.StartSpan(tracer, "Manager.EndBlock")
+	defer span.End()
+
 	ctx = ctx.WithEventManager(sdk.NewEventManager())
 	validatorUpdates := []abci.ValidatorUpdate{}
 
 	for _, moduleName := range m.OrderEndBlockers {
+		var modSpan trace.Span
+		ctx, modSpan = ctx.StartSpan(tracer, fmt.Sprintf("EndBlock.%s", moduleName))
 		if module, ok := m.Modules[moduleName].(appmodule.HasEndBlocker); ok {
 			err := module.EndBlock(ctx)
 			if err != nil {
@@ -819,6 +845,7 @@ func (m *Manager) EndBlock(ctx sdk.Context) (sdk.EndBlock, error) {
 		} else {
 			continue
 		}
+		modSpan.End()
 	}
 
 	return sdk.EndBlock{