Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
238f87c
fix(ai): Keep single content input message
alexander-alderman-webb Jan 20, 2026
de7996d
remove system prompt anthropic test
alexander-alderman-webb Jan 20, 2026
7aedbde
update openai agents test
alexander-alderman-webb Jan 20, 2026
67b768a
openai tests
alexander-alderman-webb Jan 20, 2026
3e1cb35
ai monitoring tests
alexander-alderman-webb Jan 20, 2026
49bbcd8
google_genai tests
alexander-alderman-webb Jan 20, 2026
9d192b4
pydantic-ai tests
alexander-alderman-webb Jan 20, 2026
708b55a
remove comment
alexander-alderman-webb Jan 20, 2026
95d15f6
remove if statement in test
alexander-alderman-webb Jan 20, 2026
01d0619
deduplicate
alexander-alderman-webb Jan 20, 2026
9cf5643
Revert "deduplicate"
alexander-alderman-webb Jan 21, 2026
fe5d1e1
remove if condition in test
alexander-alderman-webb Jan 21, 2026
a7990ad
ref(openai): Separate input handling to improve typing
alexander-alderman-webb Jan 21, 2026
c6ebc0f
remove old func
alexander-alderman-webb Jan 21, 2026
8d9fa37
.
alexander-alderman-webb Jan 21, 2026
ab41f1e
expand type
alexander-alderman-webb Jan 21, 2026
b3117ac
add ignores
alexander-alderman-webb Jan 21, 2026
847d4b2
revert unrelated change
alexander-alderman-webb Jan 21, 2026
4f25a56
feat(openai): Set system instruction attribute
alexander-alderman-webb Jan 21, 2026
903bbbd
use union
alexander-alderman-webb Jan 21, 2026
f304bec
mypy
alexander-alderman-webb Jan 21, 2026
921a82f
Merge branch 'webb/openai-separate-input-handling' into webb/openai-a…
alexander-alderman-webb Jan 21, 2026
9f5d801
.
alexander-alderman-webb Jan 21, 2026
d66ffe1
use specific openai types
alexander-alderman-webb Jan 21, 2026
ac3ce00
wip
alexander-alderman-webb Jan 22, 2026
ef9fe6f
.
alexander-alderman-webb Jan 22, 2026
ce84a29
.
alexander-alderman-webb Jan 22, 2026
dee9930
remove test
alexander-alderman-webb Jan 22, 2026
cb00ab3
.
alexander-alderman-webb Jan 22, 2026
26b932b
.
alexander-alderman-webb Jan 22, 2026
04dc92c
.
alexander-alderman-webb Jan 22, 2026
c7263ea
edge case
alexander-alderman-webb Jan 22, 2026
d947899
full responses api tests
alexander-alderman-webb Jan 22, 2026
8cbeac1
remove sentry_sdk/ai/_openai_completions_api.py
alexander-alderman-webb Jan 22, 2026
bcebcc8
fix test
alexander-alderman-webb Jan 22, 2026
fd194e2
merge master
alexander-alderman-webb Jan 23, 2026
53b96f9
merge opanai branch
alexander-alderman-webb Jan 23, 2026
f749ae4
Merge branch 'master' into webb/openai-separate-input-handling
alexander-alderman-webb Jan 23, 2026
87dd8fe
Merge branch 'webb/openai-separate-input-handling' into webb/openai-a…
alexander-alderman-webb Jan 23, 2026
6f5d62c
Merge branch 'webb/openai-ai-prompt-message' into webb/keep-single-me…
alexander-alderman-webb Jan 23, 2026
4aed172
handle embeddings separately
alexander-alderman-webb Jan 23, 2026
085b496
feat(openai-agents): Set system instruction attribute on gen_ai.chat …
alexander-alderman-webb Jan 23, 2026
48c7fbe
add type ignores
alexander-alderman-webb Jan 23, 2026
3f5ad11
more defensive checks in case input is not iterable
alexander-alderman-webb Jan 23, 2026
ebf2d9c
merge
alexander-alderman-webb Jan 23, 2026
fc9f1fa
pick up changes to extraction functions
alexander-alderman-webb Jan 23, 2026
bcdd87c
fix func name
alexander-alderman-webb Jan 23, 2026
68b853f
fix Iterable import
alexander-alderman-webb Jan 23, 2026
5ee5274
remove runtime import
alexander-alderman-webb Jan 23, 2026
1f0f98d
feat(ai): Add original input length meta attribute
alexander-alderman-webb Jan 26, 2026
a8840d5
more early returns
alexander-alderman-webb Jan 26, 2026
382e933
revert unrelated tests
alexander-alderman-webb Jan 26, 2026
179d59e
revert unrelated change
alexander-alderman-webb Jan 26, 2026
12cb219
address comment
alexander-alderman-webb Jan 26, 2026
a6152fe
remove unused type ignore
alexander-alderman-webb Jan 26, 2026
74b5a4c
merge
alexander-alderman-webb Jan 26, 2026
eda980c
fix typo in filename
alexander-alderman-webb Jan 26, 2026
5825835
remove unused import
alexander-alderman-webb Jan 26, 2026
92ecc88
merge
alexander-alderman-webb Jan 26, 2026
753b5c0
add anthropic test case
alexander-alderman-webb Jan 26, 2026
7400f9d
remove parameter in test case
alexander-alderman-webb Jan 26, 2026
23868e5
merge
alexander-alderman-webb Jan 26, 2026
c625e12
revert test_ai_monitoring tests
alexander-alderman-webb Jan 26, 2026
69c78a8
merge
alexander-alderman-webb Jan 26, 2026
2a80a8d
restore test change
alexander-alderman-webb Jan 26, 2026
0628d92
update ai_monitoring tests
alexander-alderman-webb Jan 26, 2026
6dc02f9
add const file
alexander-alderman-webb Jan 26, 2026
7e5b395
Merge branch 'webb/keep-single-message' into webb/set-original-messag…
alexander-alderman-webb Jan 26, 2026
d151119
openai tests
alexander-alderman-webb Jan 26, 2026
1418237
merge master
alexander-alderman-webb Jan 28, 2026
9ce59bb
resolving openai test conflicts
alexander-alderman-webb Jan 28, 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
3 changes: 3 additions & 0 deletions sentry_sdk/ai/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import sentry_sdk
from sentry_sdk.utils import logger
from sentry_sdk.consts import SPANDATA

