diff --git a/beacon-chain/blockchain/metrics.go b/beacon-chain/blockchain/metrics.go index f00ffdef02..0b4a2e24dc 100644 --- a/beacon-chain/blockchain/metrics.go +++ b/beacon-chain/blockchain/metrics.go @@ -80,14 +80,22 @@ var ( Name: "field_references", Help: "The number of states a particular field is shared with.", }, []string{"state"}) - totalEligibleBalances = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "total_eligible_balances", - Help: "The total amount of ether, in gwei, that is eligible for voting of previous epoch", + prevEpochActiveBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "beacon_prev_epoch_active_gwei", + Help: "The total amount of ether, in gwei, that was active for voting of previous epoch", }) - totalVotedTargetBalances = promauto.NewGauge(prometheus.GaugeOpts{ - Name: "total_voted_target_balances", + prevEpochSourceBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "beacon_prev_epoch_source_gwei", + Help: "The total amount of ether, in gwei, that has been used in voting attestation source of previous epoch", + }) + prevEpochTargetBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "beacon_prev_epoch_target_gwei", Help: "The total amount of ether, in gwei, that has been used in voting attestation target of previous epoch", }) + prevEpochHeadBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "beacon_prev_epoch_head_gwei", + Help: "The total amount of ether, in gwei, that has been used in voting attestation head of previous epoch", + }) reorgCount = promauto.NewCounter(prometheus.CounterOpts{ Name: "beacon_reorg_total", Help: "Count the number of times beacon chain has a reorg", @@ -106,6 +114,15 @@ var ( Buckets: []float64{1, 2, 3, 4, 6, 32, 64}, }, ) + // TODO(7141): Remove deprecated metrics below. + totalEligibleBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "total_eligible_balances", + Help: "The total amount of ether, in gwei, that is eligible for voting of previous epoch", + }) + totalVotedTargetBalances = promauto.NewGauge(prometheus.GaugeOpts{ + Name: "total_voted_target_balances", + Help: "The total amount of ether, in gwei, that has been used in voting attestation target of previous epoch", + }) ) // reportSlotMetrics reports slot related metrics. @@ -205,6 +222,10 @@ func reportEpochMetrics(state *stateTrie.BeaconState) { if precompute.Balances != nil { totalEligibleBalances.Set(float64(precompute.Balances.ActivePrevEpoch)) totalVotedTargetBalances.Set(float64(precompute.Balances.PrevEpochTargetAttested)) + prevEpochActiveBalances.Set(float64(precompute.Balances.ActivePrevEpoch)) + prevEpochSourceBalances.Set(float64(precompute.Balances.PrevEpochAttested)) + prevEpochTargetBalances.Set(float64(precompute.Balances.PrevEpochTargetAttested)) + prevEpochHeadBalances.Set(float64(precompute.Balances.PrevEpochHeadAttested)) } refMap := state.FieldReferencesCount() for name, val := range refMap {