Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync: Add metrics #1155

Merged
merged 4 commits into from
Sep 10, 2023
Merged

sync: Add metrics #1155

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8d4d52
add metrics to synchronizer
Exca-DK Aug 23, 2023
a6ec1bb
rename meters
Exca-DK Sep 4, 2023
ff0e820
happy uk linter
Exca-DK Sep 4, 2023
33bfcb1
move updateStats
Exca-DK Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 54 additions & 9 deletions sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ type Synchronizer struct {
catchUpMode bool

// metrics
opTimers *prometheus.HistogramVec
totalBlocks prometheus.Counter
opTimerHistogram *prometheus.HistogramVec
blockCount prometheus.Counter
chainHeightGauge prometheus.Gauge
bestBlockGauge prometheus.Gauge
reorgCount prometheus.Counter
transactionCount prometheus.Counter
}

func New(bc *blockchain.Blockchain, starkNetData starknetdata.StarknetData,
Expand All @@ -54,16 +58,39 @@ func New(bc *blockchain.Blockchain, starkNetData starknetdata.StarknetData,
log: log,
pendingPollInterval: pendingPollInterval,

opTimers: prometheus.NewHistogramVec(prometheus.HistogramOpts{
opTimerHistogram: prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: "sync",
Name: "timers",
}, []string{"op"}),
totalBlocks: prometheus.NewCounter(prometheus.CounterOpts{
blockCount: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "sync",
Name: "blocks",
}),
chainHeightGauge: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "sync",
Name: "blockchain_height",
}),
bestBlockGauge: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "sync",
Name: "best_known_block_number",
}),
reorgCount: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "sync",
Name: "reorganisations",
Exca-DK marked this conversation as resolved.
Show resolved Hide resolved
}),
transactionCount: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "sync",
Name: "transactions",
}),
}
metrics.MustRegister(s.opTimers, s.totalBlocks)
metrics.MustRegister(
s.opTimerHistogram,
s.blockCount,
s.chainHeightGauge,
s.bestBlockGauge,
s.reorgCount,
s.transactionCount,
)
return s
}

Expand Down Expand Up @@ -159,7 +186,7 @@ func (s *Synchronizer) fetchUnknownClasses(ctx context.Context, stateUpdate *cor
func (s *Synchronizer) verifierTask(ctx context.Context, block *core.Block, stateUpdate *core.StateUpdate,
newClasses map[felt.Felt]core.Class, resetStreams context.CancelFunc,
) stream.Callback {
timer := prometheus.NewTimer(s.opTimers.WithLabelValues(opVerifyLabel))
timer := prometheus.NewTimer(s.opTimerHistogram.WithLabelValues(opVerifyLabel))
commitments, err := s.Blockchain.SanityCheckNewHeight(block, stateUpdate, newClasses)
timer.ObserveDuration()
return func() {
Expand All @@ -172,7 +199,7 @@ func (s *Synchronizer) verifierTask(ctx context.Context, block *core.Block, stat
resetStreams()
return
}
timer := prometheus.NewTimer(s.opTimers.WithLabelValues(opStoreLabel))
timer := prometheus.NewTimer(s.opTimerHistogram.WithLabelValues(opStoreLabel))
err = s.Blockchain.Store(block, commitments, stateUpdate, newClasses)
timer.ObserveDuration()

Expand All @@ -189,7 +216,6 @@ func (s *Synchronizer) verifierTask(ctx context.Context, block *core.Block, stat
resetStreams()
return
}
s.totalBlocks.Inc()
highestBlockHeader := s.HighestBlockHeader.Load()
if highestBlockHeader == nil || highestBlockHeader.Number <= block.Number {
highestBlock, err := s.StarknetData.BlockLatest(ctx)
Expand All @@ -207,6 +233,7 @@ func (s *Synchronizer) verifierTask(ctx context.Context, block *core.Block, stat

Exca-DK marked this conversation as resolved.
Show resolved Hide resolved
s.log.Infow("Stored Block", "number", block.Number, "hash",
block.Hash.ShortString(), "root", block.GlobalStateRoot.ShortString())
s.updateStats(block)
}
}
}
Expand Down Expand Up @@ -255,7 +282,7 @@ func (s *Synchronizer) syncBlocks(syncCtx context.Context) {
default:
curHeight, curStreamCtx, curCancel := nextHeight, streamCtx, streamCancel
fetchers.Go(func() stream.Callback {
timer := prometheus.NewTimer(s.opTimers.WithLabelValues(opFetchLabel))
timer := prometheus.NewTimer(s.opTimerHistogram.WithLabelValues(opFetchLabel))
cb := s.fetcherTask(curStreamCtx, curHeight, verifiers, curCancel)
timer.ObserveDuration()
return cb
Expand Down Expand Up @@ -296,6 +323,7 @@ func (s *Synchronizer) revertHead(forkBlock *core.Block) {
} else {
s.log.Infow("Reverted HEAD", "reverted", localHead)
}
s.reorgCount.Inc()
}

func (s *Synchronizer) pollPending(ctx context.Context, sem chan struct{}) {
Expand Down Expand Up @@ -363,3 +391,20 @@ func (s *Synchronizer) fetchAndStorePending(ctx context.Context) error {
NewClasses: newClasses,
})
}

func (s *Synchronizer) updateStats(block *core.Block) {
var (
transactions = block.TransactionCount
currentHeight = block.Number
highestKnownHeight uint64 = 0
)
highestBlockHeader := s.HighestBlockHeader.Load()
if highestBlockHeader != nil {
highestKnownHeight = highestBlockHeader.Number
}

s.blockCount.Inc()
s.chainHeightGauge.Set(float64(currentHeight))
s.bestBlockGauge.Set(float64(highestKnownHeight))
s.transactionCount.Add(float64(transactions))
}
Loading