Skip to content

Use span.data instead of measurements for token usage #4567

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
merged 1 commit into from
Jul 10, 2025
+58 −54
Merged

Use span.data instead of measurements for token usage #4567

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions sentry_sdk/ai/monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,19 @@ def record_token_usage(
ai_pipeline_name = get_ai_pipeline_name()
if ai_pipeline_name:
span.set_data(SPANDATA.AI_PIPELINE_NAME, ai_pipeline_name)

if prompt_tokens is not None:
span.set_measurement("ai_prompt_tokens_used", value=prompt_tokens)
span.set_data(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, prompt_tokens)

if completion_tokens is not None:
span.set_measurement("ai_completion_tokens_used", value=completion_tokens)
span.set_data(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, completion_tokens)

if (
total_tokens is None
and prompt_tokens is not None
and completion_tokens is not None
):
total_tokens = prompt_tokens + completion_tokens

if total_tokens is not None:
span.set_measurement("ai_total_tokens_used", total_tokens)
span.set_data(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, total_tokens)
46 changes: 23 additions & 23 deletions tests/integrations/anthropic/test_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ def test_nonstreaming_create_message(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 10
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.input_tokens"] == 10
assert span["data"]["gen_ai.usage.output_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30
assert span["data"][SPANDATA.AI_STREAMING] is False


Expand Down Expand Up @@ -193,9 +193,9 @@ async def test_nonstreaming_create_message_async(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 10
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.input_tokens"] == 10
assert span["data"]["gen_ai.usage.output_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30
assert span["data"][SPANDATA.AI_STREAMING] is False


Expand Down Expand Up @@ -293,9 +293,9 @@ def test_streaming_create_message(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 10
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 30
assert span["measurements"]["ai_total_tokens_used"]["value"] == 40
assert span["data"]["gen_ai.usage.input_tokens"] == 10
assert span["data"]["gen_ai.usage.output_tokens"] == 30
assert span["data"]["gen_ai.usage.total_tokens"] == 40
assert span["data"][SPANDATA.AI_STREAMING] is True


Expand Down Expand Up @@ -396,9 +396,9 @@ async def test_streaming_create_message_async(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 10
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 30
assert span["measurements"]["ai_total_tokens_used"]["value"] == 40
assert span["data"]["gen_ai.usage.input_tokens"] == 10
assert span["data"]["gen_ai.usage.output_tokens"] == 30
assert span["data"]["gen_ai.usage.total_tokens"] == 40
assert span["data"][SPANDATA.AI_STREAMING] is True


Expand Down Expand Up @@ -525,9 +525,9 @@ def test_streaming_create_message_with_input_json_delta(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 366
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 51
assert span["measurements"]["ai_total_tokens_used"]["value"] == 417
assert span["data"]["gen_ai.usage.input_tokens"] == 366
assert span["data"]["gen_ai.usage.output_tokens"] == 51
assert span["data"]["gen_ai.usage.total_tokens"] == 417
assert span["data"][SPANDATA.AI_STREAMING] is True


Expand Down Expand Up @@ -662,9 +662,9 @@ async def test_streaming_create_message_with_input_json_delta_async(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 366
assert span["measurements"]["ai_completion_tokens_used"]["value"] == 51
assert span["measurements"]["ai_total_tokens_used"]["value"] == 417
assert span["data"]["gen_ai.usage.input_tokens"] == 366
assert span["data"]["gen_ai.usage.output_tokens"] == 51
assert span["data"]["gen_ai.usage.total_tokens"] == 417
assert span["data"][SPANDATA.AI_STREAMING] is True


Expand Down Expand Up @@ -807,10 +807,10 @@ def test_add_ai_data_to_span_with_input_json_delta(sentry_init):
content_blocks=["{'test': 'data',", "'more': 'json'}"],
)

assert span._data.get(SPANDATA.AI_RESPONSES) == [
assert span._data.get("ai.responses") == [
{"type": "text", "text": "{'test': 'data','more': 'json'}"}
]
assert span._data.get(SPANDATA.AI_STREAMING) is True
assert span._measurements.get("ai_prompt_tokens_used")["value"] == 10
assert span._measurements.get("ai_completion_tokens_used")["value"] == 20
assert span._measurements.get("ai_total_tokens_used")["value"] == 30
assert span._data.get("ai.streaming") is True
assert span._data.get("gen_ai.usage.input_tokens") == 10
assert span._data.get("gen_ai.usage.output_tokens") == 20
assert span._data.get("gen_ai.usage.total_tokens") == 30
16 changes: 8 additions & 8 deletions tests/integrations/cohere/test_cohere.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ def test_nonstreaming_chat(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 10
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.output_tokens"] == 10
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


# noinspection PyTypeChecker
Expand Down Expand Up @@ -135,9 +135,9 @@ def test_streaming_chat(sentry_init, capture_events, send_default_pii, include_p
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 10
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.output_tokens"] == 10
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


def test_bad_chat(sentry_init, capture_events):
Expand Down Expand Up @@ -199,8 +199,8 @@ def test_embed(sentry_init, capture_events, send_default_pii, include_prompts):
else:
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 10
assert span["measurements"]["ai_total_tokens_used"]["value"] == 10
assert span["data"]["gen_ai.usage.input_tokens"] == 10
assert span["data"]["gen_ai.usage.total_tokens"] == 10


def test_span_origin_chat(sentry_init, capture_events):
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/huggingface_hub/test_huggingface_hub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_nonstreaming_chat_completion(
assert SPANDATA.AI_RESPONSES not in span["data"]

if details_arg:
assert span["measurements"]["ai_total_tokens_used"]["value"] == 10
assert span["data"]["gen_ai.usage.total_tokens"] == 10


@pytest.mark.parametrize(
Expand Down Expand Up @@ -134,7 +134,7 @@ def test_streaming_chat_completion(
assert SPANDATA.AI_RESPONSES not in span["data"]

if details_arg:
assert span["measurements"]["ai_total_tokens_used"]["value"] == 10
assert span["data"]["gen_ai.usage.total_tokens"] == 10


def test_bad_chat_completion(sentry_init, capture_events):
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/langchain/test_langchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ def test_langchain_agent(
assert len(list(x for x in tx["spans"] if x["op"] == "ai.run.langchain")) > 0

if use_unknown_llm_type:
assert "ai_prompt_tokens_used" in chat_spans[0]["measurements"]
assert "ai_total_tokens_used" in chat_spans[0]["measurements"]
assert "gen_ai.usage.input_tokens" in chat_spans[0]["data"]
assert "gen_ai.usage.total_tokens" in chat_spans[0]["data"]
else:
# important: to avoid double counting, we do *not* measure
# tokens used if we have an explicit integration (e.g. OpenAI)
Expand Down
32 changes: 16 additions & 16 deletions tests/integrations/openai/test_openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def test_nonstreaming_chat_completion(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 10
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.output_tokens"] == 10
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


@pytest.mark.asyncio
Expand Down Expand Up @@ -132,9 +132,9 @@ async def test_nonstreaming_chat_completion_async(
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
assert SPANDATA.AI_RESPONSES not in span["data"]

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 10
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.output_tokens"] == 10
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


def tiktoken_encoding_if_installed():
Expand Down Expand Up @@ -228,9 +228,9 @@ def test_streaming_chat_completion(
try:
import tiktoken # type: ignore # noqa # pylint: disable=unused-import

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 2
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 1
assert span["measurements"]["ai_total_tokens_used"]["value"] == 3
assert span["data"]["gen_ai.usage.output_tokens"] == 2
assert span["data"]["gen_ai.usage.input_tokens"] == 1
assert span["data"]["gen_ai.usage.total_tokens"] == 3
except ImportError:
pass # if tiktoken is not installed, we can't guarantee token usage will be calculated properly

Expand Down Expand Up @@ -324,9 +324,9 @@ async def test_streaming_chat_completion_async(
try:
import tiktoken # type: ignore # noqa # pylint: disable=unused-import

assert span["measurements"]["ai_completion_tokens_used"]["value"] == 2
assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 1
assert span["measurements"]["ai_total_tokens_used"]["value"] == 3
assert span["data"]["gen_ai.usage.output_tokens"] == 2
assert span["data"]["gen_ai.usage.input_tokens"] == 1
assert span["data"]["gen_ai.usage.total_tokens"] == 3
except ImportError:
pass # if tiktoken is not installed, we can't guarantee token usage will be calculated properly

Expand Down Expand Up @@ -409,8 +409,8 @@ def test_embeddings_create(
else:
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


@pytest.mark.asyncio
Expand Down Expand Up @@ -457,8 +457,8 @@ async def test_embeddings_create_async(
else:
assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]

assert span["measurements"]["ai_prompt_tokens_used"]["value"] == 20
assert span["measurements"]["ai_total_tokens_used"]["value"] == 30
assert span["data"]["gen_ai.usage.input_tokens"] == 20
assert span["data"]["gen_ai.usage.total_tokens"] == 30


@pytest.mark.parametrize(
Expand Down
Loading