From c0021734b6cca75b5c955303290d736a86e0b3ff Mon Sep 17 00:00:00 2001
From: Cameron <ccordes12@mail.bw.edu>
Date: Wed, 24 Dec 2025 10:17:14 -0500
Subject: [PATCH] Try fixing Otel span propogation

---
 src/main.rs     | 6 ++++--
 src/memories.rs | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b459f39..ddb24b3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -158,7 +158,8 @@ async fn get_file_metadata(
     let tracer = global_tracer();
     let context = extract_context_from_request(&request);
     let mut span = tracer.start_with_context("get_file_metadata", &context);
-    let span_context = opentelemetry::Context::current();
+    let span_context =
+        opentelemetry::Context::new().with_remote_span_context(span.span_context().clone());
 
     let full_path = is_valid_full_path(&app_state.base_path, &path.path, false);
 
@@ -206,7 +207,8 @@ async fn upload_image(
     let tracer = global_tracer();
     let context = extract_context_from_request(&request);
     let mut span = tracer.start_with_context("upload_image", &context);
-    let span_context = opentelemetry::Context::current();
+    let span_context =
+        opentelemetry::Context::new().with_remote_span_context(span.span_context().clone());
 
     let mut file_content: BytesMut = BytesMut::new();
     let mut file_name: Option<String> = None;
diff --git a/src/memories.rs b/src/memories.rs
index f9df485..b01c56a 100644
--- a/src/memories.rs
+++ b/src/memories.rs
@@ -6,7 +6,7 @@ use chrono::{
 };
 use log::{debug, trace, warn};
 use opentelemetry::KeyValue;
-use opentelemetry::trace::{Span, Status, Tracer};
+use opentelemetry::trace::{Span, Status, TraceContextExt, Tracer};
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
@@ -476,7 +476,8 @@ pub async fn list_memories(
     let tracer = global_tracer();
     let parent_context = extract_context_from_request(&request);
     let mut span = tracer.start_with_context("list_memories", &parent_context);
-    let span_context = opentelemetry::Context::current();
+    let span_context =
+        opentelemetry::Context::new().with_remote_span_context(span.span_context().clone());
 
     let span_mode = q.span.unwrap_or(MemoriesSpan::Day);
     let years_back: u32 = 15;