From d81a3308b18232c134335a6cfe59cf3df0611658 Mon Sep 17 00:00:00 2001
From: colin <102356659+colinlyguo@users.noreply.github.com>
Date: Wed, 17 Apr 2024 18:32:00 +0800
Subject: [PATCH] feat(worker): add a commit tx failed metric (#704)

* feat(worker): add a commit tx failed metric

* bump version

* add number of L1 messages metric
---
 miner/worker.go                     | 4 ++++
 params/version.go                   | 2 +-
 rollup/sync_service/sync_service.go | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/miner/worker.go b/miner/worker.go
index 56fa18e3fe..41b0167abf 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -95,6 +95,7 @@ var (
 
 	l2CommitTxsTimer                = metrics.NewRegisteredTimer("miner/commit/txs_all", nil)
 	l2CommitTxTimer                 = metrics.NewRegisteredTimer("miner/commit/tx_all", nil)
+	l2CommitTxFailedTimer           = metrics.NewRegisteredTimer("miner/commit/tx_all_failed", nil)
 	l2CommitTxTraceTimer            = metrics.NewRegisteredTimer("miner/commit/tx_trace", nil)
 	l2CommitTxTraceStateRevertTimer = metrics.NewRegisteredTimer("miner/commit/tx_trace_state_revert", nil)
 	l2CommitTxCCCTimer              = metrics.NewRegisteredTimer("miner/commit/tx_ccc", nil)
@@ -927,6 +928,9 @@ func (w *worker) commitTransaction(tx *types.Transaction, coinbase common.Addres
 	if w.isRunning() {
 		defer func(t0 time.Time) {
 			l2CommitTxTimer.Update(time.Since(t0))
+			if err != nil {
+				l2CommitTxFailedTimer.Update(time.Since(t0))
+			}
 		}(time.Now())
 
 		// do gas limit check up-front and do not run CCC if it fails
diff --git a/params/version.go b/params/version.go
index 5bd5369dc0..93d9bc4132 100644
--- a/params/version.go
+++ b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 2         // Minor version component of the current release
-	VersionPatch = 3         // Patch version component of the current release
+	VersionPatch = 4         // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )
 
diff --git a/rollup/sync_service/sync_service.go b/rollup/sync_service/sync_service.go
index 05f95c47ab..091f2d1969 100644
--- a/rollup/sync_service/sync_service.go
+++ b/rollup/sync_service/sync_service.go
@@ -11,6 +11,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethdb"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/metrics"
 	"github.com/scroll-tech/go-ethereum/node"
 	"github.com/scroll-tech/go-ethereum/params"
 )
@@ -35,6 +36,10 @@ const (
 	DbWriteThresholdBlocks = 1000
 )
 
+var (
+	l1MessageTotalCounter = metrics.NewRegisteredCounter("rollup/l1/message", nil)
+)
+
 // SyncService collects all L1 messages and stores them in a local database.
 type SyncService struct {
 	ctx                  context.Context
@@ -172,6 +177,7 @@ func (s *SyncService) fetchMessages() {
 		numBlocksPendingDbWrite = 0
 
 		if numMessagesPendingDbWrite > 0 {
+			l1MessageTotalCounter.Inc(int64(numMessagesPendingDbWrite))
 			s.msgCountFeed.Send(core.NewL1MsgsEvent{Count: numMessagesPendingDbWrite})
 			numMessagesPendingDbWrite = 0
 		}