diff --git a/test/instrumentation/metric.go b/test/instrumentation/metric.go index 1b803006610..9f2721442da 100644 --- a/test/instrumentation/metric.go +++ b/test/instrumentation/metric.go @@ -53,6 +53,11 @@ type byFQName []metric func (ms byFQName) Len() int { return len(ms) } func (ms byFQName) Less(i, j int) bool { + if ms[i].StabilityLevel < ms[j].StabilityLevel { + return true + } else if ms[i].StabilityLevel > ms[j].StabilityLevel { + return false + } return ms[i].buildFQName() < ms[j].buildFQName() } func (ms byFQName) Swap(i, j int) { diff --git a/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go b/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go index 4b483bff2fc..cb998ad11ab 100644 --- a/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go +++ b/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go @@ -469,7 +469,7 @@ var ( Subsystem: KubeletSubsystem, Name: RunningContainersKey, Help: "Number of containers currently running", - StabilityLevel: metrics.ALPHA, + StabilityLevel: metrics.BETA, }, []string{"container_state"}, ) diff --git a/test/instrumentation/testdata/test-stable-metrics-list.yaml b/test/instrumentation/testdata/test-stable-metrics-list.yaml index da3466d4d9d..3682bab139c 100644 --- a/test/instrumentation/testdata/test-stable-metrics-list.yaml +++ b/test/instrumentation/testdata/test-stable-metrics-list.yaml @@ -125,14 +125,13 @@ type: Summary stabilityLevel: BETA maxAge: 120000000000 -- name: multiline +- name: running_containers subsystem: kubelet - help: Cumulative number of pod preemptions by preemption resource asdf asdf asdf - asdfas dfasdf - type: Counter - stabilityLevel: STABLE + help: Number of containers currently running + type: Gauge + stabilityLevel: BETA labels: - - preemption_signal + - container_state - name: runtime_operations_duration_seconds subsystem: kubelet help: Duration in seconds of runtime operations. Broken down by operation type. @@ -155,43 +154,6 @@ - 119.20928955078125 - 298.0232238769531 - 745.0580596923828 -- name: summary_metric_test - subsystem: kubelet - help: Cumulative number of device plugin registrations. Broken down by resource - name. - type: Summary - stabilityLevel: STABLE -- name: summary_vec_metric_test - subsystem: kubelet - help: Duration in seconds to serve a device plugin Allocation request. Broken down - by resource name. - type: Summary - stabilityLevel: STABLE - labels: - - resource_name - objectives: - 0.5: 0.5 - 0.75: 0.75 - ageBuckets: 5 - bufCap: 500 - maxAge: 600000000000 -- name: test_histogram_metric - subsystem: kubelet - help: Interval in seconds between relisting in PLEG. - type: Histogram - stabilityLevel: STABLE - buckets: - - 0.005 - - 0.01 - - 0.025 - - 0.05 - - 0.1 - - 0.25 - - 0.5 - - 1 - - 2.5 - - 5 - - 10 - name: priority_level_seat_utilization subsystem: subsystem namespace: namespace @@ -243,3 +205,48 @@ constLabels: phase: blah somestring: executing +- name: multiline + subsystem: kubelet + help: Cumulative number of pod preemptions by preemption resource asdf asdf asdf + asdfas dfasdf + type: Counter + stabilityLevel: STABLE + labels: + - preemption_signal +- name: summary_metric_test + subsystem: kubelet + help: Cumulative number of device plugin registrations. Broken down by resource + name. + type: Summary + stabilityLevel: STABLE +- name: summary_vec_metric_test + subsystem: kubelet + help: Duration in seconds to serve a device plugin Allocation request. Broken down + by resource name. + type: Summary + stabilityLevel: STABLE + labels: + - resource_name + objectives: + 0.5: 0.5 + 0.75: 0.75 + ageBuckets: 5 + bufCap: 500 + maxAge: 600000000000 +- name: test_histogram_metric + subsystem: kubelet + help: Interval in seconds between relisting in PLEG. + type: Histogram + stabilityLevel: STABLE + buckets: + - 0.005 + - 0.01 + - 0.025 + - 0.05 + - 0.1 + - 0.25 + - 0.5 + - 1 + - 2.5 + - 5 + - 10