fix: trace_id extraction for logs

will-bank · Feb 10, 2024 · 141290a · 141290a
1 parent 5b433d0
commit 141290a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/formatter.rs b/src/formatter.rs
@@ -45,9 +45,16 @@ fn lookup_trace_info<S>(span_ref: &SpanRef<S>) -> Option<TraceInfo>
     where
         S: Subscriber + for<'a> LookupSpan<'a>,
 {
-    span_ref.extensions().get::<OtelData>().map(|o| TraceInfo {
-        trace_id: o.parent_cx.span().span_context().trace_id().into(),
-        span_id: o.builder.span_id.unwrap_or(SpanId::INVALID).into(),
+    span_ref.extensions().get::<OtelData>().map(|o| {
+        let trace_id = if o.parent_cx.has_active_span() {
+            o.parent_cx.span().span_context().trace_id()
+        } else {
+            o.builder.trace_id.unwrap_or(TraceId::INVALID)
+        };
+        TraceInfo {
+            trace_id: trace_id.into(),
+            span_id: o.builder.span_id.unwrap_or(SpanId::INVALID).into(),
+        }
     })
 }