From 7391a4d45ae3fa3edc59f20dca37f13f46285f97 Mon Sep 17 00:00:00 2001 From: will0306 Date: Mon, 11 Sep 2023 02:14:00 +0000 Subject: [PATCH] improve trace span generating for package gctx and http tracing content for package ghttp (#2937) --- net/ghttp/ghttp_middleware_tracing.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ghttp/ghttp_middleware_tracing.go b/net/ghttp/ghttp_middleware_tracing.go index 4f9852cda..98950fa94 100644 --- a/net/ghttp/ghttp_middleware_tracing.go +++ b/net/ghttp/ghttp_middleware_tracing.go @@ -36,6 +36,7 @@ const ( tracingEventHttpResponse = "http.response" tracingEventHttpResponseHeaders = "http.response.headers" tracingEventHttpResponseBody = "http.response.body" + tracingEventHttpRequestUrl = "http.request.url" tracingMiddlewareHandled gctx.StrKey = `MiddlewareServerTracingHandled` ) @@ -64,7 +65,7 @@ func internalMiddlewareServerTracing(r *Request) { ctx, propagation.HeaderCarrier(r.Header), ), - r.URL.String(), + r.URL.Path, trace.WithSpanKind(trace.SpanKindServer), ) defer span.End() @@ -90,6 +91,7 @@ func internalMiddlewareServerTracing(r *Request) { r.Body = utils.NewReadCloser(reqBodyContentBytes, false) span.AddEvent(tracingEventHttpRequest, trace.WithAttributes( + attribute.String(tracingEventHttpRequestUrl, r.URL.String()), attribute.String(tracingEventHttpRequestHeaders, gconv.String(httputil.HeaderToMap(r.Header))), attribute.String(tracingEventHttpRequestBaggage, gtrace.GetBaggageMap(ctx).String()), attribute.String(tracingEventHttpRequestBody, gstr.StrLimit(