don't export vochaininfo metrics during blocksync

vocdoni · Jan 8, 2024 · 1dfe271 · 1dfe271
1 parent 6eb0e36
commit 1dfe271
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/vochain/vochaininfo/metrics.go b/vochain/vochaininfo/metrics.go
@@ -3,13 +3,16 @@ package vochaininfo
 import "github.com/VictoriaMetrics/metrics"
 
 var (
-	height               = metrics.NewCounter("vochain_height")              // Height of the vochain (last block)
-	voteCount            = metrics.NewCounter("vochain_vote_tree")           // Total vote count
-	processTreeSize      = metrics.NewCounter("vochain_process_tree")        // Size of the process tree
-	accountTreeSize      = metrics.NewCounter("vochain_account_tree")        // Size of the account tree
-	sikTreeSize          = metrics.NewCounter("vochain_sik_tree")            // Size of the SIK tree
-	mempoolSize          = metrics.NewCounter("vochain_mempool")             // Number of Txs in the mempool
-	voteCacheSize        = metrics.NewCounter("vochain_vote_cache")          // Size of the current vote cache
-	blockPeriodMinute    = metrics.NewCounter("vochain_block_period_minute") // Block period for the last minute
-	blocksSyncLastMinute = metrics.NewCounter("vochain_blocks_sync_minute")  // Blocks synced the last minute
+	viMetrics         = metrics.NewSet()
+	height            = viMetrics.NewCounter("vochain_height")              // Height of the vochain (last block)
+	voteCount         = viMetrics.NewCounter("vochain_vote_tree")           // Total vote count
+	processTreeSize   = viMetrics.NewCounter("vochain_process_tree")        // Size of the process tree
+	accountTreeSize   = viMetrics.NewCounter("vochain_account_tree")        // Size of the account tree
+	sikTreeSize       = viMetrics.NewCounter("vochain_sik_tree")            // Size of the SIK tree
+	mempoolSize       = viMetrics.NewCounter("vochain_mempool")             // Number of Txs in the mempool
+	voteCacheSize     = viMetrics.NewCounter("vochain_vote_cache")          // Size of the current vote cache
+	blockPeriodMinute = viMetrics.NewCounter("vochain_block_period_minute") // Block period for the last minute
+
+	blocksyncMetrics = metrics.NewSet()
+	blocksyncBPM     = blocksyncMetrics.NewCounter("vochain_sync_blocks_per_minute")
 )
diff --git a/vochain/vochaininfo/vochaininfo.go b/vochain/vochaininfo/vochaininfo.go
@@ -33,6 +33,16 @@ func NewVochainInfo(node *vochain.BaseApplication) *VochainInfo {
 }
 
 func (vi *VochainInfo) updateCounters() {
+	if vi.vnode.IsSynchronizing() {
+		metrics.UnregisterSet(viMetrics)
+		metrics.RegisterSet(blocksyncMetrics)
+		blocksyncBPM.Set(uint64(vi.BlocksLastMinute()))
+		return
+	}
+	// TODO: do this only once when sync is finished, instead of on every updateCounters
+	metrics.RegisterSet(viMetrics)
+	metrics.UnregisterSet(blocksyncMetrics)
+
 	height.Set(uint64(vi.vnode.Height()))
 
 	pc, err := vi.vnode.State.CountProcesses(true)
@@ -62,7 +72,6 @@ func (vi *VochainInfo) updateCounters() {
 	voteCacheSize.Set(uint64(vi.vnode.State.CacheSize()))
 	mempoolSize.Set(uint64(vi.vnode.MempoolSize()))
 	blockPeriodMinute.Set(uint64(vi.BlockTimes()[0].Milliseconds()))
-	blocksSyncLastMinute.Set(uint64(vi.BlocksLastMinute()))
 }
 
 // Height returns the current number of blocks of the blockchain.