From bbae445d17241ff8fe98be509df27e02cec556aa Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Tue, 20 Jun 2023 14:34:44 +0800 Subject: [PATCH 1/2] fix metrics test with 1.16.0 prometheus client --- test/e2e_node/podresources_test.go | 1 + test/e2e_node/resource_metrics_test.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/podresources_test.go b/test/e2e_node/podresources_test.go index 24c60e0aac3..3d644868027 100644 --- a/test/e2e_node/podresources_test.go +++ b/test/e2e_node/podresources_test.go @@ -974,5 +974,6 @@ func timelessSampleAtLeast(lower interface{}) types.GomegaMatcher { "Metric": gstruct.Ignore(), "Value": gomega.BeNumerically(">=", lower), "Timestamp": gstruct.Ignore(), + "Histogram": gstruct.Ignore(), })) } diff --git a/test/e2e_node/resource_metrics_test.go b/test/e2e_node/resource_metrics_test.go index 4cdb74b4c6c..66d92ef62d1 100644 --- a/test/e2e_node/resource_metrics_test.go +++ b/test/e2e_node/resource_metrics_test.go @@ -161,5 +161,7 @@ func boundedSample(lower, upper interface{}) types.GomegaMatcher { gomega.BeTemporally(">=", time.Now().Add(-maxStatsAge)), // Now() is the test start time, not the match time, so permit a few extra minutes. gomega.BeTemporally("<", time.Now().Add(2*time.Minute))), - )})) + ), + "Histogram": gstruct.Ignore(), + })) } From 420fbd11e4471cf3da3c7dcaf5f63eff97d0b4d9 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Wed, 21 Jun 2023 09:38:05 +0800 Subject: [PATCH 2/2] ignore Histogram for prometheus client v1.16.0 --- test/e2e_node/cpu_manager_metrics_test.go | 1 + test/e2e_node/topology_manager_metrics_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/test/e2e_node/cpu_manager_metrics_test.go b/test/e2e_node/cpu_manager_metrics_test.go index 20f9b50e74f..0b246f4148d 100644 --- a/test/e2e_node/cpu_manager_metrics_test.go +++ b/test/e2e_node/cpu_manager_metrics_test.go @@ -201,5 +201,6 @@ func timelessSample(value interface{}) types.GomegaMatcher { "Metric": gstruct.Ignore(), "Value": gomega.BeNumerically("==", value), "Timestamp": gstruct.Ignore(), + "Histogram": gstruct.Ignore(), })) } diff --git a/test/e2e_node/topology_manager_metrics_test.go b/test/e2e_node/topology_manager_metrics_test.go index f62aef1cb30..8544d87d32a 100644 --- a/test/e2e_node/topology_manager_metrics_test.go +++ b/test/e2e_node/topology_manager_metrics_test.go @@ -174,5 +174,6 @@ func checkMetricValueGreaterThan(value interface{}) types.GomegaMatcher { "Metric": gstruct.Ignore(), "Value": gomega.BeNumerically(">", value), "Timestamp": gstruct.Ignore(), + "Histogram": gstruct.Ignore(), })) }