From 9f50740b7bcb41c81ec5b7939581b2bb10d641e4 Mon Sep 17 00:00:00 2001 From: Kevin Conner Date: Tue, 12 Nov 2024 12:43:53 -0800 Subject: [PATCH] Simplify span handling Co-authored-by: David Ashpole --- .../apiserver/pkg/endpoints/filterlatency/filterlatency.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency.go index 3967ab9b881..694ac8880d9 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency.go @@ -76,8 +76,8 @@ func trackStarted(handler http.Handler, tp trace.TracerProvider, name string, cl // This is a noop if the tracing is disabled, since tp will be a NoopTracerProvider tracer := tp.Tracer("k8s.op/apiserver/pkg/endpoints/filterlatency") return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - ctx, _ := tracer.Start(r.Context(), name) - defer trace.SpanFromContext(ctx).End() + ctx, span := tracer.Start(r.Context(), name) + defer span.End() if fr := requestFilterRecordFrom(ctx); fr != nil { fr.name = name fr.startedTimestamp = clock.Now()