Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

Commit 17a389d

Browse files
author
Ivan Vandot
authored
all: change metric names delimiter . to / (#2138) (#2139)
all: enable prometheus metrics endpoint
1 parent f878aed commit 17a389d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+819
-296
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,11 @@ The most common types of measurements we use in Swarm are `counters` and `resett
248248

249249
```go
250250
// incrementing a counter
251-
metrics.GetOrRegisterCounter("network.stream.received_chunks", nil).Inc(1)
251+
metrics.GetOrRegisterCounter("network/stream/received_chunks", nil).Inc(1)
252252

253253
// measuring latency with a resetting timer
254254
start := time.Now()
255-
t := metrics.GetOrRegisterResettingTimer("http.request.GET.time"), nil)
255+
t := metrics.GetOrRegisterResettingTimer("http/request/GET/time"), nil)
256256
...
257257
t := UpdateSince(start)
258258
```

‎api/api.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,30 @@ import (
5050
)
5151

5252
var (
53-
apiResolveCount = metrics.NewRegisteredCounter("api.resolve.count", nil)
54-
apiResolveFail = metrics.NewRegisteredCounter("api.resolve.fail", nil)
55-
apiGetCount = metrics.NewRegisteredCounter("api.get.count", nil)
56-
apiGetNotFound = metrics.NewRegisteredCounter("api.get.notfound", nil)
57-
apiGetHTTP300 = metrics.NewRegisteredCounter("api.get.http.300", nil)
58-
apiManifestUpdateCount = metrics.NewRegisteredCounter("api.manifestupdate.count", nil)
59-
apiManifestUpdateFail = metrics.NewRegisteredCounter("api.manifestupdate.fail", nil)
60-
apiManifestListCount = metrics.NewRegisteredCounter("api.manifestlist.count", nil)
61-
apiManifestListFail = metrics.NewRegisteredCounter("api.manifestlist.fail", nil)
62-
apiDeleteCount = metrics.NewRegisteredCounter("api.delete.count", nil)
63-
apiDeleteFail = metrics.NewRegisteredCounter("api.delete.fail", nil)
64-
apiGetTarCount = metrics.NewRegisteredCounter("api.gettar.count", nil)
65-
apiGetTarFail = metrics.NewRegisteredCounter("api.gettar.fail", nil)
66-
apiUploadTarCount = metrics.NewRegisteredCounter("api.uploadtar.count", nil)
67-
apiUploadTarFail = metrics.NewRegisteredCounter("api.uploadtar.fail", nil)
68-
apiModifyCount = metrics.NewRegisteredCounter("api.modify.count", nil)
69-
apiModifyFail = metrics.NewRegisteredCounter("api.modify.fail", nil)
70-
apiAddFileCount = metrics.NewRegisteredCounter("api.addfile.count", nil)
71-
apiAddFileFail = metrics.NewRegisteredCounter("api.addfile.fail", nil)
72-
apiRmFileCount = metrics.NewRegisteredCounter("api.removefile.count", nil)
73-
apiRmFileFail = metrics.NewRegisteredCounter("api.removefile.fail", nil)
74-
apiAppendFileCount = metrics.NewRegisteredCounter("api.appendfile.count", nil)
75-
apiAppendFileFail = metrics.NewRegisteredCounter("api.appendfile.fail", nil)
76-
apiGetInvalid = metrics.NewRegisteredCounter("api.get.invalid", nil)
53+
apiResolveCount = metrics.NewRegisteredCounter("api/resolve/count", nil)
54+
apiResolveFail = metrics.NewRegisteredCounter("api/resolve/fail", nil)
55+
apiGetCount = metrics.NewRegisteredCounter("api/get/count", nil)
56+
apiGetNotFound = metrics.NewRegisteredCounter("api/get/notfound", nil)
57+
apiGetHTTP300 = metrics.NewRegisteredCounter("api/get/http/300", nil)
58+
apiManifestUpdateCount = metrics.NewRegisteredCounter("api/manifestupdate/count", nil)
59+
apiManifestUpdateFail = metrics.NewRegisteredCounter("api/manifestupdate/fail", nil)
60+
apiManifestListCount = metrics.NewRegisteredCounter("api/manifestlist/count", nil)
61+
apiManifestListFail = metrics.NewRegisteredCounter("api/manifestlist/fail", nil)
62+
apiDeleteCount = metrics.NewRegisteredCounter("api/delete/count", nil)
63+
apiDeleteFail = metrics.NewRegisteredCounter("api/delete/fail", nil)
64+
apiGetTarCount = metrics.NewRegisteredCounter("api/gettar/count", nil)
65+
apiGetTarFail = metrics.NewRegisteredCounter("api/gettar/fail", nil)
66+
apiUploadTarCount = metrics.NewRegisteredCounter("api/uploadtar/count", nil)
67+
apiUploadTarFail = metrics.NewRegisteredCounter("api/uploadtar/fail", nil)
68+
apiModifyCount = metrics.NewRegisteredCounter("api/modify/count", nil)
69+
apiModifyFail = metrics.NewRegisteredCounter("api/modify/fail", nil)
70+
apiAddFileCount = metrics.NewRegisteredCounter("api/addfile/count", nil)
71+
apiAddFileFail = metrics.NewRegisteredCounter("api/addfile/fail", nil)
72+
apiRmFileCount = metrics.NewRegisteredCounter("api/removefile/count", nil)
73+
apiRmFileFail = metrics.NewRegisteredCounter("api/removefile/fail", nil)
74+
apiAppendFileCount = metrics.NewRegisteredCounter("api/appendfile/count", nil)
75+
apiAppendFileFail = metrics.NewRegisteredCounter("api/appendfile/fail", nil)
76+
apiGetInvalid = metrics.NewRegisteredCounter("api/get/invalid", nil)
7777
)
7878

7979
// ResolverFunc is function which takes a domain in the form of a string and resolves it to a content hash

‎api/client/client.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -826,51 +826,51 @@ func GetClientTrace(traceMsg, metricPrefix, ruid string, tn *time.Time) *httptra
826826
trace := &httptrace.ClientTrace{
827827
GetConn: func(_ string) {
828828
log.Trace(traceMsg+" - http get", "event", "GetConn", "ruid", ruid)
829-
metrics.GetOrRegisterResettingTimer(metricPrefix+".getconn", nil).Update(time.Since(*tn))
829+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/getconn", nil).Update(time.Since(*tn))
830830
},
831831
GotConn: func(_ httptrace.GotConnInfo) {
832832
log.Trace(traceMsg+" - http get", "event", "GotConn", "ruid", ruid)
833-
metrics.GetOrRegisterResettingTimer(metricPrefix+".gotconn", nil).Update(time.Since(*tn))
833+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/gotconn", nil).Update(time.Since(*tn))
834834
},
835835
PutIdleConn: func(err error) {
836836
log.Trace(traceMsg+" - http get", "event", "PutIdleConn", "ruid", ruid, "err", err)
837-
metrics.GetOrRegisterResettingTimer(metricPrefix+".putidle", nil).Update(time.Since(*tn))
837+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/putidle", nil).Update(time.Since(*tn))
838838
},
839839
GotFirstResponseByte: func() {
840840
log.Trace(traceMsg+" - http get", "event", "GotFirstResponseByte", "ruid", ruid)
841-
metrics.GetOrRegisterResettingTimer(metricPrefix+".firstbyte", nil).Update(time.Since(*tn))
841+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/firstbyte", nil).Update(time.Since(*tn))
842842
},
843843
Got100Continue: func() {
844844
log.Trace(traceMsg, "event", "Got100Continue", "ruid", ruid)
845-
metrics.GetOrRegisterResettingTimer(metricPrefix+".got100continue", nil).Update(time.Since(*tn))
845+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/got100continue", nil).Update(time.Since(*tn))
846846
},
847847
DNSStart: func(_ httptrace.DNSStartInfo) {
848848
log.Trace(traceMsg, "event", "DNSStart", "ruid", ruid)
849-
metrics.GetOrRegisterResettingTimer(metricPrefix+".dnsstart", nil).Update(time.Since(*tn))
849+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/dnsstart", nil).Update(time.Since(*tn))
850850
},
851851
DNSDone: func(_ httptrace.DNSDoneInfo) {
852852
log.Trace(traceMsg, "event", "DNSDone", "ruid", ruid)
853-
metrics.GetOrRegisterResettingTimer(metricPrefix+".dnsdone", nil).Update(time.Since(*tn))
853+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/dnsdone", nil).Update(time.Since(*tn))
854854
},
855855
ConnectStart: func(network, addr string) {
856856
log.Trace(traceMsg, "event", "ConnectStart", "ruid", ruid, "network", network, "addr", addr)
857-
metrics.GetOrRegisterResettingTimer(metricPrefix+".connectstart", nil).Update(time.Since(*tn))
857+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/connectstart", nil).Update(time.Since(*tn))
858858
},
859859
ConnectDone: func(network, addr string, err error) {
860860
log.Trace(traceMsg, "event", "ConnectDone", "ruid", ruid, "network", network, "addr", addr, "err", err)
861-
metrics.GetOrRegisterResettingTimer(metricPrefix+".connectdone", nil).Update(time.Since(*tn))
861+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/connectdone", nil).Update(time.Since(*tn))
862862
},
863863
WroteHeaders: func() {
864864
log.Trace(traceMsg, "event", "WroteHeaders(request)", "ruid", ruid)
865-
metrics.GetOrRegisterResettingTimer(metricPrefix+".wroteheaders", nil).Update(time.Since(*tn))
865+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/wroteheaders", nil).Update(time.Since(*tn))
866866
},
867867
Wait100Continue: func() {
868868
log.Trace(traceMsg, "event", "Wait100Continue", "ruid", ruid)
869-
metrics.GetOrRegisterResettingTimer(metricPrefix+".wait100continue", nil).Update(time.Since(*tn))
869+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/wait100continue", nil).Update(time.Since(*tn))
870870
},
871871
WroteRequest: func(_ httptrace.WroteRequestInfo) {
872872
log.Trace(traceMsg, "event", "WroteRequest", "ruid", ruid)
873-
metrics.GetOrRegisterResettingTimer(metricPrefix+".wroterequest", nil).Update(time.Since(*tn))
873+
metrics.GetOrRegisterResettingTimer(metricPrefix+"/wroterequest", nil).Update(time.Since(*tn))
874874
},
875875
}
876876
return trace

‎api/http/middleware.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type Adapter func(http.Handler) http.Handler
3535
func SetRequestID(h http.Handler) http.Handler {
3636
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
3737
r = r.WithContext(SetRUID(r.Context(), uuid.New()[:8]))
38-
metrics.GetOrRegisterCounter(fmt.Sprintf("http.request.%s", r.Method), nil).Inc(1)
38+
metrics.GetOrRegisterCounter(fmt.Sprintf("http/request/%s", r.Method), nil).Inc(1)
3939
log.Info("created ruid for request", "ruid", GetRUID(r.Context()), "method", r.Method, "url", r.RequestURI)
4040

4141
h.ServeHTTP(w, r)
@@ -92,8 +92,8 @@ func InitLoggingResponseWriter(h http.Handler) http.Handler {
9292

9393
ts := time.Since(tn)
9494
log.Info("request served", "ruid", GetRUID(r.Context()), "code", writer.statusCode, "time", ts)
95-
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("http.request.%s.time", r.Method), nil).Update(ts)
96-
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("http.request.%s.%d.time", r.Method, writer.statusCode), nil).Update(ts)
95+
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("http/request/%s/time", r.Method), nil).Update(ts)
96+
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("http/request/%s/%d/time", r.Method, writer.statusCode), nil).Update(ts)
9797
})
9898
}
9999

‎api/http/response.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
)
3131

3232
var (
33-
htmlCounter = metrics.NewRegisteredCounter("api.http.errorpage.html.count", nil)
34-
jsonCounter = metrics.NewRegisteredCounter("api.http.errorpage.json.count", nil)
35-
plaintextCounter = metrics.NewRegisteredCounter("api.http.errorpage.plaintext.count", nil)
33+
htmlCounter = metrics.NewRegisteredCounter("api/http/errorpage/html/count", nil)
34+
jsonCounter = metrics.NewRegisteredCounter("api/http/errorpage/json/count", nil)
35+
plaintextCounter = metrics.NewRegisteredCounter("api/http/errorpage/plaintext/count", nil)
3636
)
3737

3838
type ResponseParams struct {

‎api/http/server.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,28 @@ import (
5151
)
5252

5353
var (
54-
postRawCount = metrics.NewRegisteredCounter("api.http.post.raw.count", nil)
55-
postRawFail = metrics.NewRegisteredCounter("api.http.post.raw.fail", nil)
56-
postFilesCount = metrics.NewRegisteredCounter("api.http.post.files.count", nil)
57-
postFilesFail = metrics.NewRegisteredCounter("api.http.post.files.fail", nil)
58-
deleteCount = metrics.NewRegisteredCounter("api.http.delete.count", nil)
59-
deleteFail = metrics.NewRegisteredCounter("api.http.delete.fail", nil)
60-
getCount = metrics.NewRegisteredCounter("api.http.get.count", nil)
61-
getFail = metrics.NewRegisteredCounter("api.http.get.fail", nil)
62-
getFileCount = metrics.NewRegisteredCounter("api.http.get.file.count", nil)
63-
getFileNotFound = metrics.NewRegisteredCounter("api.http.get.file.notfound", nil)
64-
getFileFail = metrics.NewRegisteredCounter("api.http.get.file.fail", nil)
65-
getListCount = metrics.NewRegisteredCounter("api.http.get.list.count", nil)
66-
getListFail = metrics.NewRegisteredCounter("api.http.get.list.fail", nil)
67-
getTagCount = metrics.NewRegisteredCounter("api.http.get.tag.count", nil)
68-
getTagNotFound = metrics.NewRegisteredCounter("api.http.get.tag.notfound", nil)
69-
getTagFail = metrics.NewRegisteredCounter("api.http.get.tag.fail", nil)
70-
getPinCount = metrics.NewRegisteredCounter("api.http.get.pin.count", nil)
71-
getPinFail = metrics.NewRegisteredCounter("api.http.get.pin.fail", nil)
72-
postPinCount = metrics.NewRegisteredCounter("api.http.post.pin.count", nil)
73-
postPinFail = metrics.NewRegisteredCounter("api.http.post.pin.fail", nil)
74-
deletePinCount = metrics.NewRegisteredCounter("api.http.delete.pin.count", nil)
75-
deletePinFail = metrics.NewRegisteredCounter("api.http.delete.pin.fail", nil)
54+
postRawCount = metrics.NewRegisteredCounter("api/http/post/raw/count", nil)
55+
postRawFail = metrics.NewRegisteredCounter("api/http/post/raw/fail", nil)
56+
postFilesCount = metrics.NewRegisteredCounter("api/http/post/files/count", nil)
57+
postFilesFail = metrics.NewRegisteredCounter("api/http/post/files/fail", nil)
58+
deleteCount = metrics.NewRegisteredCounter("api/http/delete/count", nil)
59+
deleteFail = metrics.NewRegisteredCounter("api/http/delete/fail", nil)
60+
getCount = metrics.NewRegisteredCounter("api/http/get/count", nil)
61+
getFail = metrics.NewRegisteredCounter("api/http/get/fail", nil)
62+
getFileCount = metrics.NewRegisteredCounter("api/http/get/file/count", nil)
63+
getFileNotFound = metrics.NewRegisteredCounter("api/http/get/file/notfound", nil)
64+
getFileFail = metrics.NewRegisteredCounter("api/http/get/file/fail", nil)
65+
getListCount = metrics.NewRegisteredCounter("api/http/get/list/count", nil)
66+
getListFail = metrics.NewRegisteredCounter("api/http/get/list/fail", nil)
67+
getTagCount = metrics.NewRegisteredCounter("api/http/get/tag/count", nil)
68+
getTagNotFound = metrics.NewRegisteredCounter("api/http/get/tag/notfound", nil)
69+
getTagFail = metrics.NewRegisteredCounter("api/http/get/tag/fail", nil)
70+
getPinCount = metrics.NewRegisteredCounter("api/http/get/pin/count", nil)
71+
getPinFail = metrics.NewRegisteredCounter("api/http/get/pin/fail", nil)
72+
postPinCount = metrics.NewRegisteredCounter("api/http/post/pin/count", nil)
73+
postPinFail = metrics.NewRegisteredCounter("api/http/post/pin/fail", nil)
74+
deletePinCount = metrics.NewRegisteredCounter("api/http/delete/pin/count", nil)
75+
deletePinFail = metrics.NewRegisteredCounter("api/http/delete/pin/fail", nil)
7676
)
7777

7878
const (

‎cmd/swarm-smoke-pss/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/ethereum/go-ethereum/cmd/utils"
2525
gethmetrics "github.com/ethereum/go-ethereum/metrics"
26-
"github.com/ethereum/go-ethereum/metrics/influxdb"
26+
"github.com/ethersphere/swarm/metrics/influxdb"
2727

2828
"github.com/ethersphere/swarm/internal/flags"
2929
"github.com/ethersphere/swarm/log"

‎cmd/swarm-smoke-pss/pss.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ func runCheck(mode pssMode, count int, msgSizeBytes int) error {
147147
successCount = int64(sc)
148148
failCount = int64(count - sc)
149149

150-
metrics.GetOrRegisterCounter(fmt.Sprintf("pss.%s.msgs.fail", mode), nil).Inc(failCount)
151-
metrics.GetOrRegisterCounter(fmt.Sprintf("pss.%s.msgs.success", mode), nil).Inc(successCount)
150+
metrics.GetOrRegisterCounter(fmt.Sprintf("pss/%s/msgs/fail", mode), nil).Inc(failCount)
151+
metrics.GetOrRegisterCounter(fmt.Sprintf("pss/%s/msgs/success", mode), nil).Inc(successCount)
152152

153153
totalTime := time.Since(t)
154154

155-
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("pss.%s.total-time", mode), nil).Update(totalTime)
155+
metrics.GetOrRegisterResettingTimer(fmt.Sprintf("pss/%s/total-time", mode), nil).Update(totalTime)
156156
log.Info(fmt.Sprintf("pss.%s test ended", mode), "time", totalTime, "success", successCount, "failures", failCount)
157157

158158
if failCount > 0 {
@@ -165,11 +165,11 @@ func runCheck(mode pssMode, count int, msgSizeBytes int) error {
165165
select {
166166
case err := <-errC:
167167
if err != nil {
168-
metrics.GetOrRegisterCounter(fmt.Sprintf("pss.%s.fail", mode), nil).Inc(1)
168+
metrics.GetOrRegisterCounter(fmt.Sprintf("pss/%s/fail", mode), nil).Inc(1)
169169
}
170170
return err
171171
case <-time.After(time.Duration(timeout) * time.Second):
172-
metrics.GetOrRegisterCounter(fmt.Sprintf("pss.%s.timeout", mode), nil).Inc(1)
172+
metrics.GetOrRegisterCounter(fmt.Sprintf("pss/%s/timeout", mode), nil).Inc(1)
173173
return fmt.Errorf("timeout after %v sec", timeout)
174174
}
175175

‎cmd/swarm-smoke-pss/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func wrapCliCommand(name string, command func(*cli.Context) error) func(*cli.Con
5555
defer func(now time.Time) {
5656
totalTime := time.Since(now)
5757
log.Info("total time", "time", totalTime)
58-
metrics.GetOrRegisterResettingTimer(name+".total-time", nil).Update(totalTime)
58+
metrics.GetOrRegisterResettingTimer(name+"/total-time", nil).Update(totalTime)
5959
}(time.Now())
6060

6161
log.Info("pss smoke test starting", "task", name, "timeout", timeout)

‎cmd/swarm-smoke/feed_upload_and_sync.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func feedUploadAndSyncCmd(ctx *cli.Context) error {
3636
select {
3737
case err := <-errc:
3838
if err != nil {
39-
metrics.GetOrRegisterCounter(fmt.Sprintf("%s.fail", commandName), nil).Inc(1)
39+
metrics.GetOrRegisterCounter(fmt.Sprintf("%s/fail", commandName), nil).Inc(1)
4040
}
4141
return err
4242
case <-time.After(time.Duration(timeout) * time.Second):
43-
metrics.GetOrRegisterCounter(fmt.Sprintf("%s.timeout", commandName), nil).Inc(1)
43+
metrics.GetOrRegisterCounter(fmt.Sprintf("%s/timeout", commandName), nil).Inc(1)
4444

4545
return fmt.Errorf("timeout after %v sec", timeout)
4646
}

‎cmd/swarm-smoke/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/ethereum/go-ethereum/cmd/utils"
2525
gethmetrics "github.com/ethereum/go-ethereum/metrics"
26-
"github.com/ethereum/go-ethereum/metrics/influxdb"
2726
cliflags "github.com/ethersphere/swarm/internal/flags"
27+
"github.com/ethersphere/swarm/metrics/influxdb"
2828
"github.com/ethersphere/swarm/tracing"
2929

3030
"github.com/ethereum/go-ethereum/log"

‎cmd/swarm-smoke/sliding_window.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func slidingWindowCmd(ctx *cli.Context) error {
4444

4545
err := <-errc
4646
if err != nil {
47-
metrics.GetOrRegisterCounter(fmt.Sprintf("%s.fail", commandName), nil).Inc(1)
47+
metrics.GetOrRegisterCounter(fmt.Sprintf("%s/fail", commandName), nil).Inc(1)
4848
}
4949
return err
5050
}
@@ -72,8 +72,8 @@ outer:
7272
return err
7373
}
7474

75-
metrics.GetOrRegisterResettingTimer("sliding-window.upload-time", nil).UpdateSince(t1)
76-
metrics.GetOrRegisterGauge("sliding-window.upload-depth", nil).Update(int64(len(hashes)))
75+
metrics.GetOrRegisterResettingTimer("sliding-window/upload-time", nil).UpdateSince(t1)
76+
metrics.GetOrRegisterGauge("sliding-window/upload-depth", nil).Update(int64(len(hashes)))
7777

7878
fhash, err := digest(bytes.NewReader(randomBytes))
7979
if err != nil {
@@ -118,7 +118,7 @@ outer:
118118
}
119119
done = true
120120
}
121-
metrics.GetOrRegisterResettingTimer("sliding-window.single.fetch-time", nil).UpdateSince(start)
121+
metrics.GetOrRegisterResettingTimer("sliding-window/single/fetch-time", nil).UpdateSince(start)
122122
d <- struct{}{}
123123
}()
124124
case <-d:
@@ -127,14 +127,14 @@ outer:
127127
case <-timeoutC:
128128
errored = true
129129
log.Error("error retrieving hash. timeout", "hash idx", i)
130-
metrics.GetOrRegisterCounter("sliding-window.single.error", nil).Inc(1)
130+
metrics.GetOrRegisterCounter("sliding-window/single/error", nil).Inc(1)
131131
break outer
132132
default:
133133
}
134134
}
135135

136136
networkDepth = i
137-
metrics.GetOrRegisterGauge("sliding-window.network-depth", nil).Update(int64(networkDepth))
137+
metrics.GetOrRegisterGauge("sliding-window/network-depth", nil).Update(int64(networkDepth))
138138
log.Info("sliding window test successfully fetched file", "currentDepth", networkDepth)
139139
// this test might take a long time to finish - but we'd like to see metrics while they accumulate and not just when
140140
// the test finishes. therefore emit the metrics on each iteration

0 commit comments

Comments
 (0)