github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

refactor: update test setup order for testing metric label allow list

Browse Source 
This update covers the case that metrics are initialized before allow-metric-label flag is applied.
This commit is contained in:
yongruilin 2024-10-15 11:26:35 -07:00
parent 67f3128cb9
commit 22ba326f50
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/component-base/metrics/counter_test.go
View File

@ -245,7 +245,8 @@ func TestCounterWithLabelValueAllowList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
SetLabelAllowListFromCLI(labelAllowValues) labelValueAllowLists = map[string]*MetricLabelAllowList{}
registry := newKubeRegistry(apimachineryversion.Info{ registry := newKubeRegistry(apimachineryversion.Info{
Major: "1", Major: "1",
Minor: "15", Minor: "15",
@ -253,7 +254,7 @@ func TestCounterWithLabelValueAllowList(t *testing.T) {
}) })
c := NewCounterVec(opts, labels) c := NewCounterVec(opts, labels)
registry.MustRegister(c) registry.MustRegister(c)
SetLabelAllowListFromCLI(labelAllowValues)
for _, lv := range test.labelValues { for _, lv := range test.labelValues {
c.WithLabelValues(lv...).Inc() c.WithLabelValues(lv...).Inc()
} }

5
staging/src/k8s.io/component-base/metrics/gauge_test.go
View File

@ -305,7 +305,8 @@ func TestGaugeWithLabelValueAllowList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
SetLabelAllowListFromCLI(labelAllowValues) labelValueAllowLists = map[string]*MetricLabelAllowList{}
registry := newKubeRegistry(apimachineryversion.Info{ registry := newKubeRegistry(apimachineryversion.Info{
Major: "1", Major: "1",
Minor: "15", Minor: "15",
@ -313,7 +314,7 @@ func TestGaugeWithLabelValueAllowList(t *testing.T) {
}) })
g := NewGaugeVec(opts, labels) g := NewGaugeVec(opts, labels)
registry.MustRegister(g) registry.MustRegister(g)
SetLabelAllowListFromCLI(labelAllowValues)
for _, lv := range test.labelValues { for _, lv := range test.labelValues {
g.WithLabelValues(lv...).Set(100.0) g.WithLabelValues(lv...).Set(100.0)
} }

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

@ -271,7 +271,7 @@ func TestHistogramWithLabelValueAllowList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
SetLabelAllowListFromCLI(labelAllowValues) labelValueAllowLists = map[string]*MetricLabelAllowList{}
registry := newKubeRegistry(apimachineryversion.Info{ registry := newKubeRegistry(apimachineryversion.Info{
Major: "1", Major: "1",
Minor: "15", Minor: "15",
@ -279,6 +279,7 @@ func TestHistogramWithLabelValueAllowList(t *testing.T) {
}) })
c := NewHistogramVec(opts, labels) c := NewHistogramVec(opts, labels)
registry.MustRegister(c) registry.MustRegister(c)
SetLabelAllowListFromCLI(labelAllowValues)
for _, lv := range test.labelValues { for _, lv := range test.labelValues {
c.WithLabelValues(lv...).Observe(1.0) c.WithLabelValues(lv...).Observe(1.0)

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

@ -235,7 +235,7 @@ func TestSummaryWithLabelValueAllowList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
SetLabelAllowListFromCLI(labelAllowValues) labelValueAllowLists = map[string]*MetricLabelAllowList{}
registry := newKubeRegistry(apimachineryversion.Info{ registry := newKubeRegistry(apimachineryversion.Info{
Major: "1", Major: "1",
Minor: "15", Minor: "15",
@ -243,6 +243,7 @@ func TestSummaryWithLabelValueAllowList(t *testing.T) {
}) })
c := NewSummaryVec(opts, labels) c := NewSummaryVec(opts, labels)
registry.MustRegister(c) registry.MustRegister(c)
SetLabelAllowListFromCLI(labelAllowValues)
for _, lv := range test.labelValues { for _, lv := range test.labelValues {
c.WithLabelValues(lv...).Observe(1.0) c.WithLabelValues(lv...).Observe(1.0)

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

@ -313,7 +313,8 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
SetLabelAllowListFromCLI(labelAllowValues) labelValueAllowLists = map[string]*MetricLabelAllowList{}
registry := newKubeRegistry(apimachineryversion.Info{ registry := newKubeRegistry(apimachineryversion.Info{
Major: "1", Major: "1",
Minor: "15", Minor: "15",
@ -323,6 +324,7 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) {
clk := testclock.NewFakePassiveClock(t0) clk := testclock.NewFakePassiveClock(t0)
c := NewTestableTimingHistogramVec(clk.Now, opts, labels) c := NewTestableTimingHistogramVec(clk.Now, opts, labels)
registry.MustRegister(c) registry.MustRegister(c)
SetLabelAllowListFromCLI(labelAllowValues)
var v0 float64 = 13 var v0 float64 = 13
for _, lv := range test.labelValues { for _, lv := range test.labelValues {
c.WithLabelValues(lv...).Set(v0) c.WithLabelValues(lv...).Set(v0)