fix(rest): fix issues#2628 (#2629)

This commit is contained in:
chen quan
2022-11-23 22:50:08 +08:00
committed by GitHub
parent 95a5f64493
commit 97a8b3ade5
2 changed files with 11 additions and 11 deletions

View File

@@ -26,20 +26,17 @@ func TracingHandler(serviceName, path string) func(http.Handler) http.Handler {
tracer := otel.GetTracerProvider().Tracer(trace.TraceName)
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
defer func() {
next.ServeHTTP(w, r)
}()
ctx := propagator.Extract(r.Context(), propagation.HeaderCarrier(r.Header))
spanName := path
if len(spanName) == 0 {
spanName = r.URL.Path
}
if _, ok := notTracingSpans.Load(spanName); ok {
next.ServeHTTP(w, r)
return
}
ctx := propagator.Extract(r.Context(), propagation.HeaderCarrier(r.Header))
spanCtx, span := tracer.Start(
ctx,
spanName,
@@ -51,7 +48,7 @@ func TracingHandler(serviceName, path string) func(http.Handler) http.Handler {
// convenient for tracking error messages
propagator.Inject(spanCtx, propagation.HeaderCarrier(w.Header()))
r = r.WithContext(spanCtx)
next.ServeHTTP(w, r.WithContext(spanCtx))
})
}
}