Skip to content

fix(ingest): count TypeScript ADK's call_llm as the model call #1170

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
JeremyFunk merged 1 commit into from
Sep 30, 2026
Merged

fix(ingest): count TypeScript ADK's call_llm as the model call #1170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 27 additions & 5 deletions apps/ingest/src/ai_session/usage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,6 @@ fn is_model_call(vendor: &str, span: &Span, facts: &Facts) -> bool {
let span_name = span.name.as_str();
let op = facts.operation();
match vendor {
// `call_llm` wraps its `generate_content` child with the same figures.
"google_adk" if span_name == "call_llm" => false,
_ if INFERENCE_OPS.contains(&op) => true,
"litellm" => matches!(op, "acompletion" | "completion"),
"semantic_kernel" => matches!(op, "chat.completions" | "chat.streaming_completions"),
Expand Down Expand Up @@ -1001,9 +999,9 @@ mod tests {
);
}

/// `captures/docs_google-adk_a`: `call_llm` and its `generate_content`
/// child carry the same figures. ADK's AnthropicLlm passes the raw usage
/// through (SRC).
/// `captures/docs_google-adk_a`: Python ADK's `call_llm` and its
/// `generate_content` child carry the same figures, and only the child
/// names an operation. ADK's AnthropicLlm passes the raw usage through (SRC).
#[test]
fn google_adk_generate_content_owns_usage() {
let usage = [
Expand Down Expand Up @@ -1047,6 +1045,30 @@ mod tests {
);
}

/// PROD `verify2-adk-ts-synthetic`: TypeScript ADK has no `generate_content`
/// span, so the `call_llm` the Maple processor stamps `chat` is the call.
#[test]
fn google_adk_ts_call_llm_owns_usage() {
check(
"verify2-adk-ts-synthetic",
"gcp.vertex.agent",
"google_adk",
&[(
"call_llm",
&[
("gcp.vertex.agent.session_id", "verify2-adk-ts-synthetic-1"),
("gen_ai.operation.name", "chat"),
("gen_ai.provider.name", "gcp.gemini"),
("gen_ai.request.model", "gemini-2.5-flash"),
("gen_ai.usage.cache_read.input_tokens", "400"),
("gen_ai.usage.input_tokens", "1000"),
("gen_ai.usage.output_tokens", "100"),
],
Some([600, 400, 0, 100, 0]),
)],
);
}

/// `captures/docs_mastra_b` for the keys, PROD `blind-ts-mastra` for the
/// reasoning figure Maple used to drop.
#[test]
Expand Down
Loading