github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83159 from RainbowMango/pr_remove_reference_to_prom_label

Browse Source 
Remove direct reference to prometheus.Label from metrics API.
This commit is contained in:
Kubernetes Prow Robot 2019-09-26 01:25:37 -07:00 committed by GitHub
commit be657f7462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/component-base/metrics/counter.go
View File

@ -139,7 +139,7 @@ func (v *CounterVec) WithLabelValues(lvs ...string) CounterMetric {
// must match those of the VariableLabels in Desc). If that label map is // must match those of the VariableLabels in Desc). If that label map is
// accessed for the first time, a new Counter is created IFF the counterVec has // accessed for the first time, a new Counter is created IFF the counterVec has
// been registered to a metrics registry. // been registered to a metrics registry.
func (v *CounterVec) With(labels prometheus.Labels) CounterMetric { func (v *CounterVec) With(labels map[string]string) CounterMetric {
if !v.IsCreated() { if !v.IsCreated() {
return noop // return no-op counter return noop // return no-op counter
} }
@ -153,7 +153,7 @@ func (v *CounterVec) With(labels prometheus.Labels) CounterMetric {
// with those of the VariableLabels in Desc. However, such inconsistent Labels // with those of the VariableLabels in Desc. However, such inconsistent Labels
// can never match an actual metric, so the method will always return false in // can never match an actual metric, so the method will always return false in
// that case. // that case.
func (v *CounterVec) Delete(labels prometheus.Labels) bool { func (v *CounterVec) Delete(labels map[string]string) bool {
if !v.IsCreated() { if !v.IsCreated() {
return false // since we haven't created the metric, we haven't deleted a metric with the passed in values return false // since we haven't created the metric, we haven't deleted a metric with the passed in values
} }

4
staging/src/k8s.io/component-base/metrics/gauge.go
View File

@ -138,7 +138,7 @@ func (v *GaugeVec) WithLabelValues(lvs ...string) GaugeMetric {
// must match those of the VariableLabels in Desc). If that label map is // must match those of the VariableLabels in Desc). If that label map is
// accessed for the first time, a new GaugeMetric is created IFF the gaugeVec has // accessed for the first time, a new GaugeMetric is created IFF the gaugeVec has
// been registered to a metrics registry. // been registered to a metrics registry.
func (v *GaugeVec) With(labels prometheus.Labels) GaugeMetric { func (v *GaugeVec) With(labels map[string]string) GaugeMetric {
if !v.IsCreated() { if !v.IsCreated() {
return noop // return no-op gauge return noop // return no-op gauge
} }
@ -152,7 +152,7 @@ func (v *GaugeVec) With(labels prometheus.Labels) GaugeMetric {
// with those of the VariableLabels in Desc. However, such inconsistent Labels // with those of the VariableLabels in Desc. However, such inconsistent Labels
// can never match an actual metric, so the method will always return false in // can never match an actual metric, so the method will always return false in
// that case. // that case.
func (v *GaugeVec) Delete(labels prometheus.Labels) bool { func (v *GaugeVec) Delete(labels map[string]string) bool {
if !v.IsCreated() { if !v.IsCreated() {
return false // since we haven't created the metric, we haven't deleted a metric with the passed in values return false // since we haven't created the metric, we haven't deleted a metric with the passed in values
} }

4
staging/src/k8s.io/component-base/metrics/histogram.go
View File

@ -146,7 +146,7 @@ func (v *HistogramVec) WithLabelValues(lvs ...string) ObserverMetric {
// must match those of the VariableLabels in Desc). If that label map is // must match those of the VariableLabels in Desc). If that label map is
// accessed for the first time, a new ObserverMetric is created IFF the HistogramVec has // accessed for the first time, a new ObserverMetric is created IFF the HistogramVec has
// been registered to a metrics registry. // been registered to a metrics registry.
func (v *HistogramVec) With(labels prometheus.Labels) ObserverMetric { func (v *HistogramVec) With(labels map[string]string) ObserverMetric {
if !v.IsCreated() { if !v.IsCreated() {
return noop return noop
} }
@ -160,7 +160,7 @@ func (v *HistogramVec) With(labels prometheus.Labels) ObserverMetric {
// with those of the VariableLabels in Desc. However, such inconsistent Labels // with those of the VariableLabels in Desc. However, such inconsistent Labels
// can never match an actual metric, so the method will always return false in // can never match an actual metric, so the method will always return false in
// that case. // that case.
func (v *HistogramVec) Delete(labels prometheus.Labels) bool { func (v *HistogramVec) Delete(labels map[string]string) bool {
if !v.IsCreated() { if !v.IsCreated() {
return false // since we haven't created the metric, we haven't deleted a metric with the passed in values return false // since we haven't created the metric, we haven't deleted a metric with the passed in values
} }

6
staging/src/k8s.io/component-base/metrics/opts.go
View File

@ -34,7 +34,7 @@ type KubeOpts struct {
Subsystem string Subsystem string
Name string Name string
Help string Help string
ConstLabels prometheus.Labels ConstLabels map[string]string
DeprecatedVersion string DeprecatedVersion string
deprecateOnce sync.Once deprecateOnce sync.Once
annotateOnce sync.Once annotateOnce sync.Once
@ -132,7 +132,7 @@ type HistogramOpts struct {
Subsystem string Subsystem string
Name string Name string
Help string Help string
ConstLabels prometheus.Labels ConstLabels map[string]string
Buckets []float64 Buckets []float64
DeprecatedVersion string DeprecatedVersion string
deprecateOnce sync.Once deprecateOnce sync.Once
@ -178,7 +178,7 @@ type SummaryOpts struct {
Subsystem string Subsystem string
Name string Name string
Help string Help string
ConstLabels prometheus.Labels ConstLabels map[string]string
Objectives map[float64]float64 Objectives map[float64]float64
MaxAge time.Duration MaxAge time.Duration
AgeBuckets uint32 AgeBuckets uint32

4
staging/src/k8s.io/component-base/metrics/summary.go
View File

@ -140,7 +140,7 @@ func (v *SummaryVec) WithLabelValues(lvs ...string) ObserverMetric {
// must match those of the VariableLabels in Desc). If that label map is // must match those of the VariableLabels in Desc). If that label map is
// accessed for the first time, a new ObserverMetric is created IFF the summaryVec has // accessed for the first time, a new ObserverMetric is created IFF the summaryVec has
// been registered to a metrics registry. // been registered to a metrics registry.
func (v *SummaryVec) With(labels prometheus.Labels) ObserverMetric { func (v *SummaryVec) With(labels map[string]string) ObserverMetric {
if !v.IsCreated() { if !v.IsCreated() {
return noop return noop
} }
@ -154,7 +154,7 @@ func (v *SummaryVec) With(labels prometheus.Labels) ObserverMetric {
// with those of the VariableLabels in Desc. However, such inconsistent Labels // with those of the VariableLabels in Desc. However, such inconsistent Labels
// can never match an actual metric, so the method will always return false in // can never match an actual metric, so the method will always return false in
// that case. // that case.
func (v *SummaryVec) Delete(labels prometheus.Labels) bool { func (v *SummaryVec) Delete(labels map[string]string) bool {
if !v.IsCreated() { if !v.IsCreated() {
return false // since we haven't created the metric, we haven't deleted a metric with the passed in values return false // since we haven't created the metric, we haven't deleted a metric with the passed in values
} }