Skip to content

Commit acdc61e

Browse files
authored
chore: remove the address to make metrics unique (#43)
1 parent a59cbec commit acdc61e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

op-monitorism/global_events/monitor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func NewMonitor(ctx context.Context, log log.Logger, m metrics.Factory, cfg CLIC
9494
Namespace: MetricsNamespace,
9595
Name: "eventEmitted",
9696
Help: "Event monitored emitted an log",
97-
}, []string{"nickname", "rulename", "priority", "functionName", "topics", "address"}),
97+
}, []string{"nickname", "rulename", "priority", "functionName", "topics"}),
9898
unexpectedRpcErrors: m.NewCounterVec(prometheus.CounterOpts{
9999
Namespace: MetricsNamespace,
100100
Name: "unexpectedRpcErrors",
@@ -155,13 +155,13 @@ func metricsAllEventsRegistered(globalconfig GlobalConfiguration, eventEmitted *
155155
for _, config := range globalconfig.Configuration {
156156
if len(config.Addresses) == 0 {
157157
for _, event := range config.Events {
158-
eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), "ANY_ADDRESSES_[]").Add(0)
158+
eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex()).Add(0)
159159
}
160160
continue //pass to the next config so the [] any are not displayed as metrics here.
161161
}
162162
for _, address := range config.Addresses {
163163
for _, event := range globalconfig.ReturnEventsMonitoredForAnAddressFromAConfig(address, config) {
164-
eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), address.String()).Add(0)
164+
eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex()).Add(0)
165165
}
166166
}
167167
}
@@ -212,7 +212,7 @@ func (m *Monitor) checkEvents(ctx context.Context) { //TODO: Ensure the logs cri
212212
m.log.Info("Event Detected", "TxHash", vLog.TxHash.String(), "Address", vLog.Address, "RuleName", config.Name, "CurrentBlock", latestBlockNumber.String(), "Topics", vLog.Topics, "Config", config, "event_config.Signature", event_config.Signature, "event_config.Keccak256_Signature", event_config.Keccak256_Signature.Hex())
213213
// m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex(), vLog.Address.String(), latestBlockNumber.String(), vLog.TxHash.String()).Set(float64(1)) //inc
214214

215-
m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex(), vLog.Address.String()).Inc()
215+
m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex()).Inc()
216216
}
217217
}
218218
}

0 commit comments

Comments
 (0)