Skip to content

Update derivation metrics #286

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

Merged
MarvelFisher merged 2 commits into from
May 8, 2024
Merged

Update derivation metrics #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6837435
update derivation metrics
curryxbo May 7, 2024
e9c4338
fix PrometheusMetrics
curryxbo May 8, 2024
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
6 changes: 5 additions & 1 deletion node/derivation/derivation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,14 @@ func (d *Derivation) derivationBlock(ctx context.Context) {
d.logger.Error("eth_getLogs failed", "err", err)
return
}
latestBatchIndex, err := d.rollup.LastCommittedBatchIndex(nil)
latestBatchIndex, err := d.rollup.LastCommittedBatchIndex(&bind.CallOpts{
BlockNumber: big.NewInt(int64(latest)),
})
if err != nil {
d.logger.Error("query rollup latestCommitted batch Index failed", "err", err)
return
}
d.metrics.SetLatestBatchIndex(latestBatchIndex.Uint64())
d.logger.Info("fetched rollup tx", "txNum", len(logs), "latestBatchIndex", latestBatchIndex)

for _, lg := range logs {
Expand Down Expand Up @@ -208,6 +211,7 @@ func (d *Derivation) derivationBlock(ctx context.Context) {
// only last block of batch
d.logger.Info("batch derivation complete", "batch_index", batchInfo.batchIndex, "currentBatchEndBlock", lastHeader.Number.Uint64())
d.metrics.SetL2DeriveHeight(lastHeader.Number.Uint64())
d.metrics.SetSyncedBatchIndex(batchInfo.batchIndex)
withdrawalRoot, err := d.L2ToL1MessagePasser.MessageRoot(&bind.CallOpts{
BlockNumber: lastHeader.Number,
})
Expand Down
30 changes: 26 additions & 4 deletions node/derivation/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ const (
)

type Metrics struct {
L1SyncHeight metrics.Gauge
RollupL2Height metrics.Gauge
DeriveL2Height metrics.Gauge
BatchStatus metrics.Gauge
L1SyncHeight metrics.Gauge
RollupL2Height metrics.Gauge
DeriveL2Height metrics.Gauge
BatchStatus metrics.Gauge
LatestBatchIndex metrics.Gauge
SyncedBatchIndex metrics.Gauge
}

func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
Expand Down Expand Up @@ -54,6 +56,18 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
Name: "batch_root_exception",
Help: "",
}, labels).With(labelsAndValues...),
LatestBatchIndex: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
Namespace: namespace,
Subsystem: metricsSubsystem,
Name: "latest_batch_index",
Help: "",
}, labels).With(labelsAndValues...),
SyncedBatchIndex: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
Namespace: namespace,
Subsystem: metricsSubsystem,
Name: "synced_batch_index",
Help: "",
}, labels).With(labelsAndValues...),
}
}

Expand All @@ -73,6 +87,14 @@ func (m *Metrics) SetBatchStatus(status uint64) {
m.BatchStatus.Set(float64(status))
}

func (m *Metrics) SetLatestBatchIndex(batchIndex uint64) {
m.LatestBatchIndex.Set(float64(batchIndex))
}

func (m *Metrics) SetSyncedBatchIndex(batchIndex uint64) {
m.SyncedBatchIndex.Set(float64(batchIndex))
}

func (m *Metrics) Serve(hostname string, port uint64) (*http.Server, error) {
mux := http.NewServeMux()
mux.Handle("/metrics", promhttp.Handler())
Expand Down