Merge pull request #4 from Validus-Risk-Management/feature/update-trace-id-finder

update finding trace ID functionality

Author: fergusdixon

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ddtrace"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["David Steiner <david_j_steiner@yahoo.co.nz", "Fergus Strangways-Dixon <fergusdixon101@gmail.com>"]
 edition = "2021"
 license = "MIT"

src/formatter.rs

@@ -8,7 +8,7 @@
 use std::io;
 
 use chrono::Utc;
-use opentelemetry::trace::{SpanId, TraceContextExt, TraceId};
+use opentelemetry::trace::{SpanId, TraceId};
 use serde::ser::{SerializeMap, Serializer as _};
 use serde::Serialize;
 use tracing::{Event, Subscriber};
@@ -45,7 +45,7 @@ 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(),
+        trace_id: o.builder.trace_id.unwrap_or(TraceId::INVALID).into(),
         span_id: o.builder.span_id.unwrap_or(SpanId::INVALID).into(),
     })
 }