From 8daeb7fd29d33d056d403fede4b56482464a45f3 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Mon, 7 Jul 2025 11:36:34 -0400 Subject: [PATCH] PR feedback --- webhook/admission.go | 8 +++++--- webhook/conversion.go | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/webhook/admission.go b/webhook/admission.go index ea45702a5..1ad5a1ce0 100644 --- a/webhook/admission.go +++ b/webhook/admission.go @@ -101,15 +101,17 @@ func admissionHandler(wh *Webhook, c AdmissionController, synced <-chan struct{} labeler, _ := otelhttp.LabelerFromContext(r.Context()) defer func() { + // otelhttp doesn't add labeler attributes to spans + // so we have to do it manually span.SetAttributes(labeler.Get()...) }() var review admissionv1.AdmissionReview bodyBuffer := bytes.Buffer{} if err := json.NewDecoder(io.TeeReader(r.Body, &bodyBuffer)).Decode(&review); err != nil { - err := fmt.Sprint("could not decode body:", err) - span.SetStatus(codes.Error, err) - http.Error(w, err, http.StatusBadRequest) + msg := fmt.Sprint("could not decode body:", err) + span.SetStatus(codes.Error, msg) + http.Error(w, msg, http.StatusBadRequest) return } r.Body = io.NopCloser(&bodyBuffer) diff --git a/webhook/conversion.go b/webhook/conversion.go index a672d2311..5642a1a5f 100644 --- a/webhook/conversion.go +++ b/webhook/conversion.go @@ -56,22 +56,24 @@ func conversionHandler(wh *Webhook, c ConversionController) http.HandlerFunc { labeler, _ := otelhttp.LabelerFromContext(r.Context()) defer func() { + // otelhttp doesn't add labeler attributes to spans + // so we have to do it manually span.SetAttributes(labeler.Get()...) }() var review apixv1.ConversionReview if err := json.NewDecoder(r.Body).Decode(&review); err != nil { - err := fmt.Sprint("could not decode body:", err) - span.SetStatus(codes.Error, err) - http.Error(w, err, http.StatusBadRequest) + msg := fmt.Sprint("could not decode body:", err) + span.SetStatus(codes.Error, msg) + http.Error(w, msg, http.StatusBadRequest) return } gv, err := parseAPIVersion(review.Request.DesiredAPIVersion) if err != nil { - err := fmt.Sprint("could parse desired api version:", err) - span.SetStatus(codes.Error, err) - http.Error(w, err, http.StatusBadRequest) + msg := fmt.Sprint("could parse desired api version:", err) + span.SetStatus(codes.Error, msg) + http.Error(w, msg, http.StatusBadRequest) return }