Skip to content

fix: keep late mark spans in parent traces #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 2 commits into from
Jun 24, 2026
Merged

fix: keep late mark spans in parent traces #296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2188e3d
fix: keep late mark spans in parent traces
bbednarski9 Jun 24, 2026
080c520
fix: keep completed span context cache synchronized
bbednarski9 Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions crates/core/src/observability/openinference.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//! - [`OpenInferenceSubscriber`] exposes a NeMo Relay [`EventSubscriberFn`] and
//! convenience `register` / `deregister` / `force_flush` / `shutdown` methods

use std::collections::HashMap;
use std::collections::{HashMap, VecDeque};
use std::sync::{Arc, Mutex};
use std::time::{Duration, SystemTime, UNIX_EPOCH};

Expand Down Expand Up @@ -45,6 +45,8 @@ use opentelemetry_sdk::trace::{SdkTracer, SdkTracerProvider, Span};
use serde::Serialize;
use uuid::Uuid;

const COMPLETED_SPAN_CONTEXT_LIMIT: usize = 4096;

#[cfg(target_arch = "wasm32")]
use async_trait::async_trait;
#[cfg(target_arch = "wasm32")]
Expand Down Expand Up @@ -500,6 +502,8 @@ struct ActiveSpan {

struct OpenInferenceEventProcessor {
active_spans: HashMap<Uuid, ActiveSpan>,
completed_span_contexts: HashMap<Uuid, SpanContext>,
completed_span_order: VecDeque<Uuid>,
provider: SdkTracerProvider,
tracer: SdkTracer,
}
Expand All @@ -509,6 +513,8 @@ impl OpenInferenceEventProcessor {
let tracer = provider.tracer(instrumentation_scope);
Self {
active_spans: HashMap::new(),
completed_span_contexts: HashMap::new(),
completed_span_order: VecDeque::new(),
provider,
tracer,
}
Expand All @@ -535,6 +541,7 @@ impl OpenInferenceEventProcessor {
}

fn process_start(&mut self, event: &Event) {
self.completed_span_contexts.remove(&event.uuid());
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
let mut span = self
.tracer
.span_builder(span_name(event))
Expand All @@ -551,6 +558,7 @@ impl OpenInferenceEventProcessor {
let Some(mut active_span) = self.active_spans.remove(&event.uuid()) else {
return;
};
self.record_completed_span_context(event.uuid(), active_span.span_context.clone());
super::set_span_status_from_event_metadata(&mut active_span.span, event);
active_span.span.set_attributes(end_attributes(event));
active_span
Expand Down Expand Up @@ -587,10 +595,13 @@ impl OpenInferenceEventProcessor {
}

fn parent_context(&self, event: &Event) -> Context {
self.find_parent_span(event)
.map(|active_span| {
Context::new().with_remote_span_context(active_span.span_context.clone())
})
if let Some(active_span) = self.find_parent_span(event) {
return Context::new().with_remote_span_context(active_span.span_context.clone());
}
event
.parent_uuid()
.and_then(|uuid| self.completed_span_contexts.get(&uuid))
.map(|span_context| Context::new().with_remote_span_context(span_context.clone()))
.unwrap_or_default()
}

Expand All @@ -609,6 +620,21 @@ impl OpenInferenceEventProcessor {
self.parent_span_uuid(event)
.and_then(|uuid| self.active_spans.get_mut(&uuid))
}

fn record_completed_span_context(&mut self, uuid: Uuid, span_context: SpanContext) {
if self
.completed_span_contexts
.insert(uuid, span_context)
.is_none()
{
self.completed_span_order.push_back(uuid);
}
while self.completed_span_order.len() > COMPLETED_SPAN_CONTEXT_LIMIT {
if let Some(expired) = self.completed_span_order.pop_front() {
self.completed_span_contexts.remove(&expired);
}
}
}
}

fn span_kind(event: &Event) -> SpanKind {
Expand Down
36 changes: 31 additions & 5 deletions crates/core/src/observability/otel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//! - [`OpenTelemetrySubscriber`] exposes a NeMo Relay [`EventSubscriberFn`] and
//! convenience `register` / `deregister` / `force_flush` / `shutdown` methods

use std::collections::HashMap;
use std::collections::{HashMap, VecDeque};
use std::sync::{Arc, Mutex};
use std::time::{Duration, SystemTime, UNIX_EPOCH};

Expand All @@ -39,6 +39,8 @@ use opentelemetry_sdk::trace::{SdkTracer, SdkTracerProvider, Span};
use serde::Serialize;
use uuid::Uuid;

const COMPLETED_SPAN_CONTEXT_LIMIT: usize = 4096;

#[cfg(target_arch = "wasm32")]
use async_trait::async_trait;
#[cfg(target_arch = "wasm32")]
Expand Down Expand Up @@ -494,6 +496,8 @@ struct ActiveSpan {

struct OtelEventProcessor {
active_spans: HashMap<Uuid, ActiveSpan>,
completed_span_contexts: HashMap<Uuid, SpanContext>,
completed_span_order: VecDeque<Uuid>,
provider: SdkTracerProvider,
tracer: SdkTracer,
}
Expand All @@ -503,6 +507,8 @@ impl OtelEventProcessor {
let tracer = provider.tracer(instrumentation_scope);
Self {
active_spans: HashMap::new(),
completed_span_contexts: HashMap::new(),
completed_span_order: VecDeque::new(),
provider,
tracer,
}
Expand All @@ -529,6 +535,7 @@ impl OtelEventProcessor {
}

fn process_start(&mut self, event: &Event) {
self.completed_span_contexts.remove(&event.uuid());
Comment thread
bbednarski9 marked this conversation as resolved.
Resolved
let mut span = self
.tracer
.span_builder(span_name(event))
Expand All @@ -545,6 +552,7 @@ impl OtelEventProcessor {
let Some(mut active_span) = self.active_spans.remove(&event.uuid()) else {
return;
};
self.record_completed_span_context(event.uuid(), active_span.span_context.clone());

super::set_span_status_from_event_metadata(&mut active_span.span, event);
active_span.span.set_attributes(end_attributes(event));
Expand Down Expand Up @@ -578,10 +586,13 @@ impl OtelEventProcessor {
}

fn parent_context(&self, event: &Event) -> Context {
self.find_parent_span(event)
.map(|active_span| {
Context::new().with_remote_span_context(active_span.span_context.clone())
})
if let Some(active_span) = self.find_parent_span(event) {
return Context::new().with_remote_span_context(active_span.span_context.clone());
}
event
.parent_uuid()
.and_then(|uuid| self.completed_span_contexts.get(&uuid))
Comment thread
bbednarski9 marked this conversation as resolved.
Resolved
.map(|span_context| Context::new().with_remote_span_context(span_context.clone()))
.unwrap_or_default()
}

Expand All @@ -600,6 +611,21 @@ impl OtelEventProcessor {
self.parent_span_uuid(event)
.and_then(|uuid| self.active_spans.get_mut(&uuid))
}

fn record_completed_span_context(&mut self, uuid: Uuid, span_context: SpanContext) {
if self
.completed_span_contexts
.insert(uuid, span_context)
.is_none()
{
self.completed_span_order.push_back(uuid);
}
while self.completed_span_order.len() > COMPLETED_SPAN_CONTEXT_LIMIT {
if let Some(expired) = self.completed_span_order.pop_front() {
self.completed_span_contexts.remove(&expired);
}
}
}
}

fn span_kind(event: &Event) -> SpanKind {
Expand Down
57 changes: 57 additions & 0 deletions crates/core/tests/unit/observability/openinference_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,63 @@ fn orphan_marks_become_zero_duration_spans() {
);
}

#[test]
fn late_parented_marks_reuse_completed_parent_trace_context() {
let (provider, exporter) = make_provider();
let mut processor =
OpenInferenceEventProcessor::new(provider.clone(), "test-scope".to_string());
let tool_uuid = Uuid::now_v7();

processor.process(&make_start_event(
tool_uuid,
None,
"terminal",
ScopeType::Tool,
None,
));
processor.process(&make_end_event(
tool_uuid,
None,
"terminal",
ScopeType::Tool,
Some(json!({"status": "done"})),
));
processor.process(&make_mark_event(
Some(tool_uuid),
"visor.tool_output_compressed",
Some(json!({"estimated_tokens_saved": 42})),
));
processor.force_flush().unwrap();

let spans = exporter.get_finished_spans().unwrap();
assert_eq!(spans.len(), 2);
let tool_span = spans
.iter()
.find(|span| span.name.as_ref() == "terminal")
.unwrap();
let mark_span = spans
.iter()
.find(|span| span.name.as_ref() == "mark:visor.tool_output_compressed")
.unwrap();

assert_eq!(
mark_span.span_context.trace_id(),
tool_span.span_context.trace_id()
);
assert_eq!(mark_span.parent_span_id, tool_span.span_context.span_id());
assert!(!mark_span.parent_span_is_remote);

let attributes = attr_map(&mark_span.attributes);
assert_eq!(
attributes.get("nemo_relay.mark.orphan"),
Some(&"true".to_string())
);
assert_eq!(
attributes.get("openinference.span.kind"),
Some(&"CHAIN".to_string())
);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

#[test]
fn semantic_scope_type_and_input_value_follow_event_variants() {
let llm_with_content = make_start_event(
Expand Down
52 changes: 52 additions & 0 deletions crates/core/tests/unit/observability/otel_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,58 @@ fn orphan_marks_become_zero_duration_spans() {
);
}

#[test]
fn late_parented_marks_reuse_completed_parent_trace_context() {
let (provider, exporter) = make_provider();
let mut processor = OtelEventProcessor::new(provider.clone(), "test-scope".to_string());
let tool_uuid = Uuid::now_v7();

processor.process(&make_start_event(
tool_uuid,
None,
"terminal",
ScopeType::Tool,
None,
));
processor.process(&make_end_event(
tool_uuid,
None,
"terminal",
ScopeType::Tool,
Some(json!({"status": "done"})),
));
processor.process(&make_mark_event(
Some(tool_uuid),
"visor.tool_output_compressed",
Some(json!({"estimated_tokens_saved": 42})),
));
processor.force_flush().unwrap();

let spans = exporter.get_finished_spans().unwrap();
assert_eq!(spans.len(), 2);
let tool_span = spans
.iter()
.find(|span| span.name.as_ref() == "terminal")
.unwrap();
let mark_span = spans
.iter()
.find(|span| span.name.as_ref() == "mark:visor.tool_output_compressed")
.unwrap();

assert_eq!(
mark_span.span_context.trace_id(),
tool_span.span_context.trace_id()
);
assert_eq!(mark_span.parent_span_id, tool_span.span_context.span_id());
assert!(!mark_span.parent_span_is_remote);

let attributes = attr_map(&mark_span.attributes);
assert_eq!(
attributes.get("nemo_relay.mark.orphan"),
Some(&"true".to_string())
);
}
Comment thread
bbednarski9 marked this conversation as resolved.
Resolved

#[test]
fn semantic_scope_type_and_span_kind_follow_event_variants() {
let scope_event = make_start_event(
Expand Down
Loading