Skip to content

Commit cc6b60f

Browse files
mergify[bot]tac0turtlejulienrbrt
authored
fix(server/v2/api/telemetry): enable global metrics (backport #22571) (#22579)
Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent f1b3b3d commit cc6b60f

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

simapp/v2/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
cosmossdk.io/log v1.5.0
1212
cosmossdk.io/math v1.3.0
1313
cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 // main
14-
cosmossdk.io/server/v2 v2.0.0-20241119134933-d697a3de0f95 // main
14+
cosmossdk.io/server/v2 v2.0.0-20241120173909-b45cf753a7a3 // main
1515
cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
1616
cosmossdk.io/store/v2 v2.0.0-20241108144957-78b5cd4dbd08 // main
1717
cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000

simapp/v2/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 h1:hYI7pvrmdkgFZJ4HVQ
214214
cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95/go.mod h1:J4Wv2eOwAz8t14Ak8XBMWDoFbwqwyllMaJF91O7n/wI=
215215
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac h1:3joNZZWZ3k7fMsrBDL1ktuQ2xQwYLZOaDhkruadDFmc=
216216
cosmossdk.io/schema v0.3.1-0.20241010135032-192601639cac/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
217-
cosmossdk.io/server/v2 v2.0.0-20241119134933-d697a3de0f95 h1:WUho1r7Zcg5aPn5YtYRN5TW9fvxUirX1mSihBDJ6ccg=
218-
cosmossdk.io/server/v2 v2.0.0-20241119134933-d697a3de0f95/go.mod h1:gPATMrgLSzDoJiyoY+N8ULwfvAJ3Ooh6TYFsW60tHW0=
217+
cosmossdk.io/server/v2 v2.0.0-20241120173909-b45cf753a7a3 h1:92+h62WOgxdb3eqjIT1sNn+/gcQYLvtZ9eln84h0nMg=
218+
cosmossdk.io/server/v2 v2.0.0-20241120173909-b45cf753a7a3/go.mod h1:gPATMrgLSzDoJiyoY+N8ULwfvAJ3Ooh6TYFsW60tHW0=
219219
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 h1:GOznErJieaI0OS0LDUsu5Vy3qPnCyjdvkncejP0Zv5s=
220220
cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
221221
cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 h1:cK7wvmlA18AvLcaInseKTBmt5EXtLwafe7oH1rx7veU=

simapp/v2/simdv2/cmd/commands.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/cosmos/cosmos-sdk/client/debug"
2626
"github.com/cosmos/cosmos-sdk/client/keys"
2727
"github.com/cosmos/cosmos-sdk/client/rpc"
28+
sdktelemetry "github.com/cosmos/cosmos-sdk/telemetry"
2829
sdk "github.com/cosmos/cosmos-sdk/types"
2930
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
3031
"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -118,7 +119,7 @@ func InitRootCmd[T transaction.Tx](
118119
}
119120
}
120121

121-
telemetryServer, err := telemetry.New[T](deps.GlobalConfig, logger)
122+
telemetryServer, err := telemetry.New[T](deps.GlobalConfig, logger, sdktelemetry.EnableTelemetry)
122123
if err != nil {
123124
return nil, err
124125
}

telemetry/metrics.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ func IsTelemetryEnabled() bool {
2424
return globalTelemetryEnabled
2525
}
2626

27+
// EnableTelemetry allows for the global telemetry enabled state to be set.
28+
func EnableTelemetry() {
29+
globalTelemetryEnabled = true
30+
}
31+
2732
// globalLabels defines the set of global labels that will be applied to all
2833
// metrics emitted using the telemetry package function wrappers.
2934
var globalLabels = []metrics.Label{}

0 commit comments

Comments
 (0)