tracing: Continue trace if it exists

pace · Dec 2, 2024 · 3dd7042 · 3dd7042
1 parent 3030e86
commit 3dd7042
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/maintenance/tracing/tracing.go b/maintenance/tracing/tracing.go
@@ -39,18 +39,25 @@ func (h *traceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ctx = sentry.SetHubOnContext(ctx, hub)
 	}
 
-	options := []sentry.SpanOption{
-		sentry.ContinueFromRequest(r),
-		sentry.WithOpName("http.server"),
-		sentry.WithTransactionSource(sentry.SourceURL),
-		sentry.WithSpanOrigin(sentry.SpanOriginStdLib),
-	}
+	var transaction *sentry.Span
+
+	transaction = sentry.TransactionFromContext(ctx)
+	if transaction != nil {
+		transaction = transaction.StartChild("http.server", sentry.WithDescription(getHTTPSpanName(r)))
+	} else {
+		options := []sentry.SpanOption{
+			sentry.ContinueFromRequest(r),
+			sentry.WithOpName("http.server"),
+			sentry.WithTransactionSource(sentry.SourceURL),
+			sentry.WithSpanOrigin(sentry.SpanOriginStdLib),
+		}
 
-	transaction := sentry.StartTransaction(ctx,
-		getHTTPSpanName(r),
-		options...,
-	)
-	transaction.SetData("http.request.method", r.Method)
+		transaction = sentry.StartTransaction(ctx,
+			getHTTPSpanName(r),
+			options...,
+		)
+		transaction.SetData("http.request.method", r.Method)
+	}
 
 	ww := mutil.WrapWriter(w)