Skip to content

Commit 56428e2

Browse files
authored
Merge pull request #724 from onflow/mpeter/remove-relic-trace-download-metric
Remove relic `TraceDownloadFailed` metric
2 parents 1727f6d + bc88364 commit 56428e2

File tree

2 files changed

+20
-34
lines changed

2 files changed

+20
-34
lines changed

metrics/collector.go

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
type Collector interface {
1313
ApiErrorOccurred()
14-
TraceDownloadFailed()
1514
ServerPanicked(reason string)
1615
CadenceHeightIndexed(height uint64)
1716
EVMHeightIndexed(height uint64)
@@ -26,17 +25,16 @@ var _ Collector = &DefaultCollector{}
2625

2726
type DefaultCollector struct {
2827
// TODO: for now we cannot differentiate which api request failed number of times
29-
apiErrorsCounter prometheus.Counter
30-
traceDownloadErrorCounter prometheus.Counter
31-
serverPanicsCounters *prometheus.CounterVec
32-
cadenceBlockHeight prometheus.Gauge
33-
evmBlockHeight prometheus.Gauge
34-
evmBlockIndexedCounter prometheus.Counter
35-
evmTxIndexedCounter prometheus.Counter
36-
operatorBalance prometheus.Gauge
37-
evmAccountCallCounters *prometheus.CounterVec
38-
requestDurations *prometheus.HistogramVec
39-
availableSigningkeys prometheus.Gauge
28+
apiErrorsCounter prometheus.Counter
29+
serverPanicsCounters *prometheus.CounterVec
30+
cadenceBlockHeight prometheus.Gauge
31+
evmBlockHeight prometheus.Gauge
32+
evmBlockIndexedCounter prometheus.Counter
33+
evmTxIndexedCounter prometheus.Counter
34+
operatorBalance prometheus.Gauge
35+
evmAccountCallCounters *prometheus.CounterVec
36+
requestDurations *prometheus.HistogramVec
37+
availableSigningkeys prometheus.Gauge
4038
}
4139

4240
func NewCollector(logger zerolog.Logger) Collector {
@@ -45,11 +43,6 @@ func NewCollector(logger zerolog.Logger) Collector {
4543
Help: "Total number of API errors",
4644
})
4745

48-
traceDownloadErrorCounter := prometheus.NewCounter(prometheus.CounterOpts{
49-
Name: prefixedName("trace_download_errors_total"),
50-
Help: "Total number of trace download errors",
51-
})
52-
5346
serverPanicsCounters := prometheus.NewCounterVec(prometheus.CounterOpts{
5447
Name: prefixedName("api_server_panics_total"),
5548
Help: "Total number of panics in the API server",
@@ -99,7 +92,6 @@ func NewCollector(logger zerolog.Logger) Collector {
9992

10093
metrics := []prometheus.Collector{
10194
apiErrors,
102-
traceDownloadErrorCounter,
10395
serverPanicsCounters,
10496
cadenceBlockHeight,
10597
evmBlockHeight,
@@ -116,17 +108,16 @@ func NewCollector(logger zerolog.Logger) Collector {
116108
}
117109

118110
return &DefaultCollector{
119-
apiErrorsCounter: apiErrors,
120-
traceDownloadErrorCounter: traceDownloadErrorCounter,
121-
serverPanicsCounters: serverPanicsCounters,
122-
cadenceBlockHeight: cadenceBlockHeight,
123-
evmBlockHeight: evmBlockHeight,
124-
evmBlockIndexedCounter: evmBlockIndexedCounter,
125-
evmTxIndexedCounter: evmTxIndexedCounter,
126-
evmAccountCallCounters: evmAccountCallCounters,
127-
requestDurations: requestDurations,
128-
operatorBalance: operatorBalance,
129-
availableSigningkeys: availableSigningKeys,
111+
apiErrorsCounter: apiErrors,
112+
serverPanicsCounters: serverPanicsCounters,
113+
cadenceBlockHeight: cadenceBlockHeight,
114+
evmBlockHeight: evmBlockHeight,
115+
evmBlockIndexedCounter: evmBlockIndexedCounter,
116+
evmTxIndexedCounter: evmTxIndexedCounter,
117+
evmAccountCallCounters: evmAccountCallCounters,
118+
requestDurations: requestDurations,
119+
operatorBalance: operatorBalance,
120+
availableSigningkeys: availableSigningKeys,
130121
}
131122
}
132123

@@ -145,10 +136,6 @@ func (c *DefaultCollector) ApiErrorOccurred() {
145136
c.apiErrorsCounter.Inc()
146137
}
147138

148-
func (c *DefaultCollector) TraceDownloadFailed() {
149-
c.traceDownloadErrorCounter.Inc()
150-
}
151-
152139
func (c *DefaultCollector) ServerPanicked(reason string) {
153140
c.serverPanicsCounters.With(prometheus.Labels{"reason": reason}).Inc()
154141
}

metrics/nop.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var _ Collector = &nopCollector{}
1313
var NopCollector = &nopCollector{}
1414

1515
func (c *nopCollector) ApiErrorOccurred() {}
16-
func (c *nopCollector) TraceDownloadFailed() {}
1716
func (c *nopCollector) ServerPanicked(string) {}
1817
func (c *nopCollector) CadenceHeightIndexed(uint64) {}
1918
func (c *nopCollector) EVMHeightIndexed(uint64) {}

0 commit comments

Comments
 (0)