github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-02 16:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chen quan 2022-11-23 22:50:08 +08:00 committed by GitHub
parent 95a5f64493
commit 97a8b3ade5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rest/handler/tracinghandler.go
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))
})
}
}

13
rest/handler/tracinghandler_test.go
View File

@ -27,9 +27,9 @@ func TestOtelHandler(t *testing.T) {
t.Run(test, func(t *testing.T) {
h := chain.New(TracingHandler("foo", test)).Then(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ctx := otel.GetTextMapPropagator().Extract(r.Context(), propagation.HeaderCarrier(r.Header))
spanCtx := trace.SpanContextFromContext(ctx)
assert.True(t, spanCtx.IsValid())
span := trace.SpanFromContext(r.Context())
assert.True(t, span.SpanContext().IsValid())
assert.True(t, span.IsRecording())
}))
ts := httptest.NewServer(h)
defer ts.Close()
@ -52,7 +52,7 @@ func TestOtelHandler(t *testing.T) {
}
}
func TestDontTracingSpanName(t *testing.T) {
func TestDontTracingSpan(t *testing.T) {
ztrace.StartAgent(ztrace.Config{
Name: "go-zero-test",
Endpoint: "http://localhost:14268/api/traces",
@ -66,12 +66,15 @@ func TestDontTracingSpanName(t *testing.T) {
t.Run(test, func(t *testing.T) {
h := chain.New(TracingHandler("foo", test)).Then(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
spanCtx := trace.SpanContextFromContext(r.Context())
span := trace.SpanFromContext(r.Context())
spanCtx := span.SpanContext()
if test == "bar" {
assert.False(t, spanCtx.IsValid())
assert.False(t, span.IsRecording())
return
}
assert.True(t, span.IsRecording())
assert.True(t, spanCtx.IsValid())
}))
ts := httptest.NewServer(h)