Skip to content

Commit 3e896c8

Browse files
authored
ethdb/pebble: fix pebble metrics registration (ethereum#29699)
ethdb/pebble: use GetOrRegister instead of NewRegistered when creating metrics
1 parent 43cbcd7 commit 3e896c8

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

ethdb/pebble/pebble.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,19 @@ func New(file string, cache int, handles int, namespace string, readonly bool, e
240240
}
241241
db.db = innerDB
242242

243-
db.compTimeMeter = metrics.NewRegisteredMeter(namespace+"compact/time", nil)
244-
db.compReadMeter = metrics.NewRegisteredMeter(namespace+"compact/input", nil)
245-
db.compWriteMeter = metrics.NewRegisteredMeter(namespace+"compact/output", nil)
246-
db.diskSizeGauge = metrics.NewRegisteredGauge(namespace+"disk/size", nil)
247-
db.diskReadMeter = metrics.NewRegisteredMeter(namespace+"disk/read", nil)
248-
db.diskWriteMeter = metrics.NewRegisteredMeter(namespace+"disk/write", nil)
249-
db.writeDelayMeter = metrics.NewRegisteredMeter(namespace+"compact/writedelay/duration", nil)
250-
db.writeDelayNMeter = metrics.NewRegisteredMeter(namespace+"compact/writedelay/counter", nil)
251-
db.memCompGauge = metrics.NewRegisteredGauge(namespace+"compact/memory", nil)
252-
db.level0CompGauge = metrics.NewRegisteredGauge(namespace+"compact/level0", nil)
253-
db.nonlevel0CompGauge = metrics.NewRegisteredGauge(namespace+"compact/nonlevel0", nil)
254-
db.seekCompGauge = metrics.NewRegisteredGauge(namespace+"compact/seek", nil)
255-
db.manualMemAllocGauge = metrics.NewRegisteredGauge(namespace+"memory/manualalloc", nil)
243+
db.compTimeMeter = metrics.GetOrRegisterMeter(namespace+"compact/time", nil)
244+
db.compReadMeter = metrics.GetOrRegisterMeter(namespace+"compact/input", nil)
245+
db.compWriteMeter = metrics.GetOrRegisterMeter(namespace+"compact/output", nil)
246+
db.diskSizeGauge = metrics.GetOrRegisterGauge(namespace+"disk/size", nil)
247+
db.diskReadMeter = metrics.GetOrRegisterMeter(namespace+"disk/read", nil)
248+
db.diskWriteMeter = metrics.GetOrRegisterMeter(namespace+"disk/write", nil)
249+
db.writeDelayMeter = metrics.GetOrRegisterMeter(namespace+"compact/writedelay/duration", nil)
250+
db.writeDelayNMeter = metrics.GetOrRegisterMeter(namespace+"compact/writedelay/counter", nil)
251+
db.memCompGauge = metrics.GetOrRegisterGauge(namespace+"compact/memory", nil)
252+
db.level0CompGauge = metrics.GetOrRegisterGauge(namespace+"compact/level0", nil)
253+
db.nonlevel0CompGauge = metrics.GetOrRegisterGauge(namespace+"compact/nonlevel0", nil)
254+
db.seekCompGauge = metrics.GetOrRegisterGauge(namespace+"compact/seek", nil)
255+
db.manualMemAllocGauge = metrics.GetOrRegisterGauge(namespace+"memory/manualalloc", nil)
256256

257257
// Start up the metrics gathering and return
258258
go db.meter(metricsGatheringInterval, namespace)
@@ -543,7 +543,7 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
543543
for i, level := range stats.Levels {
544544
// Append metrics for additional layers
545545
if i >= len(d.levelsGauge) {
546-
d.levelsGauge = append(d.levelsGauge, metrics.NewRegisteredGauge(namespace+fmt.Sprintf("tables/level%v", i), nil))
546+
d.levelsGauge = append(d.levelsGauge, metrics.GetOrRegisterGauge(namespace+fmt.Sprintf("tables/level%v", i), nil))
547547
}
548548
d.levelsGauge[i].Update(level.NumFiles)
549549
}

0 commit comments

Comments
 (0)