Standardize Metrics To Match Minimal Metric Spec (#9623)

This commit is contained in:
Nishant Das 2021-09-17 19:35:12 +08:00 committed by GitHub
parent 568797d53d
commit 4109d4a868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View File

@ -63,6 +63,10 @@ var (
Name: "beacon_previous_justified_root", Name: "beacon_previous_justified_root",
Help: "Previous justified root of the processed state", Help: "Previous justified root of the processed state",
}) })
activeValidatorCount = promauto.NewGauge(prometheus.GaugeOpts{
Name: "beacon_current_active_validators",
Help: "Current total active validators",
})
validatorsCount = promauto.NewGaugeVec(prometheus.GaugeOpts{ validatorsCount = promauto.NewGaugeVec(prometheus.GaugeOpts{
Name: "validator_count", Name: "validator_count",
Help: "The total number of validators", Help: "The total number of validators",
@ -79,6 +83,10 @@ var (
Name: "current_eth1_data_deposit_count", Name: "current_eth1_data_deposit_count",
Help: "The current eth1 deposit count in the last processed state eth1data field.", Help: "The current eth1 deposit count in the last processed state eth1data field.",
}) })
processedDepositsCount = promauto.NewGauge(prometheus.GaugeOpts{
Name: "beacon_processed_deposits_total",
Help: "Total number of deposits processed",
})
stateTrieReferences = promauto.NewGaugeVec(prometheus.GaugeOpts{ stateTrieReferences = promauto.NewGaugeVec(prometheus.GaugeOpts{
Name: "field_references", Name: "field_references",
Help: "The number of states a particular field is shared with.", Help: "The number of states a particular field is shared with.",
@ -100,7 +108,7 @@ var (
Help: "The total amount of ether, in gwei, that has been used in voting attestation head of previous epoch", Help: "The total amount of ether, in gwei, that has been used in voting attestation head of previous epoch",
}) })
reorgCount = promauto.NewCounter(prometheus.CounterOpts{ reorgCount = promauto.NewCounter(prometheus.CounterOpts{
Name: "beacon_reorg_total", Name: "beacon_reorgs_total",
Help: "Count the number of times beacon chain has a reorg", Help: "Count the number of times beacon chain has a reorg",
}) })
saveOrphanedAttCount = promauto.NewCounter(prometheus.CounterOpts{ saveOrphanedAttCount = promauto.NewCounter(prometheus.CounterOpts{
@ -194,6 +202,7 @@ func reportEpochMetrics(ctx context.Context, postState, headState state.BeaconSt
activeBalance += exitingBalance + slashingBalance activeBalance += exitingBalance + slashingBalance
activeEffectiveBalance += exitingEffectiveBalance + slashingEffectiveBalance activeEffectiveBalance += exitingEffectiveBalance + slashingEffectiveBalance
activeValidatorCount.Set(float64(activeInstances))
validatorsCount.WithLabelValues("Pending").Set(float64(pendingInstances)) validatorsCount.WithLabelValues("Pending").Set(float64(pendingInstances))
validatorsCount.WithLabelValues("Active").Set(float64(activeInstances)) validatorsCount.WithLabelValues("Active").Set(float64(activeInstances))
validatorsCount.WithLabelValues("Exiting").Set(float64(exitingInstances)) validatorsCount.WithLabelValues("Exiting").Set(float64(exitingInstances))
@ -220,6 +229,7 @@ func reportEpochMetrics(ctx context.Context, postState, headState state.BeaconSt
beaconFinalizedEpoch.Set(float64(postState.FinalizedCheckpointEpoch())) beaconFinalizedEpoch.Set(float64(postState.FinalizedCheckpointEpoch()))
beaconFinalizedRoot.Set(float64(bytesutil.ToLowInt64(postState.FinalizedCheckpoint().Root))) beaconFinalizedRoot.Set(float64(bytesutil.ToLowInt64(postState.FinalizedCheckpoint().Root)))
currentEth1DataDepositCount.Set(float64(postState.Eth1Data().DepositCount)) currentEth1DataDepositCount.Set(float64(postState.Eth1Data().DepositCount))
processedDepositsCount.Set(float64(postState.Eth1DepositIndex() + 1))
var b *precompute.Balance var b *precompute.Balance
var v []*precompute.Validator var v []*precompute.Validator

View File

@ -11,6 +11,10 @@ var (
Help: "The number of peers in a given state.", Help: "The number of peers in a given state.",
}, },
[]string{"state"}) []string{"state"})
totalPeerCount = promauto.NewGauge(prometheus.GaugeOpts{
Name: "libp2p_peers",
Help: "Tracks the total number of libp2p peers",
})
repeatPeerConnections = promauto.NewCounter(prometheus.CounterOpts{ repeatPeerConnections = promauto.NewCounter(prometheus.CounterOpts{
Name: "p2p_repeat_attempts", Name: "p2p_repeat_attempts",
Help: "The number of repeat attempts the connection handler is triggered for a peer.", Help: "The number of repeat attempts the connection handler is triggered for a peer.",
@ -42,6 +46,7 @@ var (
) )
func (s *Service) updateMetrics() { func (s *Service) updateMetrics() {
totalPeerCount.Set(float64(len(s.peers.Connected())))
p2pPeerCount.WithLabelValues("Connected").Set(float64(len(s.peers.Connected()))) p2pPeerCount.WithLabelValues("Connected").Set(float64(len(s.peers.Connected())))
p2pPeerCount.WithLabelValues("Disconnected").Set(float64(len(s.peers.Disconnected()))) p2pPeerCount.WithLabelValues("Disconnected").Set(float64(len(s.peers.Disconnected())))
p2pPeerCount.WithLabelValues("Connecting").Set(float64(len(s.peers.Connecting()))) p2pPeerCount.WithLabelValues("Connecting").Set(float64(len(s.peers.Connecting())))