Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(rest): fix issues#2628 #2629

Merged
merged 1 commit into from Nov 23, 2022
Merged

fix(rest): fix issues#2628 #2629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions rest/handler/tracinghandler.go
View file
Open in desktop
Expand Up @@ -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,
Expand All @@ -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 changes: 8 additions & 5 deletions rest/handler/tracinghandler_test.go
View file
Open in desktop
Expand Up @@ -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()
Expand All @@ -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",
Expand All @@ -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)
Expand Down