MAX_GEN_AI_MESSAGE_BYTES = 20_000 # 20KB
# Maximum characters when only a single message is left after bytes truncation
Expand Down Expand Up @@ -698,6 +699,8 @@ def truncate_and_annotate_messages(
if len(messages) > 1:
scope._gen_ai_original_message_count[span.span_id] = len(messages)

span.set_data(SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH, len(messages))

return [truncated_message]


Expand Down
8 changes: 8 additions & 0 deletions sentry_sdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,14 @@ class SPANDATA:
Example: "a1b2c3d4e5f6"
"""

META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH = (
"sentry.sdk_meta.gen_ai.input.messages.original_length"
)
"""
The original number of input non-system instruction messages, before SDK trimming.
Example: 4
"""


class SPANSTATUS:
"""
Expand Down
2 changes: 2 additions & 0 deletions tests/integrations/anthropic/test_anthropic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ def test_anthropic_message_truncation(sentry_init, capture_events):
assert len(parsed_messages) == 1
assert "small message 5" in str(parsed_messages[0])

assert chat_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 5
assert tx["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 5


Expand Down Expand Up @@ -1061,6 +1062,7 @@ async def test_anthropic_message_truncation_async(sentry_init, capture_events):
assert len(parsed_messages) == 1
assert "small message 5" in str(parsed_messages[0])

assert chat_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 5
assert tx["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 5


Expand Down
1 change: 1 addition & 0 deletions tests/integrations/google_genai/test_google_genai.py
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,7 @@ def test_google_genai_message_truncation(
assert parsed_messages[0]["role"] == "user"
assert small_content in parsed_messages[0]["content"]

assert invoke_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 2
assert (
event["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 2
)
Expand Down
2 changes: 2 additions & 0 deletions tests/integrations/langchain/test_langchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,8 @@ def test_langchain_message_truncation(sentry_init, capture_events):
assert isinstance(parsed_messages, list)
assert len(parsed_messages) == 1
assert "small message 5" in str(parsed_messages[0])

assert llm_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 5
assert tx["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 5


Expand Down
2 changes: 2 additions & 0 deletions tests/integrations/langgraph/test_langgraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -1384,4 +1384,6 @@ def original_invoke(self, *args, **kwargs):
assert isinstance(parsed_messages, list)
assert len(parsed_messages) == 1
assert "small message 5" in str(parsed_messages[0])

assert invoke_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 5
assert tx["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 5
2 changes: 2 additions & 0 deletions tests/integrations/litellm/test_litellm.py
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,8 @@ def test_litellm_message_truncation(sentry_init, capture_events):
assert isinstance(parsed_messages, list)
assert len(parsed_messages) == 1
assert "small message 5" in str(parsed_messages[0])

assert chat_span["data"][SPANDATA.META_GEN_AI_ORIGINAL_INPUT_MESSAGES_LENGTH] == 5
assert tx["_meta"]["spans"]["0"]["data"]["gen_ai.request.messages"][""]["len"] == 5


Expand Down
3 changes: 3 additions & 0 deletions tests/integrations/openai/test_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,7 @@ def test_ai_client_span_responses_api(
"gen_ai.usage.total_tokens": 30,
"gen_ai.request.model": "gpt-4o",
"gen_ai.response.text": "the model response",
"sentry.sdk_meta.gen_ai.input.messages.original_length": 1,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}
Expand Down Expand Up @@ -1910,6 +1911,7 @@ async def test_ai_client_span_responses_async_api(
"gen_ai.usage.output_tokens.reasoning": 8,
"gen_ai.usage.total_tokens": 30,
"gen_ai.response.text": "the model response",
"sentry.sdk_meta.gen_ai.input.messages.original_length": 1,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}
Expand Down Expand Up @@ -2177,6 +2179,7 @@ async def test_ai_client_span_streaming_responses_async_api(
"gen_ai.usage.total_tokens": 30,
"gen_ai.request.model": "gpt-4o",
"gen_ai.response.text": "the model response",
"sentry.sdk_meta.gen_ai.input.messages.original_length": 1,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}
Expand Down
Loading