update finding trace ID functionality, seems to result in some kind of deadlock though

Author: Fergus Dixon

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"
@@ -27,5 +27,6 @@ serde_json = "^1.0.95"
 tokio = { version = "^1.26.0", features = ["signal"], optional = true }
 tracing = "^0.1.37"
 tracing-opentelemetry = "^0.19.0"
+tracing-opentelemetry-instrumentation-sdk = "^0.12.0"
 tracing-serde = "^0.1.3"
 tracing-subscriber = { version = "^0.3.16", features = ["env-filter", "json"] }

src/formatter.rs

@@ -8,11 +8,12 @@
 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};
 use tracing_opentelemetry::OtelData;
+use tracing_opentelemetry_instrumentation_sdk::find_current_trace_id;
 use tracing_serde::fields::AsMap;
 use tracing_serde::AsSerde;
 use tracing_subscriber::fmt::format::Writer;
@@ -45,7 +46,10 @@ 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: TraceId::from_hex(
+            &*find_current_trace_id()
+                .unwrap_or(TraceId::INVALID.to_string()))
+            .unwrap_or(TraceId::INVALID).into(),
         span_id: o.builder.span_id.unwrap_or(SpanId::INVALID).into(),
     })
 }