github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move automatic registration of meta-metrics to legacy registry

Browse Source 
Change-Id: I06608184db62b3e893efc0c0a42963f9ffaaf677
This commit is contained in:
Han Kang
2022-10-07 08:40:14 -07:00
parent 3cad84b347
commit e3a1d6c914
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ var (
func init() { func init() {
RawMustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})) RawMustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}))
RawMustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll))) RawMustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))
defaultRegistry.RegisterMetaMetrics()
} }
// Handler returns an HTTP handler for the DefaultGatherer. It is // Handler returns an HTTP handler for the DefaultGatherer. It is

7
staging/src/k8s.io/component-base/metrics/registry.go
View File

@@ -155,6 +155,8 @@ type KubeRegistry interface {
// Reset invokes the Reset() function on all items in the registry // Reset invokes the Reset() function on all items in the registry
// which are added as resettables. // which are added as resettables.
Reset() Reset()
// RegisterMetaMetrics registers metrics about the number of registered metrics.
RegisterMetaMetrics()
} }
// kubeRegistry is a wrapper around a prometheus registry-type object. Upon initialization // kubeRegistry is a wrapper around a prometheus registry-type object. Upon initialization
@@ -359,8 +361,11 @@ func newKubeRegistry(v apimachineryversion.Info) *kubeRegistry {
// NewKubeRegistry creates a new vanilla Registry // NewKubeRegistry creates a new vanilla Registry
func NewKubeRegistry() KubeRegistry { func NewKubeRegistry() KubeRegistry {
r := newKubeRegistry(BuildVersion()) r := newKubeRegistry(BuildVersion())
return r
}
func (r *kubeRegistry) RegisterMetaMetrics() {
r.MustRegister(registeredMetrics) r.MustRegister(registeredMetrics)
r.MustRegister(disabledMetricsTotal) r.MustRegister(disabledMetricsTotal)
r.MustRegister(hiddenMetricsTotal) r.MustRegister(hiddenMetricsTotal)
return r
} }