openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-17 12:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make turn spans explicit tracing parents

Browse Source 
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
nicholasclark-openai
2026-03-24 11:29:22 -07:00
parent dc0b2cafbc
commit 7e0c8c06d0
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
codex-rs/core/src/tasks/mod.rs
View File

@@ -186,11 +186,12 @@ impl Session {
let ctx = Arc::clone(&turn_context);
let task_for_run = Arc::clone(&task);
let task_cancellation_token = cancellation_token.child_token();
// Task-owned turn spans keep a core-owned span open for the
// full task lifecycle after the submission dispatch span ends.
// Task-owned turn spans keep a core-owned parent span open for the
// full turn lifecycle after the submission dispatch span ends.
let task_span = info_span!(
"turn",
otel.name = span_name,
conversation.id = %self.conversation_id,
thread.id = %self.conversation_id,
turn.id = %turn_context.sub_id,
model = %turn_context.model_info.slug,

12
codex-rs/core/tests/suite/otel.rs
View File

@@ -747,7 +747,12 @@ async fn responses_request_span_records_turn_correlation_fields() {
lines
.iter()
.find(|line| {
line.contains("responses_http.request{")
line.contains("turn{otel.name=\"session_task.turn\"")
&& line.contains("conversation.id=")
&& line.contains("thread.id=")
&& line.contains("turn.id=")
&& line.contains("model=")
&& line.contains("responses_http.request{")
&& line.contains("otel.kind=\"client\"")
&& line.contains("transport=\"responses_http\"")
&& line.contains("conversation.id=")
@@ -756,7 +761,10 @@ async fn responses_request_span_records_turn_correlation_fields() {
})
.map(|_| Ok(()))
.unwrap_or_else(|| {
Err("missing responses_http.request span with correlation fields".to_string())
Err(
"missing responses_http.request span nested under session_task.turn"
.to_string(),
)
})
});
}

11
codex-rs/core/tests/suite/rmcp_client.rs
View File

@@ -194,7 +194,12 @@ async fn stdio_server_round_trip() -> anyhow::Result<()> {
lines
.iter()
.find(|line| {
line.contains("mcp.tools.call{")
line.contains("turn{otel.name=\"session_task.turn\"")
&& line.contains("conversation.id=")
&& line.contains("thread.id=")
&& line.contains("turn.id=")
&& line.contains("model=")
&& line.contains("mcp.tools.call{")
&& line.contains("otel.kind=\"client\"")
&& line.contains("rpc.system=\"jsonrpc\"")
&& line.contains("rpc.method=\"tools/call\"")
@@ -205,7 +210,9 @@ async fn stdio_server_round_trip() -> anyhow::Result<()> {
&& line.contains("turn.id=")
})
.map(|_| Ok(()))
.unwrap_or_else(|| Err("missing mcp.tools.call span with MCP fields".to_string()))
.unwrap_or_else(|| {
Err("missing mcp.tools.call span nested under session_task.turn".to_string())
})
});
server.verify().await;