feat: add CacheReadInputTokens and CacheWriteInputTokens to TokenUsageRecord #229
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ import ( | |
| "github.com/prometheus/client_golang/prometheus" | ||
| promtest "github.com/prometheus/client_golang/prometheus/testutil" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/tidwall/sjson" | ||
| ) | ||
|
|
||
| func TestMetrics_Interception(t *testing.T) { | ||
|
|
@@ -270,36 +271,104 @@ func TestMetrics_PromptCount(t *testing.T) { | |
| func TestMetrics_TokenUseCount(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| cases := []struct { | ||
| name string | ||
| fixture []byte | ||
| reqPath string | ||
| streaming bool | ||
| expectProvider string | ||
| expectModel string | ||
| expectedLabels map[string]float64 | ||
| }{ | ||
| { | ||
| name: "openai_responses", | ||
| fixture: fixtures.OaiResponsesBlockingCachedInputTokens, | ||
| reqPath: pathOpenAIResponses, | ||
| expectProvider: config.ProviderOpenAI, | ||
| expectModel: "gpt-4.1", | ||
| expectedLabels: map[string]float64{ | ||
| "input": 129, // 12033 - 11904 cached | ||
| "output": 44, | ||
| "cache_read_input_tokens": 11904, | ||
| "cache_write_input_tokens": 0, | ||
| "input_cached": 11904, | ||
| "output_reasoning": 0, | ||
| "total_tokens": 12077, | ||
| }, | ||
| }, | ||
| { | ||
| name: "anthropic_messages_streaming", | ||
| fixture: fixtures.AntSingleBuiltinTool, | ||
| reqPath: pathAnthropicMessages, | ||
| streaming: true, | ||
| expectProvider: config.ProviderAnthropic, | ||
| expectModel: "claude-sonnet-4-20250514", | ||
| expectedLabels: map[string]float64{ | ||
| "input": 2, | ||
| "output": 66, | ||
| "cache_read_input_tokens": 13993, | ||
| "cache_write_input_tokens": 22, | ||
| "cache_read_input": 13993, | ||
| "cache_creation_input": 22, | ||
| }, | ||
| }, | ||
| { | ||
| name: "openai_chat_completions", | ||
| fixture: fixtures.OaiChatSimple, | ||
| reqPath: pathOpenAIChatCompletions, | ||
| expectProvider: config.ProviderOpenAI, | ||
| expectModel: "gpt-4.1", | ||
| expectedLabels: map[string]float64{ | ||
| "input": 19, | ||
| "output": 200, | ||
| "cache_read_input_tokens": 0, | ||
| "cache_write_input_tokens": 0, | ||
| "prompt_cached": 0, | ||
| "completion_reasoning": 0, | ||
| "completion_accepted_prediction": 0, | ||
| "completion_rejected_prediction": 0, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range cases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| ctx, cancel := context.WithTimeout(t.Context(), time.Second*30) | ||
| t.Cleanup(cancel) | ||
|
|
||
| fix := fixtures.Parse(t, tc.fixture) | ||
| upstream := newMockUpstream(t, ctx, newFixtureResponse(fix)) | ||
|
|
||
| m := aibridge.NewMetrics(prometheus.NewRegistry()) | ||
| bridgeServer := newBridgeTestServer(t, ctx, upstream.URL, | ||
| withMetrics(m), | ||
| ) | ||
|
|
||
|
Comment on lines
-300
to
-302
Contributor
There was a problem hiding this comment. Do we have any grafana dashboards that use these labels?
Contributor
Author
There was a problem hiding this comment. Good question. I've summarized metric labels regarding cached tokens similar to how it is done in DB records but maybe I should keep both.
Contributor
Author
There was a problem hiding this comment. Reverted the removal of cached tokens from |
||
| reqBody := fix.Request() | ||
| if tc.streaming { | ||
| var err error | ||
| reqBody, err = sjson.SetBytes(reqBody, "stream", true) | ||
| require.NoError(t, err) | ||
| } | ||
| resp := bridgeServer.makeRequest(t, http.MethodPost, tc.reqPath, reqBody, nil) | ||
| require.Equal(t, http.StatusOK, resp.StatusCode) | ||
| _, _ = io.ReadAll(resp.Body) | ||
|
|
||
| // metrics are updated asynchronously | ||
| require.Eventually(t, func() bool { | ||
| return promtest.ToFloat64(m.TokenUseCount.WithLabelValues( | ||
| tc.expectProvider, tc.expectModel, "input", defaultActorID, string(aibridge.ClientUnknown))) > 0 | ||
| }, time.Second*10, time.Millisecond*50) | ||
|
|
||
| for label, expected := range tc.expectedLabels { | ||
| require.Equal(t, expected, promtest.ToFloat64(m.TokenUseCount.WithLabelValues( | ||
| tc.expectProvider, tc.expectModel, label, defaultActorID, string(aibridge.ClientUnknown), | ||
| )), "metric label %q mismatch", label) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestMetrics_NonInjectedToolUseCount(t *testing.T) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No
CacheWriteInputTokens?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OpenAI doesn't provide this information.