From e446a57ccbf76ab62b415d0081e8aaf98e001cdf Mon Sep 17 00:00:00 2001 From: Dan Kanefsky Date: Mon, 10 Jul 2023 14:23:58 -0700 Subject: [PATCH 1/4] export gas price to prom --- relayer/chains/cosmos/cosmos_chain_processor.go | 2 +- relayer/processor/metrics.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index b4bef6d47..9189e945d 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -550,6 +550,6 @@ func (ccp *CosmosChainProcessor) CurrentRelayerBalance(ctx context.Context) { bal := relayerWalletBalances.AmountOf(gasDenom.Denom) // Convert to a big float to get a float64 for metrics f, _ := big.NewFloat(0.0).SetInt(bal.BigInt()).Float64() - ccp.metrics.SetWalletBalance(ccp.chainProvider.ChainId(), ccp.chainProvider.Key(), address, gasDenom.Denom, f) + ccp.metrics.SetWalletBalance(ccp.chainProvider.ChainId(), ccp.chainProvider.PCfg.GasPrices, ccp.chainProvider.Key(), address, gasDenom.Denom, f) } } diff --git a/relayer/processor/metrics.go b/relayer/processor/metrics.go index a549eb40a..6370d14cc 100644 --- a/relayer/processor/metrics.go +++ b/relayer/processor/metrics.go @@ -26,8 +26,8 @@ func (m *PrometheusMetrics) SetLatestHeight(chain string, height int64) { m.LatestHeightGauge.WithLabelValues(chain).Set(float64(height)) } -func (m *PrometheusMetrics) SetWalletBalance(chain, key, address, denom string, balance float64) { - m.WalletBalance.WithLabelValues(chain, key, address, denom).Set(balance) +func (m *PrometheusMetrics) SetWalletBalance(chain, gasPrice, key, address, denom string, balance float64) { + m.WalletBalance.WithLabelValues(chain, gasPrice, key, address, denom).Set(balance) } func (m *PrometheusMetrics) SetFeesSpent(chain, key, address, denom string, amount float64) { From a0875af91cd81bab64ee0781f49bcebc2b3c1753 Mon Sep 17 00:00:00 2001 From: Dan Kanefsky Date: Mon, 10 Jul 2023 14:37:30 -0700 Subject: [PATCH 2/4] update label --- relayer/processor/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/processor/metrics.go b/relayer/processor/metrics.go index 6370d14cc..d6646bc14 100644 --- a/relayer/processor/metrics.go +++ b/relayer/processor/metrics.go @@ -37,7 +37,7 @@ func (m *PrometheusMetrics) SetFeesSpent(chain, key, address, denom string, amou func NewPrometheusMetrics() *PrometheusMetrics { packetLabels := []string{"path", "chain", "channel", "port", "type"} heightLabels := []string{"chain"} - walletLabels := []string{"chain", "key", "address", "denom"} + walletLabels := []string{"chain", "gasPrice", "key", "address", "denom"} registry := prometheus.NewRegistry() registerer := promauto.With(registry) return &PrometheusMetrics{ From b53c81aff43dd0464a01fed24cc66c6c858139c9 Mon Sep 17 00:00:00 2001 From: Dan Kanefsky Date: Mon, 10 Jul 2023 14:51:54 -0700 Subject: [PATCH 3/4] update fees spent metric --- relayer/chains/cosmos/tx.go | 2 +- relayer/processor/metrics.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index e4c06714d..8d9ae37d1 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -1301,7 +1301,7 @@ func (cc *CosmosProvider) UpdateFeesSpent(chain, key, address string, fees sdk.C for _, fee := range cc.TotalFees { // Convert to a big float to get a float64 for metrics f, _ := big.NewFloat(0.0).SetInt(fee.Amount.BigInt()).Float64() - cc.metrics.SetFeesSpent(chain, key, address, fee.GetDenom(), f) + cc.metrics.SetFeesSpent(chain, cc.PCfg.GasPrices, key, address, fee.GetDenom(), f) } } diff --git a/relayer/processor/metrics.go b/relayer/processor/metrics.go index d6646bc14..ec3d96889 100644 --- a/relayer/processor/metrics.go +++ b/relayer/processor/metrics.go @@ -30,8 +30,8 @@ func (m *PrometheusMetrics) SetWalletBalance(chain, gasPrice, key, address, deno m.WalletBalance.WithLabelValues(chain, gasPrice, key, address, denom).Set(balance) } -func (m *PrometheusMetrics) SetFeesSpent(chain, key, address, denom string, amount float64) { - m.FeesSpent.WithLabelValues(chain, key, address, denom).Set(amount) +func (m *PrometheusMetrics) SetFeesSpent(chain, gasPrice, key, address, denom string, amount float64) { + m.FeesSpent.WithLabelValues(chain, gasPrice, key, address, denom).Set(amount) } func NewPrometheusMetrics() *PrometheusMetrics { From 3c24e2897426f59c17d9fc2b5eb10f2684ed6aae Mon Sep 17 00:00:00 2001 From: Dan Kanefsky Date: Thu, 20 Jul 2023 14:13:50 -0700 Subject: [PATCH 4/4] snake case --- relayer/processor/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/processor/metrics.go b/relayer/processor/metrics.go index ec3d96889..ce8cae05f 100644 --- a/relayer/processor/metrics.go +++ b/relayer/processor/metrics.go @@ -37,7 +37,7 @@ func (m *PrometheusMetrics) SetFeesSpent(chain, gasPrice, key, address, denom st func NewPrometheusMetrics() *PrometheusMetrics { packetLabels := []string{"path", "chain", "channel", "port", "type"} heightLabels := []string{"chain"} - walletLabels := []string{"chain", "gasPrice", "key", "address", "denom"} + walletLabels := []string{"chain", "gas_price", "key", "address", "denom"} registry := prometheus.NewRegistry() registerer := promauto.With(registry) return &PrometheusMetrics{