bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-06 21:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: otel tracing content contains invalid UTF-8 (#3340)

Browse Source
This commit is contained in:
施国鹏
2024-02-29 20:22:42 +08:00
committed by GitHub
parent c8a73f8c25
commit ce3ef13e6a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ghttp/ghttp_middleware_tracing.go
View File

@ -97,7 +97,7 @@ func internalMiddlewareServerTracing(r *Request) {
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(
attribute.String(tracingEventHttpRequestBody, gstr.StrLimitRune(
string(reqBodyContentBytes),
gtrace.MaxContentLogSize(),
"...",
@ -112,7 +112,7 @@ func internalMiddlewareServerTracing(r *Request) {
span.SetStatus(codes.Error, fmt.Sprintf(`%+v`, err))
}
// Response content logging.
var resBodyContent = gstr.StrLimit(r.Response.BufferString(), gtrace.MaxContentLogSize(), "...")
var resBodyContent = gstr.StrLimitRune(r.Response.BufferString(), gtrace.MaxContentLogSize(), "...")
if gzipAccepted(r.Response.Header()) {
reader, err := gzip.NewReader(strings.NewReader(r.Response.BufferString()))
if err != nil {
@ -123,7 +123,7 @@ func internalMiddlewareServerTracing(r *Request) {
if err != nil {
span.SetStatus(codes.Error, fmt.Sprintf(`get uncompress value err:%+v`, err))
}
resBodyContent = gstr.StrLimit(string(uncompressed), gtrace.MaxContentLogSize(), "...")
resBodyContent = gstr.StrLimitRune(string(uncompressed), gtrace.MaxContentLogSize(), "...")
}
span.AddEvent(tracingEventHttpResponse, trace.WithAttributes(