Merge pull request #1351 from flicker-harmony/pr_block_height_issue_fix

Fix block height issue
pull/1356/head
Leo Chen 5 years ago committed by GitHub
commit e606d4a9df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      api/service/metrics/service.go

@ -51,7 +51,7 @@ var (
lastBlockReward = big.NewInt(0) lastBlockReward = big.NewInt(0)
lastConsensusTime = int64(0) lastConsensusTime = int64(0)
metricsPush = make(chan int) metricsPush = make(chan int)
blockHeightCounter = prometheus.NewCounter(prometheus.CounterOpts{ blockHeightGauge = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "block_height", Name: "block_height",
Help: "Get current block height.", Help: "Get current block height.",
}) })
@ -122,7 +122,7 @@ func (s *Service) Run() {
// Init local storage for metrics. // Init local storage for metrics.
s.storage = GetStorageInstance(s.IP, s.Port, true) s.storage = GetStorageInstance(s.IP, s.Port, true)
registry := prometheus.NewRegistry() registry := prometheus.NewRegistry()
registry.MustRegister(blockHeightCounter, connectionsNumberGauge, nodeBalanceGauge, lastConsensusGauge, blockRewardGauge, blocksAcceptedGauge, txPoolGauge, isLeaderGauge) registry.MustRegister(blockHeightGauge, connectionsNumberGauge, nodeBalanceGauge, lastConsensusGauge, blockRewardGauge, blocksAcceptedGauge, txPoolGauge, isLeaderGauge)
s.pusher = push.New("http://"+s.PushgatewayIP+":"+s.PushgatewayPort, "node_metrics").Gatherer(registry).Grouping("instance", s.IP+":"+s.Port).Grouping("bls_key", s.BlsPublicKey) s.pusher = push.New("http://"+s.PushgatewayIP+":"+s.PushgatewayPort, "node_metrics").Gatherer(registry).Grouping("instance", s.IP+":"+s.Port).Grouping("bls_key", s.BlsPublicKey)
go s.PushMetrics() go s.PushMetrics()
@ -137,7 +137,7 @@ func FormatBalance(balance *big.Int) float64 {
// UpdateBlockHeight updates block height. // UpdateBlockHeight updates block height.
func UpdateBlockHeight(blockHeight uint64) { func UpdateBlockHeight(blockHeight uint64) {
blockHeightCounter.Add(float64(blockHeight) - float64(curBlockHeight)) blockHeightGauge.Set(float64(blockHeight))
blocksAcceptedGauge.Set(float64(blockHeight) - float64(curBlockHeight)) blocksAcceptedGauge.Set(float64(blockHeight) - float64(curBlockHeight))
curBlockHeight = blockHeight curBlockHeight = blockHeight
metricsPush <- BlockHeightPush metricsPush <- BlockHeightPush

Loading…
Cancel
Save