Skip to content

Add more metrics and bump sei-cosmos/sei-tendermint versions #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrandonWeng merged 6 commits into from
Dec 14, 2022
Merged

Add more metrics and bump sei-cosmos/sei-tendermint versions #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49edd89
more metrics
BrandonWeng Dec 9, 2022
73a385d
undo make file
BrandonWeng Dec 14, 2022
3864266
sd
BrandonWeng Dec 14, 2022
732440f
done
BrandonWeng Dec 14, 2022
23c5175
fix test
BrandonWeng Dec 14, 2022
bc19011
lint
BrandonWeng Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions aclmapping/staking/mappings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ func (suite *KeeperTestSuite) TestMsgRedelegateDependencies() {
expectedError: nil,
dynamicDep: true,
},
// {
// name: "dont check synchronous",
// msg: suite.redelegateMsg,
// expectedError: nil,
// dynamicDep: false,
// },
{
name: "dont check synchronous",
msg: suite.redelegateMsg,
expectedError: nil,
dynamicDep: false,
},
}
for _, tc := range tests {
suite.Run(fmt.Sprintf("Test Case: %s", tc.name), func() {
Expand Down
5 changes: 3 additions & 2 deletions aclmapping/utils/resource_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ var StoreKeyToResourceTypePrefixMap = aclsdktypes.StoreKeyToResourceTypePrefixMa
aclsdktypes.ResourceType_KV_BANK_DENOM: banktypes.DenomMetadataPrefix,
},
authtypes.StoreKey: {
aclsdktypes.ResourceType_KV_AUTH: aclsdktypes.EmptyPrefix,
aclsdktypes.ResourceType_KV_AUTH_ADDRESS_STORE: authtypes.AddressStoreKeyPrefix,
aclsdktypes.ResourceType_KV_AUTH: aclsdktypes.EmptyPrefix,
aclsdktypes.ResourceType_KV_AUTH_ADDRESS_STORE: authtypes.AddressStoreKeyPrefix,
aclsdktypes.ResourceType_KV_AUTH_GLOBAL_ACCOUNT_NUMBER: authtypes.GlobalAccountNumberKey,
},
distributiontypes.StoreKey: {
aclsdktypes.ResourceType_KV_DISTRIBUTION: aclsdktypes.EmptyPrefix,
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ require (
)

replace (
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.323
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.332
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.91
github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.106
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,10 +1067,10 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod
github.com/securego/gosec/v2 v2.11.0 h1:+PDkpzR41OI2jrw1q6AdXZCbsNGNGT7pQjal0H0cArI=
github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+fscA+Pulbpo=
github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
github.com/sei-protocol/sei-cosmos v0.1.323 h1:A+Vavzu2EpEvP5Msw4BGaqrDC2QJD4rIIvaPbY2GBGw=
github.com/sei-protocol/sei-cosmos v0.1.323/go.mod h1:OMPeZMUSDy1tYz0GfAEmOjo6JNyKlgSw8wSft6e0HZE=
github.com/sei-protocol/sei-tendermint v0.1.91 h1:FXIAAXZoVUOw0srE71giPy5Kt2lI54RjvwZi7pTF5V4=
github.com/sei-protocol/sei-tendermint v0.1.91/go.mod h1:Olwbjyagrpoxj5DAUhHxMTWDVEfQ3FYdpypaJ3+6Hs8=
github.com/sei-protocol/sei-cosmos v0.1.332 h1:XVJdIZnDW2lKPbqPKRNQk72oGjrII2kDeubMQsYBm9A=
github.com/sei-protocol/sei-cosmos v0.1.332/go.mod h1:pmWgLJxzDS+WMVvBWoncAnlXBjb0lFJvMw5ULbjWVwc=
github.com/sei-protocol/sei-tendermint v0.1.106 h1:CN/jjNxfvZgzL20w3ss8OqtcLIXl8r3WA1B23or7ob4=
github.com/sei-protocol/sei-tendermint v0.1.106/go.mod h1:Olwbjyagrpoxj5DAUhHxMTWDVEfQ3FYdpypaJ3+6Hs8=
github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down
4 changes: 2 additions & 2 deletions loadtest/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
},
"constant": true,
"loadtest_interval": 600,
"message_type": "bank,dex,staking,tokenfactory",
"message_type": "bank,dex,tokenfactory,staking,failure_dex_malformed,failure_dex_invalid",
"run_oracle": false,
"metrics_port": 9696,
"metrics_port": 9695,
"contract_distribution": [
{
"contract_address": "sei1zwv6feuzhy6a9wekh96cd57lsarmqlwxdypdsplw6zhfncqw6ftqr428wx",
Expand Down
3 changes: 3 additions & 0 deletions loadtest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ func (c *LoadTestClient) generateMessage(config Config, key cryptotypes.PrivKey,
rand.Seed(time.Now().UnixNano())
messageType := messageTypes[rand.Intn(len(messageTypes))]
fmt.Printf("Message type: %s\n", messageType)

defer IncrTxMessageType(messageType)

switch messageType {
case Bank:
msg = &banktypes.MsgSend{
Expand Down
9 changes: 9 additions & 0 deletions loadtest/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,12 @@ func IncrTxNotCommitted(count int) {
[]metrics.Label{telemetry.NewLabel("reason", "not_committed")},
)
}

// loadtest_client_sei_msg_type
func IncrTxMessageType(msgType string) {
metrics.IncrCounterWithLabels(
[]string{"sei", "msg", "type"},
float32(1),
[]metrics.Label{telemetry.NewLabel("type", msgType)},
)
}
4 changes: 3 additions & 1 deletion loadtest/scripts/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def create_burst_loadtest_config(base_config_json):
new_config = base_config_json.copy()
new_config["constant"] = True
new_config["metrics_port"] = 9697
new_config["txs_per_block"] = 2000
new_config["txs_per_block"] = 500
new_config["msgs_per_tx"] = 10
# Run every 20 mins
new_config["loadtest_interval"] = 1200
return new_config
Expand All @@ -42,6 +43,7 @@ def create_steady_loadtest_config(base_config_json):
new_config["constant"] = True
new_config["metrics_port"] = 9696
new_config["txs_per_block"] = 100
new_config["msgs_per_tx"] = 10
# Run every min
new_config["loadtest_interval"] = 60
return new_config
Expand Down
4 changes: 2 additions & 2 deletions x/oracle/simulation/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func WeightedOperations(
}

// SimulateMsgAggregateExchangeRateVote generates a MsgAggregateExchangeRateVote with random values.
// nolint: funlen
//nolint: funlen
func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
Expand Down Expand Up @@ -122,7 +122,7 @@ func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankK
}

// SimulateMsgDelegateFeedConsent generates a MsgDelegateFeedConsent with random values.
// nolint: funlen
//nolint: funlen
func SimulateMsgDelegateFeedConsent(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
Expand Down