fix(adk): align Google usage token totals - #649
Merged
Conversation
ADK traces omitted tool-use prompt tokens from prompt totals and reasoning tokens from completion totals. Customers using Google Search or reasoning models therefore saw token breakdowns that disagreed with Google's reported total, making usage analysis and provider reconciliation misleading. Keep the normalized breakdown consistent with the provider total: prompt + tool-use prompt + candidates + thoughts = total Retain reasoning and tool-use details so customers can still inspect where the aggregate usage came from. Cover both supported ADK versions with real Google Search recordings.
Luca Forstner (lforst)
approved these changes
Aug 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
resolves https://linear.app/braintrustdata/issue/SDK-110/adk-align-google-usage-metadata-token-metrics
ADK traces omitted tool-use prompt tokens from prompt totals and reasoning tokens from completion totals. Customers using Google Search or reasoning models therefore saw token breakdowns that disagreed with Google's reported total, making usage analysis and provider reconciliation misleading.
Keep the normalized breakdown consistent with the provider total:
prompt + tool-use prompt + candidates + thoughts = total
Retain reasoning and tool-use details so customers can still inspect where the aggregate usage came from. Cover both supported ADK versions with real Google Search recordings.