Skip to content

Commit 7c834a4

Browse files
include cached tokens in input tokens
1 parent dd9644c commit 7c834a4

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

‎sentry_sdk/integrations/boto3/_services/bedrock.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,25 @@ def get_response_attributes(
4545
return {}
4646

4747
usage = cast("ConverseResponseTypeDef", response)["usage"]
48+
49+
input_tokens = usage["inputTokens"]
4850
attributes: "Attributes" = {
49-
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS: usage["inputTokens"],
5051
SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS: usage["outputTokens"],
5152
SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS: usage["totalTokens"],
5253
}
5354

5455
cache_read_tokens = usage.get("cacheReadInputTokens")
5556
if cache_read_tokens is not None:
57+
input_tokens += cache_read_tokens
5658
attributes[SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHED] = cache_read_tokens
5759

5860
cache_write_tokens = usage.get("cacheWriteInputTokens")
5961
if cache_write_tokens is not None:
62+
input_tokens += cache_write_tokens
6063
attributes[SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE] = (
6164
cache_write_tokens
6265
)
6366

67+
attributes[SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] = input_tokens
68+
6469
return attributes

‎tests/integrations/boto3/test_bedrock.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ def test_converse(
7777
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
7878
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
7979
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
80-
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 10
8180
assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 20
8281
assert span["attributes"][SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS] == 30
8382
if BOTOCORE_VERSION < Version("1.37.24"):
83+
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 10
8484
return
85+
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 110
8586
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHED] == 80
8687
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE] == 20
8788
else:
@@ -99,11 +100,12 @@ def test_converse(
99100
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
100101
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
101102
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
102-
assert span["data"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 10
103103
assert span["data"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 20
104104
assert span["data"][SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS] == 30
105105
if BOTOCORE_VERSION < Version("1.37.24"):
106+
assert span["data"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 10
106107
return
108+
assert span["data"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 110
107109
assert span["data"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHED] == 80
108110
assert span["data"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE] == 20
109111

0 commit comments

Comments
 (0)