Skip to content

Commit 45af3ae

Browse files
author
Han Kang
committed
refactor wrapped functions into variables
Change-Id: I1eec309c537920ba520c7a90f9a1f557ec53cf2c
1 parent 6b994af commit 45af3ae

File tree

1 file changed

+12
-24
lines changed
  • staging/src/k8s.io/component-base/metrics/legacyregistry

1 file changed

+12
-24
lines changed

staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ var (
2929
defaultRegistry = metrics.NewKubeRegistry()
3030
// DefaultGatherer exposes the global registry gatherer
3131
DefaultGatherer metrics.Gatherer = defaultRegistry
32+
// Reset calls reset on the global registry
33+
Reset = defaultRegistry.Reset
34+
// MustRegister registers registerable metrics but uses the global registry.
35+
MustRegister = defaultRegistry.MustRegister
36+
// RawMustRegister registers prometheus collectors but uses the global registry, this
37+
// bypasses the metric stability framework
38+
//
39+
// Deprecated
40+
RawMustRegister = defaultRegistry.RawMustRegister
41+
42+
// Register registers a collectable metric but uses the global registry
43+
Register = defaultRegistry.Register
3244
)
3345

3446
func init() {
@@ -54,25 +66,6 @@ func HandlerWithReset() http.Handler {
5466
metrics.HandlerWithReset(defaultRegistry, metrics.HandlerOpts{}))
5567
}
5668

57-
// Register registers a collectable metric but uses the global registry
58-
func Register(c metrics.Registerable) error {
59-
err := defaultRegistry.Register(c)
60-
return err
61-
}
62-
63-
// MustRegister registers registerable metrics but uses the global registry.
64-
func MustRegister(cs ...metrics.Registerable) {
65-
defaultRegistry.MustRegister(cs...)
66-
}
67-
68-
// RawMustRegister registers prometheus collectors but uses the global registry, this
69-
// bypasses the metric stability framework
70-
//
71-
// Deprecated
72-
func RawMustRegister(cs ...prometheus.Collector) {
73-
defaultRegistry.RawMustRegister(cs...)
74-
}
75-
7669
// CustomRegister registers a custom collector but uses the global registry.
7770
func CustomRegister(c metrics.StableCollector) error {
7871
err := defaultRegistry.CustomRegister(c)
@@ -91,8 +84,3 @@ func CustomMustRegister(cs ...metrics.StableCollector) {
9184
prometheus.MustRegister(c)
9285
}
9386
}
94-
95-
// Reset calls reset on the global registry
96-
func Reset() {
97-
defaultRegistry.Reset()
98-
}

0 commit comments

Comments
 (0)