Skip to content

Commit 4138425

Browse files
committed
fix: fix and cleanup metrics (sequencers + block)
1 parent 474818d commit 4138425

File tree

6 files changed

+5
-288
lines changed

6 files changed

+5
-288
lines changed

apps/evm/cmd/run.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,13 @@ func createSequencer(
111111
nodeConfig config.Config,
112112
genesis genesis.Genesis,
113113
) (coresequencer.Sequencer, error) {
114-
singleMetrics, err := single.NopMetrics()
115-
if err != nil {
116-
return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
117-
}
118-
119114
sequencer, err := single.NewSequencer(
120115
ctx,
121116
logger,
122117
datastore,
123118
da,
124119
[]byte(genesis.ChainID),
125120
nodeConfig.Node.BlockTime.Duration,
126-
singleMetrics,
127121
nodeConfig.Node.Aggregator,
128122
)
129123
if err != nil {

apps/grpc/cmd/run.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,13 @@ func createSequencer(
119119
nodeConfig config.Config,
120120
genesis genesis.Genesis,
121121
) (coresequencer.Sequencer, error) {
122-
singleMetrics, err := single.NopMetrics()
123-
if err != nil {
124-
return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
125-
}
126-
127122
sequencer, err := single.NewSequencer(
128123
ctx,
129124
logger,
130125
datastore,
131126
da,
132127
[]byte(genesis.ChainID),
133128
nodeConfig.Node.BlockTime.Duration,
134-
singleMetrics,
135129
nodeConfig.Node.Aggregator,
136130
)
137131
if err != nil {

apps/testapp/cmd/run.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ var RunCmd = &cobra.Command{
6868
return err
6969
}
7070

71-
singleMetrics, err := single.NopMetrics()
72-
if err != nil {
73-
return err
74-
}
75-
7671
// Start the KV executor HTTP server
7772
if kvEndpoint != "" { // Only start if endpoint is provided
7873
httpServer := kvexecutor.NewHTTPServer(executor, kvEndpoint)
@@ -101,7 +96,6 @@ var RunCmd = &cobra.Command{
10196
&daJrpc.DA,
10297
[]byte(genesis.ChainID),
10398
nodeConfig.Node.BlockTime.Duration,
104-
singleMetrics,
10599
nodeConfig.Node.Aggregator,
106100
)
107101
if err != nil {

sequencers/single/metrics.go

Lines changed: 0 additions & 99 deletions
This file was deleted.

sequencers/single/sequencer.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ type Sequencer struct {
3131
da coreda.DA
3232

3333
batchTime time.Duration
34-
35-
queue *BatchQueue // single queue for immediate availability
36-
37-
metrics *Metrics
34+
queue *BatchQueue // single queue for immediate availability
3835
}
3936

4037
// NewSequencer creates a new Single Sequencer
@@ -45,10 +42,9 @@ func NewSequencer(
4542
da coreda.DA,
4643
id []byte,
4744
batchTime time.Duration,
48-
metrics *Metrics,
4945
proposer bool,
5046
) (*Sequencer, error) {
51-
return NewSequencerWithQueueSize(ctx, logger, db, da, id, batchTime, metrics, proposer, 1000)
47+
return NewSequencerWithQueueSize(ctx, logger, db, da, id, batchTime, proposer, 1000)
5248
}
5349

5450
// NewSequencerWithQueueSize creates a new Single Sequencer with configurable queue size
@@ -59,7 +55,6 @@ func NewSequencerWithQueueSize(
5955
da coreda.DA,
6056
id []byte,
6157
batchTime time.Duration,
62-
metrics *Metrics,
6358
proposer bool,
6459
maxQueueSize int,
6560
) (*Sequencer, error) {
@@ -69,7 +64,6 @@ func NewSequencerWithQueueSize(
6964
batchTime: batchTime,
7065
Id: id,
7166
queue: NewBatchQueue(db, "batches", maxQueueSize),
72-
metrics: metrics,
7367
proposer: proposer,
7468
}
7569

@@ -128,18 +122,6 @@ func (c *Sequencer) GetNextBatch(ctx context.Context, req coresequencer.GetNextB
128122
}, nil
129123
}
130124

131-
// RecordMetrics updates the metrics with the given values.
132-
// This method is intended to be called by the block manager after submitting data to the DA layer.
133-
func (c *Sequencer) RecordMetrics(gasPrice float64, blobSize uint64, statusCode coreda.StatusCode, numPendingBlocks uint64, includedBlockHeight uint64) {
134-
if c.metrics != nil {
135-
c.metrics.GasPrice.Set(gasPrice)
136-
c.metrics.LastBlobSize.Set(float64(blobSize))
137-
c.metrics.TransactionStatus.With("status", fmt.Sprintf("%d", statusCode)).Add(1)
138-
c.metrics.NumPendingBlocks.Set(float64(numPendingBlocks))
139-
c.metrics.IncludedBlockHeight.Set(float64(includedBlockHeight))
140-
}
141-
}
142-
143125
// VerifyBatch implements sequencing.Sequencer.
144126
func (c *Sequencer) VerifyBatch(ctx context.Context, req coresequencer.VerifyBatchRequest) (*coresequencer.VerifyBatchResponse, error) {
145127
if !c.isValid(req.Id) {

0 commit comments

Comments
 (0)