Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Make tool telemetry tag collection synchronous (#36168)

jifb445967cc0c3
diff --git a/codex-rs/core/src/tools/handlers/mcp.rs b/codex-rs/core/src/tools/handlers/mcp.rs
index 1ddb838b76..76124949f5 100644
--- a/codex-rs/core/src/tools/handlers/mcp.rs
+++ b/codex-rs/core/src/tools/handlers/mcp.rs
@@ -179,17 +179,12 @@ impl CoreToolRuntime for McpHandler {
}))
}
- fn telemetry_tags<'a>(
- &'a self,
- _invocation: &'a ToolInvocation,
- ) -> BoxFuture<'a, ToolTelemetryTags> {
- Box::pin(async {
- let mut tags = vec![("mcp_server", self.tool_info.server_name.clone())];
- if let Some(origin) = &self.tool_info.server_origin {
- tags.push(("mcp_server_origin", origin.clone()));
- }
- tags
- })
+ fn telemetry_tags(&self, _invocation: &ToolInvocation) -> ToolTelemetryTags {
+ let mut tags = vec![("mcp_server", self.tool_info.server_name.clone())];
+ if let Some(origin) = &self.tool_info.server_origin {
+ tags.push(("mcp_server_origin", origin.clone()));
+ }
+ tags
}
fn pre_tool_use_payload(&self, invocation: &ToolInvocation) -> Option<PreToolUsePayload> {
diff --git a/codex-rs/core/src/tools/registry.rs b/codex-rs/core/src/tools/registry.rs
index f5dddf0022..64b8e819d5 100644
--- a/codex-rs/core/src/tools/registry.rs
+++ b/codex-rs/core/src/tools/registry.rs
@@ -70,11 +70,8 @@ pub(crate) trait CoreToolRuntime: ToolExecutor<ToolInvocation> {
false
}
- fn telemetry_tags<'a>(
- &'a self,
- _invocation: &'a ToolInvocation,
- ) -> BoxFuture<'a, ToolTelemetryTags> {
- Box::pin(async { Vec::new() })
+ fn telemetry_tags(&self, _invocation: &ToolInvocation) -> ToolTelemetryTags {
+ Vec::new()
}
fn post_tool_use_payload(
@@ -322,10 +319,7 @@ impl CoreToolRuntime for ExposureOverride {
.with_updated_hook_input(invocation, updated_input)
}
- fn telemetry_tags<'a>(
- &'a self,
- invocation: &'a ToolInvocation,
- ) -> BoxFuture<'a, ToolTelemetryTags> {
+ fn telemetry_tags(&self, invocation: &ToolInvocation) -> ToolTelemetryTags {
self.handler.telemetry_tags(invocation)
}
@@ -552,7 +546,7 @@ impl ToolRegistry {
}
};
- let telemetry_tags = tool.telemetry_tags(&invocation).await;
+ let telemetry_tags = tool.telemetry_tags(&invocation);
let mut tool_result_tags =
Vec::with_capacity(base_tool_result_tags.len() + telemetry_tags.len() + 1);
let mut extra_trace_fields = Vec::new();