restore original, make new private

metrics/counter.go

@@ -7,7 +7,7 @@ import (
 // GetOrRegisterCounter returns an existing Counter or constructs and registers
 // a new Counter.
 func GetOrRegisterCounter(name string, r Registry) *Counter {
-	return GetOrRegister(name, NewCounter, r)
+	return getOrRegister(name, NewCounter, r)
 }
 
 // NewCounter constructs a new Counter.

metrics/counter_float64.go

@@ -8,7 +8,7 @@ import (
 // GetOrRegisterCounterFloat64 returns an existing *CounterFloat64 or constructs and registers
 // a new CounterFloat64.
 func GetOrRegisterCounterFloat64(name string, r Registry) *CounterFloat64 {
-	return GetOrRegister(name, NewCounterFloat64, r)
+	return getOrRegister(name, NewCounterFloat64, r)
 }
 
 // NewCounterFloat64 constructs a new CounterFloat64.

metrics/gauge.go

@@ -11,7 +11,7 @@ func (g GaugeSnapshot) Value() int64 { return int64(g) }
 // GetOrRegisterGauge returns an existing Gauge or constructs and registers a
 // new Gauge.
 func GetOrRegisterGauge(name string, r Registry) *Gauge {
-	return GetOrRegister(name, NewGauge, r)
+	return getOrRegister(name, NewGauge, r)
 }
 
 // NewGauge constructs a new Gauge.

metrics/gauge_float64.go

@@ -8,7 +8,7 @@ import (
 // GetOrRegisterGaugeFloat64 returns an existing GaugeFloat64 or constructs and registers a
 // new GaugeFloat64.
 func GetOrRegisterGaugeFloat64(name string, r Registry) *GaugeFloat64 {
-	return GetOrRegister(name, NewGaugeFloat64, r)
+	return getOrRegister(name, NewGaugeFloat64, r)
 }
 
 // GaugeFloat64Snapshot is a read-only copy of a GaugeFloat64.

metrics/gauge_info.go

@@ -16,7 +16,7 @@ func (val GaugeInfoValue) String() string {
 // GetOrRegisterGaugeInfo returns an existing GaugeInfo or constructs and registers a
 // new GaugeInfo.
 func GetOrRegisterGaugeInfo(name string, r Registry) *GaugeInfo {
-	return GetOrRegister(name, NewGaugeInfo, r)
+	return getOrRegister(name, NewGaugeInfo, r)
 }
 
 // NewGaugeInfo constructs a new GaugeInfo.

metrics/histogram.go

@@ -23,13 +23,13 @@ type Histogram interface {
 // GetOrRegisterHistogram returns an existing Histogram or constructs and
 // registers a new StandardHistogram.
 func GetOrRegisterHistogram(name string, r Registry, s Sample) Histogram {
-	return GetOrRegister(name, func() Histogram { return NewHistogram(s) }, r).(Histogram)
+	return getOrRegister(name, func() Histogram { return NewHistogram(s) }, r)
 }
 
 // GetOrRegisterHistogramLazy returns an existing Histogram or constructs and
 // registers a new StandardHistogram.
 func GetOrRegisterHistogramLazy(name string, r Registry, s func() Sample) Histogram {
-	return GetOrRegister(name, func() Histogram { return NewHistogram(s()) }, r).(Histogram)
+	return getOrRegister(name, func() Histogram { return NewHistogram(s()) }, r)
 }
 
 // NewHistogram constructs a new StandardHistogram from a Sample.

metrics/meter.go

@@ -12,7 +12,7 @@ import (
 // Be sure to unregister the meter from the registry once it is of no use to
 // allow for garbage collection.
 func GetOrRegisterMeter(name string, r Registry) *Meter {
-	return GetOrRegister(name, NewMeter, r)
+	return getOrRegister(name, NewMeter, r)
 }
 
 // NewMeter constructs a new Meter and launches a goroutine.

metrics/registry.go

@@ -327,7 +327,11 @@ func Get(name string) interface{} {
 
 // GetOrRegister gets an existing metric or creates and registers a new one. Threadsafe
 // alternative to calling Get and Register on failure.
-func GetOrRegister[T any](name string, ctor func() T, r Registry) T {
+func GetOrRegister(name string, i func() interface{}) interface{} {
+	return DefaultRegistry.GetOrRegister(name, i)
+}
+
+func getOrRegister[T any](name string, ctor func() T, r Registry) T {
 	if r == nil {
 		r = DefaultRegistry
 	}

metrics/registry_test.go

@@ -30,7 +30,7 @@ func benchmarkRegistryGetOrRegisterParallel(b *testing.B, amount int) {
 		wg.Add(1)
 		go func() {
 			for i := 0; i < b.N; i++ {
-				GetOrRegister("foo", NewMeter, r)
+				GetOrRegisterMeter("foo", r)
 			}
 			wg.Done()
 		}()
@@ -98,8 +98,8 @@ func TestRegistryGetOrRegister(t *testing.T) {
 	r := NewRegistry()
 
 	// First metric wins with GetOrRegister
-	c1 := GetOrRegister("foo", NewCounter, r)
+	c1 := GetOrRegisterCounter("foo", r)
-	c2 := GetOrRegister("foo", NewCounter, r)
+	c2 := GetOrRegisterCounter("foo", r)
 	if c1 != c2 {
 		t.Fatal("counters should've matched")
 	}
@@ -123,8 +123,8 @@ func TestRegistryGetOrRegisterWithLazyInstantiation(t *testing.T) {
 	r := NewRegistry()
 
 	// First metric wins with GetOrRegister
-	c1 := GetOrRegister("foo", NewCounter, r)
+	c1 := GetOrRegisterCounter("foo", r)
-	c2 := GetOrRegister("foo", NewCounter, r)
+	c2 := GetOrRegisterCounter("foo", r)
 	if c1 != c2 {
 		t.Fatal("counters should've matched")
 	}
@@ -165,7 +165,7 @@ func TestPrefixedChildRegistryGetOrRegister(t *testing.T) {
 	r := NewRegistry()
 	pr := NewPrefixedChildRegistry(r, "prefix.")
 
-	_ = GetOrRegister("foo", NewCounter, pr)
+	_ = GetOrRegisterCounter("foo", pr)
 
 	i := 0
 	r.Each(func(name string, m interface{}) {
@@ -182,7 +182,7 @@ func TestPrefixedChildRegistryGetOrRegister(t *testing.T) {
 func TestPrefixedRegistryGetOrRegister(t *testing.T) {
 	r := NewPrefixedRegistry("prefix.")
 
-	_ = GetOrRegister("foo", NewCounter, r)
+	_ = GetOrRegisterCounter("foo", r)
 
 	i := 0
 	r.Each(func(name string, m interface{}) {

metrics/resetting_timer.go

@@ -8,7 +8,7 @@ import (
 // GetOrRegisterResettingTimer returns an existing ResettingTimer or constructs and registers a
 // new ResettingTimer.
 func GetOrRegisterResettingTimer(name string, r Registry) *ResettingTimer {
-	return GetOrRegister(name, NewResettingTimer, r)
+	return getOrRegister(name, NewResettingTimer, r)
 }
 
 // NewRegisteredResettingTimer constructs and registers a new ResettingTimer.

metrics/runtimehistogram.go

@@ -9,7 +9,7 @@ import (
 
 func getOrRegisterRuntimeHistogram(name string, scale float64, r Registry) *runtimeHistogram {
 	constructor := func() Histogram { return newRuntimeHistogram(scale) }
-	return GetOrRegister(name, constructor, r).(*runtimeHistogram)
+	return getOrRegister(name, constructor, r).(*runtimeHistogram)
 }
 
 // runtimeHistogram wraps a runtime/metrics histogram.

metrics/timer.go

@@ -10,7 +10,7 @@ import (
 // Be sure to unregister the meter from the registry once it is of no use to
 // allow for garbage collection.
 func GetOrRegisterTimer(name string, r Registry) *Timer {
-	return GetOrRegister(name, NewTimer, r)
+	return getOrRegister(name, NewTimer, r)
 }
 
 // NewCustomTimer constructs a new Timer from a Histogram and a Meter.