diff --git a/metrics/counter.go b/metrics/counter.go index 0f373b0d92..eb8fa19259 100644 --- a/metrics/counter.go +++ b/metrics/counter.go @@ -10,7 +10,7 @@ func GetOrRegisterCounter(name string, r Registry) *Counter { if r == nil { r = DefaultRegistry } - return r.GetOrRegister(name, NewCounter).(*Counter) + return r.GetOrRegister(name, NewCounter()).(*Counter) } // NewCounter constructs a new Counter. diff --git a/metrics/counter_float64.go b/metrics/counter_float64.go index 91c4215c4d..bb25d64675 100644 --- a/metrics/counter_float64.go +++ b/metrics/counter_float64.go @@ -11,7 +11,7 @@ func GetOrRegisterCounterFloat64(name string, r Registry) *CounterFloat64 { if nil == r { r = DefaultRegistry } - return r.GetOrRegister(name, NewCounterFloat64).(*CounterFloat64) + return r.GetOrRegister(name, NewCounterFloat64()).(*CounterFloat64) } // NewCounterFloat64 constructs a new CounterFloat64. diff --git a/metrics/gauge.go b/metrics/gauge.go index ba7843e03b..599ea8c7f4 100644 --- a/metrics/gauge.go +++ b/metrics/gauge.go @@ -14,7 +14,7 @@ func GetOrRegisterGauge(name string, r Registry) *Gauge { if r == nil { r = DefaultRegistry } - return r.GetOrRegister(name, NewGauge).(*Gauge) + return r.GetOrRegister(name, NewGauge()).(*Gauge) } // NewGauge constructs a new Gauge. diff --git a/metrics/histogram.go b/metrics/histogram.go index 7c27bcc928..e81023b276 100644 --- a/metrics/histogram.go +++ b/metrics/histogram.go @@ -26,7 +26,7 @@ func GetOrRegisterHistogram(name string, r Registry, s Sample) Histogram { if nil == r { r = DefaultRegistry } - return r.GetOrRegister(name, func() Histogram { return NewHistogram(s) }).(Histogram) + return r.GetOrRegister(name, NewHistogram(s)).(Histogram) } // GetOrRegisterHistogramLazy returns an existing Histogram or constructs and @@ -35,7 +35,7 @@ func GetOrRegisterHistogramLazy(name string, r Registry, s func() Sample) Histog if nil == r { r = DefaultRegistry } - return r.GetOrRegister(name, func() Histogram { return NewHistogram(s()) }).(Histogram) + return r.GetOrRegister(name, NewHistogram(s())).(Histogram) } // NewHistogram constructs a new StandardHistogram from a Sample. diff --git a/metrics/meter.go b/metrics/meter.go index 197e5abbed..7bf66bf895 100644 --- a/metrics/meter.go +++ b/metrics/meter.go @@ -15,7 +15,7 @@ func GetOrRegisterMeter(name string, r Registry) *Meter { if r == nil { r = DefaultRegistry } - return r.GetOrRegister(name, NewMeter).(*Meter) + return r.GetOrRegister(name, NewMeter()).(*Meter) } // NewMeter constructs a new Meter and launches a goroutine. diff --git a/metrics/resetting_timer.go b/metrics/resetting_timer.go index 66458bdb91..ba567a89b1 100644 --- a/metrics/resetting_timer.go +++ b/metrics/resetting_timer.go @@ -11,7 +11,7 @@ func GetOrRegisterResettingTimer(name string, r Registry) *ResettingTimer { if nil == r { r = DefaultRegistry } - return r.GetOrRegister(name, NewResettingTimer).(*ResettingTimer) + return r.GetOrRegister(name, NewResettingTimer()).(*ResettingTimer) } // NewRegisteredResettingTimer constructs and registers a new ResettingTimer. diff --git a/metrics/runtimehistogram.go b/metrics/runtimehistogram.go index 92fcbcc281..ca0e01fb3a 100644 --- a/metrics/runtimehistogram.go +++ b/metrics/runtimehistogram.go @@ -11,8 +11,7 @@ func getOrRegisterRuntimeHistogram(name string, scale float64, r Registry) *runt if r == nil { r = DefaultRegistry } - constructor := func() Histogram { return newRuntimeHistogram(scale) } - return r.GetOrRegister(name, constructor).(*runtimeHistogram) + return r.GetOrRegister(name, newRuntimeHistogram(scale)).(*runtimeHistogram) } // runtimeHistogram wraps a runtime/metrics histogram. diff --git a/metrics/timer.go b/metrics/timer.go index 9df15c967a..93bd56107f 100644 --- a/metrics/timer.go +++ b/metrics/timer.go @@ -13,7 +13,7 @@ func GetOrRegisterTimer(name string, r Registry) *Timer { if nil == r { r = DefaultRegistry } - return r.GetOrRegister(name, NewTimer).(*Timer) + return r.GetOrRegister(name, NewTimer()).(*Timer) } // NewCustomTimer constructs a new Timer from a Histogram and a Meter.