Skip to content

Commit fb67fbd

Browse files
committed
feat: metrics for aggregator payed gass diff
1 parent f2d9b7d commit fb67fbd

File tree

2 files changed

+35
-14
lines changed

2 files changed

+35
-14
lines changed

aggregator/internal/pkg/aggregator.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ type Aggregator struct {
9090
func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error) {
9191
newBatchChan := make(chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV3)
9292

93+
logger := aggregatorConfig.BaseConfig.Logger
94+
95+
// Metrics
96+
reg := prometheus.NewRegistry()
97+
aggregatorMetrics := metrics.NewMetrics(aggregatorConfig.Aggregator.MetricsIpPortAddress, reg, logger)
98+
99+
// Telemetry
100+
aggregatorTelemetry := NewTelemetry(aggregatorConfig.Aggregator.TelemetryIpPortAddress, logger)
101+
93102
avsReader, err := chainio.NewAvsReaderFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
94103
if err != nil {
95104
return nil, err
@@ -100,7 +109,7 @@ func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error
100109
return nil, err
101110
}
102111

103-
avsWriter, err := chainio.NewAvsWriterFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
112+
avsWriter, err := chainio.NewAvsWriterFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig, aggregatorMetrics)
104113
if err != nil {
105114
return nil, err
106115
}
@@ -121,7 +130,6 @@ func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error
121130

122131
aggregatorPrivateKey := aggregatorConfig.EcdsaConfig.PrivateKey
123132

124-
logger := aggregatorConfig.BaseConfig.Logger
125133
clients, err := sdkclients.BuildAll(chainioConfig, aggregatorPrivateKey, logger)
126134
if err != nil {
127135
logger.Errorf("Cannot create sdk clients", "err", err)
@@ -147,13 +155,6 @@ func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error
147155
avsRegistryService := avsregistry.NewAvsRegistryServiceChainCaller(avsReader.ChainReader, operatorPubkeysService, logger)
148156
blsAggregationService := blsagg.NewBlsAggregatorService(avsRegistryService, hashFunction, logger)
149157

150-
// Metrics
151-
reg := prometheus.NewRegistry()
152-
aggregatorMetrics := metrics.NewMetrics(aggregatorConfig.Aggregator.MetricsIpPortAddress, reg, logger)
153-
154-
// Telemetry
155-
aggregatorTelemetry := NewTelemetry(aggregatorConfig.Aggregator.TelemetryIpPortAddress, logger)
156-
157158
nextBatchIndex := uint32(0)
158159

159160
aggregator := Aggregator{

metrics/metrics.go

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ import (
1313
)
1414

1515
type Metrics struct {
16-
ipPortAddress string
17-
logger logging.Logger
18-
numAggregatedResponses prometheus.Counter
19-
numAggregatorReceivedTasks prometheus.Counter
20-
numOperatorTaskResponses prometheus.Counter
16+
ipPortAddress string
17+
logger logging.Logger
18+
numAggregatedResponses prometheus.Counter
19+
numAggregatorReceivedTasks prometheus.Counter
20+
numOperatorTaskResponses prometheus.Counter
21+
accumulatedGasPriceSpent prometheus.Gauge
22+
numAccumulatedGasPriceSpent prometheus.Counter
2123
}
2224

2325
const alignedNamespace = "aligned"
@@ -41,6 +43,16 @@ func NewMetrics(ipPortAddress string, reg prometheus.Registerer, logger logging.
4143
Name: "aggregator_received_tasks",
4244
Help: "Number of tasks received by the Service Manager",
4345
}),
46+
accumulatedGasPriceSpent: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
47+
Namespace: alignedNamespace,
48+
Name: "aggregator_accumulated_gas_price_payed",
49+
Help: "Number of tasks received by the Service Manager",
50+
}),
51+
numAccumulatedGasPriceSpent: promauto.With(reg).NewCounter(prometheus.CounterOpts{
52+
Namespace: alignedNamespace,
53+
Name: "aggregator_number_accumulated_gas_price_payed",
54+
Help: "Number of tasks received by the Service Manager",
55+
}),
4456
}
4557
}
4658

@@ -86,3 +98,11 @@ func (m *Metrics) IncAggregatedResponses() {
8698
func (m *Metrics) IncOperatorTaskResponses() {
8799
m.numOperatorTaskResponses.Inc()
88100
}
101+
102+
func (m *Metrics) IncAggregatorAccumResponse() {
103+
m.numAccumulatedGasPriceSpent.Inc()
104+
}
105+
106+
func (m *Metrics) AddAccumulatedGasPayedAggregator(value float64) {
107+
m.accumulatedGasPriceSpent.Add(value)
108+
}

0 commit comments

Comments
 (0)