Only set the span parent ID if it is valid.

If there is no parent span ID, we something nonsensical, so we need to validate it. Yes, this is hilarious.
hasura · Nov 21, 2023 · ee5d0a8 · ee5d0a8
1 parent fb03873
commit ee5d0a8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/rust-connector-sdk/src/tracing.rs b/rust-connector-sdk/src/tracing.rs
@@ -68,6 +68,8 @@ pub fn init_tracing(
 // tracing crate requires all fields to be defined at creation time, so any fields that will be set
 // later should be defined as Empty
 pub fn make_span(request: &Request<Body>) -> Span {
+    use opentelemetry::trace::TraceContextExt;
+
     let span = tracing::info_span!(
         "request",
         method = %request.method(),
@@ -83,7 +85,13 @@ pub fn make_span(request: &Request<Body>) -> Span {
     let parent_context = global::get_text_map_propagator(|propagator| {
         propagator.extract(&HeaderExtractor(request.headers()))
     });
-    span.set_parent(parent_context);
+    // if there is no parent span ID, we something nonsensical, so we need to validate it
+    // (yes, this is hilarious)
+    let parent_context_span = parent_context.span();
+    let parent_context_span_context = parent_context_span.span_context();
+    if parent_context_span_context.is_valid() {
+        span.set_parent(parent_context);
+    }
 
     span
 }