github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113494 from MikeSpreitzer/fix-nil-cast

Browse Source 
Handle nil case correctly in TimingHistogramVec::WithLabelValuesChecked
This commit is contained in:
Kubernetes Prow Robot 2022-11-04 01:46:14 -07:00 committed by GitHub
commit db1ee6091f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/component-base/metrics/timing_histogram.go
View File

@ -177,6 +177,9 @@ func (v *TimingHistogramVec) WithLabelValuesChecked(lvs ...string) (GaugeMetric,
v.LabelValueAllowLists.ConstrainToAllowedList(v.originalLabels, lvs)
}
ops, err := v.TimingHistogramVec.GetMetricWithLabelValues(lvs...)
if err != nil {
return noop, err
}
return ops.(GaugeMetric), err
}

43
staging/src/k8s.io/component-base/metrics/timing_histogram_test.go
View File

@ -440,3 +440,46 @@ func BenchmarkTimingHistogramVecEltFetched(b *testing.B) {
x = (x + i) % 60
}
}
func TestUnregisteredVec(t *testing.T) {
hv := NewTestableTimingHistogramVec(time.Now, &TimingHistogramOpts{
Namespace: "testns",
Subsystem: "testsubsys",
Name: "testhist",
Help: "Me",
Buckets: []float64{1, 2, 4, 8, 16},
InitialValue: 3,
},
[]string{"label1", "label2"})
gauge, err := hv.WithLabelValuesChecked("v1", "v2")
if gauge != noop {
t.Errorf("Expected noop but got %#+v", gauge)
}
if !ErrIsNotRegistered(err) {
t.Errorf("Expected errNotRegistered but got err=%v", err)
}
}
func TestBadValues(t *testing.T) {
hv := NewTestableTimingHistogramVec(time.Now, &TimingHistogramOpts{
Namespace: "testns",
Subsystem: "testsubsys",
Name: "testhist",
Help: "Me",
Buckets: []float64{1, 2, 4, 8, 16},
InitialValue: 3,
},
[]string{"label1", "label2"})
registry := NewKubeRegistry()
registry.MustRegister(hv)
gauge, err := hv.WithLabelValuesChecked("v1")
if gauge != noop {
t.Errorf("Expected noop but got %#+v", gauge)
}
if err == nil {
t.Error("Expected an error but got nil")
}
if ErrIsNotRegistered(err) {
t.Error("Expected an error other than errNotRegistered but got that one")
}
}