From 81aa6a55bb5d2e5c31177f0d62608e92e9ae58bf Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 7 Feb 2024 09:22:09 +0100 Subject: [PATCH] Address vet issues found in Go 1.22 (#2907) Signed-off-by: Mikkel Oscar Lyderik Larsen --- cmd/webhook/admission/admission.go | 4 +++- proxy/longpoll_test.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/webhook/admission/admission.go b/cmd/webhook/admission/admission.go index 09d0c982b2..d952419b8a 100644 --- a/cmd/webhook/admission/admission.go +++ b/cmd/webhook/admission/admission.go @@ -120,7 +120,9 @@ func Handler(admitter admitter) http.HandlerFunc { } start := time.Now() - defer admissionDuration.With(labelValues).Observe(float64(time.Since(start)) / float64(time.Second)) + defer func() { + admissionDuration.With(labelValues).Observe(float64(time.Since(start)) / float64(time.Second)) + }() admResp, err := admitter.admit(request) if err != nil { diff --git a/proxy/longpoll_test.go b/proxy/longpoll_test.go index f5f8d9a80e..c7be2b6393 100644 --- a/proxy/longpoll_test.go +++ b/proxy/longpoll_test.go @@ -122,6 +122,7 @@ func cancelableRequest( ctx, cancel := stdlibcontext.WithCancel(stdlibcontext.Background()) req, err := http.NewRequestWithContext(ctx, method, url, body) if err != nil { + cancel() return nil, err }