Skip to content

fix(adk): let Google GenAI own LLM spans for ADK model calls #897

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
Abhijeet Prasad (AbhiPrasad) merged 2 commits into from
Oct 9, 2026
Merged

fix(adk): let Google GenAI own LLM spans for ADK model calls #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e93f4
fix(adk): let Google GenAI own LLM spans for ADK model calls
AbhiPrasad Oct 8, 2026
e80ebcc
test(adk): drop assertions Google GenAI now owns
AbhiPrasad Oct 9, 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
9 changes: 9 additions & 0 deletions py/src/braintrust/integrations/adk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ def setup_adk(
"""
Setup Braintrust integration with Google ADK. Will automatically patch Google ADK agents, runners, flows, and MCP tools for automatic tracing.

Also enables the Google GenAI integration, which ADK's Gemini models call
through. It owns the ``llm`` span and token usage for each Gemini request;
ADK's ``llm_call`` spans are ``task`` spans so usage is counted once. For
other ADK models (e.g. LiteLLM or Anthropic), enable that provider's
integration, or use ``braintrust.auto_instrument()``, to record usage.

If you prefer manual patching take a look at `wrap_agent`, `wrap_runner`, `wrap_workflow`, `wrap_flow`, and `wrap_mcp_tool`.

Args:
Expand All @@ -61,4 +67,7 @@ def setup_adk(
if span == NOOP_SPAN:
init_logger(project=project_name, api_key=api_key, project_id=project_id)

from braintrust.integrations.google_genai import GoogleGenAIIntegration

GoogleGenAIIntegration.setup()

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Avoid patching GenAI when ADK setup fails

When google-genai is installed but google-adk is absent or outside the supported version range, this call still globally patches Google GenAI before ADKIntegration.setup() returns False. A caller that uses the return value to treat ADK instrumentation as unavailable will therefore unexpectedly trace unrelated direct GenAI calls; enable the provider integration only after confirming that ADK setup succeeded.

Useful? React with 👍 / 👎.

return ADKIntegration.setup()
133 changes: 0 additions & 133 deletions py/src/braintrust/integrations/adk/cassettes/1.14.1/test_adk_usage_metadata_metrics.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading