fix(observability): preserve inbound trace context
CI / Rust Checks (push) Failing after 9m30s
CI / UI Checks (push) Has been skipped
CI / Frontend E2E (push) Has been skipped
CI / Community Image Smoke (push) Has been skipped
CI / Deploy (push) Has been skipped

This commit is contained in:
2026-08-30 00:43:46 +03:00
parent c3188637b3
commit 501e0931c5
3 changed files with 62 additions and 7 deletions
@@ -154,17 +154,19 @@ impl<'a> MakeWriter<'a> for SharedLogWriter {
fn make_writer(&'a self) -> Self::Writer {
SharedLogGuard {
buffer: Arc::clone(&self.buffer),
pending: Vec::new(),
}
}
}
struct SharedLogGuard {
buffer: Arc<Mutex<Vec<u8>>>,
pending: Vec<u8>,
}
impl io::Write for SharedLogGuard {
fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
self.buffer.lock().unwrap().extend_from_slice(bytes);
self.pending.extend_from_slice(bytes);
Ok(bytes.len())
}
@@ -173,6 +175,24 @@ impl io::Write for SharedLogGuard {
}
}
impl Drop for SharedLogGuard {
fn drop(&mut self) {
self.buffer.lock().unwrap().extend_from_slice(&self.pending);
}
}
#[test]
fn shared_log_writer_publishes_complete_records_only() {
let writer = SharedLogWriter::default();
let mut guard = writer.make_writer();
io::Write::write_all(&mut guard, b"message").unwrap();
assert!(writer.output().is_empty());
io::Write::write_all(&mut guard, b" stage=\"fetch\"\n").unwrap();
drop(guard);
assert_eq!(writer.output(), "message stage=\"fetch\"\n");
}
#[derive(Clone, Debug)]
struct CapturingExporter(Arc<Mutex<Vec<SpanData>>>);
@@ -0,0 +1,39 @@
use admin_api::request_context::{TRACE_ID_HEADER, apply_request_context};
use axum::{Router, body::Body, http::Request, routing::get};
use opentelemetry::trace::TracerProvider as _;
use opentelemetry_sdk::trace::SdkTracerProvider;
use tower::ServiceExt;
use tracing_subscriber::layer::SubscriberExt;
#[tokio::test(flavor = "current_thread")]
async fn preserves_remote_trace_id_with_an_active_tracer_and_no_global_propagator() {
let provider = SdkTracerProvider::builder().build();
let tracer = provider.tracer("admin-request-context-parent-test");
let subscriber =
tracing_subscriber::registry().with(tracing_opentelemetry::layer().with_tracer(tracer));
let dispatch = tracing::Dispatch::new(subscriber);
let _dispatch_guard = tracing::dispatcher::set_default(&dispatch);
let app = Router::new()
.route("/probe", get(|| async { "ok" }))
.layer(axum::middleware::from_fn(apply_request_context));
let response = app
.oneshot(
Request::builder()
.uri("/probe")
.header(
"traceparent",
"00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
)
.body(Body::empty())
.unwrap(),
)
.await
.unwrap();
assert_eq!(
response.headers()[TRACE_ID_HEADER],
"0af7651916cd43dd8448eb211c80319c"
);
provider.shutdown().unwrap();
}