From 171b19d9fe1519355e0641012ef8d0115f90ed58 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Fri, 14 Jul 2023 16:06:47 +0800 Subject: [PATCH] fix histogram vec compare using ignore fields --- .../src/k8s.io/component-base/metrics/testutil/metrics_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go b/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go index c289b6a4902..2672fc0668d 100644 --- a/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go @@ -23,6 +23,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" dto "github.com/prometheus/client_model/go" "k8s.io/component-base/metrics" "k8s.io/utils/pointer" @@ -584,7 +585,7 @@ func TestGetHistogramVecFromGatherer(t *testing.T) { vec.WithLabelValues("value1-1", "value2-1").Observe(4.5) metricName := fmt.Sprintf("%s_%s_%s", HistogramOpts.Namespace, HistogramOpts.Subsystem, HistogramOpts.Name) histogramVec, _ := GetHistogramVecFromGatherer(gather, metricName, tt.lvMap) - if diff := cmp.Diff(tt.wantVec, histogramVec); diff != "" { + if diff := cmp.Diff(tt.wantVec, histogramVec, cmpopts.IgnoreFields(dto.Histogram{}, "state", "sizeCache", "unknownFields"), cmpopts.IgnoreFields(dto.Bucket{}, "state", "sizeCache", "unknownFields")); diff != "" { t.Errorf("Got unexpected HistogramVec (-want +got):\n%s", diff) } })