From 3a1f656491f9c50fad16e737e311e94774d84f3f Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 13 Mar 2021 21:17:56 +0100 Subject: [PATCH 1/2] reset metrics on dockerhim unit tests --- pkg/kubelet/dockershim/network/plugins_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/kubelet/dockershim/network/plugins_test.go b/pkg/kubelet/dockershim/network/plugins_test.go index 3c01f787d6f..17e60a1e754 100644 --- a/pkg/kubelet/dockershim/network/plugins_test.go +++ b/pkg/kubelet/dockershim/network/plugins_test.go @@ -30,6 +30,7 @@ import ( func TestNetworkPluginManagerMetrics(t *testing.T) { metrics.Register() + defer legacyregistry.Reset() operation := "test_operation" recordOperation(operation, time.Now()) From b1a81d2fb8b4528172a8de6de01b53526b7b2277 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 13 Mar 2021 21:26:22 +0100 Subject: [PATCH 2/2] admission metrics reset metrics after tests --- .../pkg/admission/metrics/metrics_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go index a20ce389b7a..b5a07a37906 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" + "k8s.io/component-base/metrics/legacyregistry" ) var ( @@ -35,7 +36,8 @@ var ( ) func TestObserveAdmissionStep(t *testing.T) { - Metrics.reset() + defer Metrics.reset() + defer legacyregistry.Reset() handler := WithStepMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}) if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != nil { t.Errorf("Unexpected error in admit: %v", err) @@ -57,7 +59,8 @@ func TestObserveAdmissionStep(t *testing.T) { } func TestObserveAdmissionController(t *testing.T) { - Metrics.reset() + defer Metrics.reset() + defer legacyregistry.Reset() handler := WithControllerMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}, "a") if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != nil { t.Errorf("Unexpected error in admit: %v", err) @@ -78,7 +81,8 @@ func TestObserveAdmissionController(t *testing.T) { } func TestObserveWebhook(t *testing.T) { - Metrics.reset() + defer Metrics.reset() + defer legacyregistry.Reset() Metrics.ObserveWebhook(context.TODO(), 2*time.Second, false, attr, stepAdmit, "x") wantLabels := map[string]string{ "name": "x", @@ -121,8 +125,8 @@ func TestObserveWebhookRejection(t *testing.T) { } func TestWithMetrics(t *testing.T) { - Metrics.reset() - + defer Metrics.reset() + defer legacyregistry.Reset() type Test struct { name string ns string