Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/v2-inte…

…gration-tests
cosmos · Sep 30, 2024 · 4c9de97 · 4c9de97
2 parents 55e77a5 + d493145
commit 4c9de97
Show file tree

Hide file tree

Showing 128 changed files with 1,628 additions and 1,398 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,8 +52,10 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 ### Improvements
 
 * (sims) [#21613](https://github.com/cosmos/cosmos-sdk/pull/21613) Add sims2 framework and factory methods for simpler message factories in modules
+* (modules) [#21963](https://github.com/cosmos/cosmos-sdk/pull/21963) Duplicatable metrics are no more collected in modules. They were unecessary overhead.
 
 ### Bug Fixes
+
 * (sims) [#21952](https://github.com/cosmos/cosmos-sdk/pull/21952) Use liveness matrix for validator sign status in sims
 * (sims) [#21906](https://github.com/cosmos/cosmos-sdk/pull/21906) Skip sims test when running dry on validators
 * (cli) [#21919](https://github.com/cosmos/cosmos-sdk/pull/21919) Query address-by-acc-num by account_id instead of id.

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -638,7 +638,7 @@ simd config migrate v0.50
 
 If you were using `<appd> config [key]` or `<appd> config [key] [value]` to set and get values from the `client.toml`, replace it with `<appd> config get client [key]` and `<appd> config set client [key] [value]`. The extra verbosity is due to the extra functionalities added in config.
 
-More information about [confix](https://docs.cosmos.network/main/tooling/confix) and how to add it in your application binary in the [documentation](https://docs.cosmos.network/main/tooling/confix).
+More information about [confix](https://docs.cosmos.network/main/build/tooling/confix) and how to add it in your application binary in the [documentation](https://docs.cosmos.network/main/build/tooling/confix).
 
 #### gRPC-Web
 

diff --git a/baseapp/abci.go b/baseapp/abci.go
@@ -180,7 +180,8 @@ func (app *BaseApp) Query(_ context.Context, req *abci.QueryRequest) (resp *abci
 
 	telemetry.IncrCounter(1, "query", "count")
 	telemetry.IncrCounter(1, "query", req.Path)
-	defer telemetry.MeasureSince(telemetry.Now(), req.Path)
+	start := telemetry.Now()
+	defer telemetry.MeasureSince(start, req.Path)
 
 	if req.Path == QueryPathBroadcastTx {
 		return queryResult(errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "can't route a broadcast tx message"), app.trace), nil

diff --git a/baseapp/streaming.go b/baseapp/streaming.go
@@ -33,7 +33,7 @@ const (
 // kv-store keys, and app modules. Using the built-in indexer framework is mutually exclusive from using other
 // types of streaming listeners.
 func (app *BaseApp) EnableIndexer(indexerOpts interface{}, keys map[string]*storetypes.KVStoreKey, appModules map[string]any) error {
-	listener, err := indexer.StartManager(indexer.ManagerOptions{
+	listener, err := indexer.StartIndexing(indexer.IndexingOptions{
 		Config:     indexerOpts,
 		Resolver:   decoding.ModuleSetDecoderResolver(appModules),
 		SyncSource: nil,
@@ -47,7 +47,7 @@ func (app *BaseApp) EnableIndexer(indexerOpts interface{}, keys map[string]*stor
 	app.cms.AddListeners(exposedKeys)
 
 	app.streamingManager = storetypes.StreamingManager{
-		ABCIListeners: []storetypes.ABCIListener{listenerWrapper{listener}},
+		ABCIListeners: []storetypes.ABCIListener{listenerWrapper{listener.Listener}},
 		StopNodeOnErr: true,
 	}
 

diff --git a/client/v2/README.md b/client/v2/README.md
@@ -241,7 +241,7 @@ https://github.com/cosmos/cosmos-sdk/blob/main/client/grpc/cmtservice/autocli.go
 
 To further enhance your CLI experience with Cosmos SDK-based blockchains, you can use `hubl`. `hubl` is a tool that allows you to query any Cosmos SDK-based blockchain using the new AutoCLI feature of the Cosmos SDK. With `hubl`, you can easily configure a new chain and query modules with just a few simple commands.
 
-For more information on `hubl`, including how to configure a new chain and query a module, see the [Hubl documentation](https://docs.cosmos.network/main/tooling/hubl).
+For more information on `hubl`, including how to configure a new chain and query a module, see the [Hubl documentation](https://docs.cosmos.network/main/build/tooling/hubl).
 
 # Off-Chain
 

diff --git a/client/v2/go.mod b/client/v2/go.mod
@@ -27,7 +27,7 @@ require (
 	cosmossdk.io/errors v1.0.1 // indirect
 	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/math v1.3.0
-	cosmossdk.io/schema v0.3.0 // indirect
+	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect

diff --git a/client/v2/go.sum b/client/v2/go.sum
@@ -18,8 +18,8 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
 cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
-cosmossdk.io/schema v0.3.0 h1:01lcaM4trhzZ1HQTfTV8z6Ma1GziOZ/YmdzBN3F720c=
-cosmossdk.io/schema v0.3.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
+cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 h1:DmOoS/1PeY6Ih0hAVlJ69kLMUrLV+TCbfICrZtB1vdU=
+cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
 cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190 h1:XQJj9Dv9Gtze0l2TF79BU5lkP6MkUveTUuKICmxoz+o=
 cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190/go.mod h1:7WUGupOvmlHJoIMBz1JbObQxeo6/TDiuDBxmtod8HRg=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=

diff --git a/docs/build/building-apps/03-app-upgrade.md b/docs/build/building-apps/03-app-upgrade.md
@@ -41,7 +41,7 @@ and gracefully exit.
 Generally the application binary will restart on exit, but then will execute this BeginBlocker
 again and exit, causing a restart loop. Either the operator can manually install the new software,
 or you can make use of an external watcher daemon to possibly download and then switch binaries,
-also potentially doing a backup. The SDK tool for doing such, is called [Cosmovisor](https://docs.cosmos.network/main/tooling/cosmovisor).
+also potentially doing a backup. The SDK tool for doing such, is called [Cosmovisor](https://docs.cosmos.network/main/build/tooling/cosmovisor).
 
 When the binary restarts with the upgraded version (here v0.40.0), it will detect we have registered the
 "testnet-v2" upgrade handler in the code, and realize it is the new version. It then will run the upgrade handler
@@ -131,7 +131,7 @@ to lose connectivity with the exiting nodes, thus this module prefers to just ha
 
 ## Automation
 
-Read more about [Cosmovisor](https://docs.cosmos.network/main/tooling/cosmovisor), the tool for automating upgrades.
+Read more about [Cosmovisor](https://docs.cosmos.network/main/build/tooling/cosmovisor), the tool for automating upgrades.
 
 ## Canceling Upgrades
 

diff --git a/docs/build/packages/README.md b/docs/build/packages/README.md
@@ -9,7 +9,7 @@ It lists all standalone Go modules that are part of the Cosmos SDK.
 
 :::tip
 For more information on SDK modules, see the [SDK Modules](https://docs.cosmos.network/main/modules) section.
-For more information on SDK tooling, see the [Tooling](https://docs.cosmos.network/main/tooling) section.
+For more information on SDK tooling, see the [Tooling](https://docs.cosmos.network/main/build/tooling) section.
 :::
 
 ## Core

diff --git a/docs/learn/advanced/09-telemetry.md b/docs/learn/advanced/09-telemetry.md
@@ -13,17 +13,18 @@ their application through the use of the `telemetry` package. To enable telemetr
 
 The Cosmos SDK currently supports enabling in-memory and prometheus as telemetry sinks. In-memory sink is always attached (when the telemetry is enabled) with 10 second interval and 1 minute retention. This means that metrics will be aggregated over 10 seconds, and metrics will be kept alive for 1 minute.
 
-To query active metrics (see retention note above) you have to enable API server (`api.enabled = true` in the app.toml). Single API endpoint is exposed: `http://localhost:1317/metrics?format={text|prometheus}`, the default being `text`.
+To query active metrics (see retention note above) you have to enable API server (`api.enabled = true` in the app.toml). Single API endpoint is exposed: `http://localhost:1317/metrics?format={text|prometheus}` (or port `1318` in v2) , the default being `text`.
 
 ## Emitting metrics
 
 If telemetry is enabled via configuration, a single global metrics collector is registered via the
 [go-metrics](https://github.com/hashicorp/go-metrics) library. This allows emitting and collecting
-metrics through simple [API](https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-alpha.0/telemetry/wrapper.go). Example:
+metrics through simple [API](https://github.com/cosmos/cosmos-sdk/blob/v0.50.10/telemetry/wrapper.go). Example:
 
 ```go
 func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
-  defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
+  start := telemetry.Now()
+  defer telemetry.ModuleMeasureSince(types.ModuleName, start, telemetry.MetricKeyEndBlocker)
 
   // ...
 }
@@ -69,60 +70,32 @@ Consider the following examples with enough granularity and adequate cardinality
 * begin/end blocker time
 * tx gas used
 * block gas used
-* amount of tokens minted
-* amount of accounts created
 
 The following examples expose too much cardinality and may not even prove to be useful:
 
 * transfers between accounts with amount
 * voting/deposit amount from unique addresses
 
+## Idempotency
+
+Metrics aren't idempotent, so if a metric is emitted twice, it will be counted twice.
+This is important to keep in mind when collecting metrics. If a module is called twice, the metrics will be emitted twice (for instance in `CheckTx`, `SimulateTx` or `DeliverTx`).
+
 ## Supported Metrics
 
-| Metric                          | Description                                                                               | Unit            | Type    |
-|:--------------------------------|:------------------------------------------------------------------------------------------|:----------------|:--------|
-| `tx_count`                      | Total number of txs processed via `DeliverTx`                                             | tx              | counter |
-| `tx_successful`                 | Total number of successful txs processed via `DeliverTx`                                  | tx              | counter |
-| `tx_failed`                     | Total number of failed txs processed via `DeliverTx`                                      | tx              | counter |
-| `tx_gas_used`                   | The total amount of gas used by a tx                                                      | gas             | gauge   |
-| `tx_gas_wanted`                 | The total amount of gas requested by a tx                                                 | gas             | gauge   |
-| `tx_msg_send`                   | The total amount of tokens sent in a `MsgSend` (per denom)                                | token           | gauge   |
-| `tx_msg_withdraw_reward`        | The total amount of tokens withdrawn in a `MsgWithdrawDelegatorReward` (per denom)        | token           | gauge   |
-| `tx_msg_withdraw_commission`    | The total amount of tokens withdrawn in a `MsgWithdrawValidatorCommission` (per denom)    | token           | gauge   |
-| `tx_msg_delegate`               | The total amount of tokens delegated in a `MsgDelegate`                                   | token           | gauge   |
-| `tx_msg_begin_unbonding`        | The total amount of tokens undelegated in a `MsgUndelegate`                               | token           | gauge   |
-| `tx_msg_begin_begin_redelegate` | The total amount of tokens redelegated in a `MsgBeginRedelegate`                          | token           | gauge   |
-| `tx_msg_ibc_transfer`           | The total amount of tokens transferred via IBC in a `MsgTransfer` (source or sink chain)  | token           | gauge   |
-| `ibc_transfer_packet_receive`   | The total amount of tokens received in a `FungibleTokenPacketData` (source or sink chain) | token           | gauge   |
-| `new_account`                   | Total number of new accounts created                                                      | account         | counter |
-| `gov_proposal`                  | Total number of governance proposals                                                      | proposal        | counter |
-| `gov_vote`                      | Total number of governance votes for a proposal                                           | vote            | counter |
-| `gov_deposit`                   | Total number of governance deposits for a proposal                                        | deposit         | counter |
-| `staking_delegate`              | Total number of delegations                                                               | delegation      | counter |
-| `staking_undelegate`            | Total number of undelegations                                                             | undelegation    | counter |
-| `staking_redelegate`            | Total number of redelegations                                                             | redelegation    | counter |
-| `ibc_transfer_send`             | Total number of IBC transfers sent from a chain (source or sink)                          | transfer        | counter |
-| `ibc_transfer_receive`          | Total number of IBC transfers received to a chain (source or sink)                        | transfer        | counter |
-| `ibc_client_create`             | Total number of clients created                                                           | create          | counter |
-| `ibc_client_update`             | Total number of client updates                                                            | update          | counter |
-| `ibc_client_upgrade`            | Total number of client upgrades                                                           | upgrade         | counter |
-| `ibc_client_misbehaviour`       | Total number of client misbehaviours                                                      | misbehaviour    | counter |
-| `ibc_connection_open-init`      | Total number of connection `OpenInit` handshakes                                          | handshake       | counter |
-| `ibc_connection_open-try`       | Total number of connection `OpenTry` handshakes                                           | handshake       | counter |
-| `ibc_connection_open-ack`       | Total number of connection `OpenAck` handshakes                                           | handshake       | counter |
-| `ibc_connection_open-confirm`   | Total number of connection `OpenConfirm` handshakes                                       | handshake       | counter |
-| `ibc_channel_open-init`         | Total number of channel `OpenInit` handshakes                                             | handshake       | counter |
-| `ibc_channel_open-try`          | Total number of channel `OpenTry` handshakes                                              | handshake       | counter |
-| `ibc_channel_open-ack`          | Total number of channel `OpenAck` handshakes                                              | handshake       | counter |
-| `ibc_channel_open-confirm`      | Total number of channel `OpenConfirm` handshakes                                          | handshake       | counter |
-| `ibc_channel_close-init`        | Total number of channel `CloseInit` handshakes                                            | handshake       | counter |
-| `ibc_channel_close-confirm`     | Total number of channel `CloseConfirm` handshakes                                         | handshake       | counter |
-| `tx_msg_ibc_recv_packet`        | Total number of IBC packets received                                                      | packet          | counter |
-| `tx_msg_ibc_acknowledge_packet` | Total number of IBC packets acknowledged                                                  | acknowledgement | counter |
-| `ibc_timeout_packet`            | Total number of IBC timeout packets                                                       | timeout         | counter |
-| `store_iavl_get`                | Duration of an IAVL `Store#Get` call                                                      | ms              | summary |
-| `store_iavl_set`                | Duration of an IAVL `Store#Set` call                                                      | ms              | summary |
-| `store_iavl_has`                | Duration of an IAVL `Store#Has` call                                                      | ms              | summary |
-| `store_iavl_delete`             | Duration of an IAVL `Store#Delete` call                                                   | ms              | summary |
-| `store_iavl_commit`             | Duration of an IAVL `Store#Commit` call                                                   | ms              | summary |
-| `store_iavl_query`              | Duration of an IAVL `Store#Query` call                                                    | ms              | summary |
+| Metric              | Description                                                                    | Unit | Type    |
+| ------------------- | ------------------------------------------------------------------------------ | ---- | ------- |
+| `tx_count`          | Total number of txs processed via `DeliverTx`                                  | tx   | counter |
+| `tx_successful`     | Total number of successful txs processed via `DeliverTx`                       | tx   | counter |
+| `tx_failed`         | Total number of failed txs processed via `DeliverTx`                           | tx   | counter |
+| `tx_gas_used`       | The total amount of gas used by a tx                                           | gas  | gauge   |
+| `tx_gas_wanted`     | The total amount of gas requested by a tx                                      | gas  | gauge   |
+| `store_iavl_get`    | Duration of an IAVL `Store#Get` call                                           | ms   | summary |
+| `store_iavl_set`    | Duration of an IAVL `Store#Set` call                                           | ms   | summary |
+| `store_iavl_has`    | Duration of an IAVL `Store#Has` call                                           | ms   | summary |
+| `store_iavl_delete` | Duration of an IAVL `Store#Delete` call                                        | ms   | summary |
+| `store_iavl_commit` | Duration of an IAVL `Store#Commit` call                                        | ms   | summary |
+| `store_iavl_query`  | Duration of an IAVL `Store#Query` call                                         | ms   | summary |
+| `begin_blocker`     | Duration of the `BeginBlock` call per module                                   | ms   | summary |
+| `end_blocker`       | Duration of the `EndBlock` call per module                                     | ms   | summary |
+| `server_info`       | Information about the server, such as version, commit, and build date, upgrade | -    | gauge   |