Skip to content

feat: Set sentry.trace_lifecycle attr in span streaming #6684

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
sentrivana merged 5 commits into from
Jun 29, 2026
Merged

feat: Set sentry.trace_lifecycle attr in span streaming #6684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53516df
feat: Set sentry.trace_lifecycle attr in span streaming
sentrivana Jun 29, 2026
533c45c
dont check irrelevant attrs
sentrivana Jun 29, 2026
adaf93f
.
sentrivana Jun 29, 2026
01a9797
.
sentrivana Jun 29, 2026
da78741
.
sentrivana Jun 29, 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
1 change: 1 addition & 0 deletions sentry_sdk/traces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ def __init__(
self._active: bool = active
self._attributes: "Attributes" = {
"sentry.origin": "manual",
"sentry.trace_lifecycle": "stream",
}

if attributes:
Expand Down
122 changes: 34 additions & 88 deletions tests/integrations/openai/test_openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3818,7 +3818,7 @@ def test_ai_client_span_responses_api_no_pii(
spans = [item.payload for item in items]

assert len(spans) == 2
assert spans[0]["attributes"] == {
expected_attributes = {
"gen_ai.operation.name": "responses",
"gen_ai.request.max_tokens": 100,
"gen_ai.request.temperature": 0.7,
Expand All @@ -3832,24 +3832,18 @@ def test_ai_client_span_responses_api_no_pii(
"gen_ai.usage.output_tokens": 10,
"gen_ai.usage.output_tokens.reasoning": 8,
"gen_ai.usage.total_tokens": 30,
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

for attr, value in expected_attributes.items():
assert spans[0]["attributes"][attr] == value

assert "gen_ai.system_instructions" not in spans[0]["attributes"]
assert "gen_ai.request.messages" not in spans[0]["attributes"]
assert "gen_ai.response.text" not in spans[0]["attributes"]

elif stream_gen_ai_spans:
items = capture_items("span")

Expand All @@ -3866,7 +3860,7 @@ def test_ai_client_span_responses_api_no_pii(
spans = [item.payload for item in items]

assert len(spans) == 1
assert spans[0]["attributes"] == {
expected_attributes = {
"gen_ai.operation.name": "responses",
"gen_ai.request.max_tokens": 100,
"gen_ai.request.temperature": 0.7,
Expand All @@ -3880,21 +3874,14 @@ def test_ai_client_span_responses_api_no_pii(
"gen_ai.usage.output_tokens": 10,
"gen_ai.usage.output_tokens.reasoning": 8,
"gen_ai.usage.total_tokens": 30,
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

for attr, value in expected_attributes.items():
assert spans[0]["attributes"][attr] == value

assert "gen_ai.system_instructions" not in spans[0]["attributes"]
assert "gen_ai.request.messages" not in spans[0]["attributes"]
assert "gen_ai.response.text" not in spans[0]["attributes"]
Expand All @@ -3917,7 +3904,7 @@ def test_ai_client_span_responses_api_no_pii(
assert len(spans) == 1
assert spans[0]["op"] == "gen_ai.responses"
assert spans[0]["origin"] == "auto.ai.openai"
assert spans[0]["data"] == {
expected_data = {
"gen_ai.operation.name": "responses",
"gen_ai.request.max_tokens": 100,
"gen_ai.request.temperature": 0.7,
Expand All @@ -3931,10 +3918,11 @@ def test_ai_client_span_responses_api_no_pii(
"gen_ai.usage.output_tokens": 10,
"gen_ai.usage.output_tokens.reasoning": 8,
"gen_ai.usage.total_tokens": 30,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

for key, value in expected_data.items():
assert spans[0]["data"][key] == value

assert "gen_ai.system_instructions" not in spans[0]["data"]
assert "gen_ai.request.messages" not in spans[0]["data"]
assert "gen_ai.response.text" not in spans[0]["data"]
Expand Down Expand Up @@ -4143,27 +4131,19 @@ def test_ai_client_span_responses_api(
"gen_ai.request.messages": safe_serialize(expected_request_messages),
"gen_ai.request.model": "gpt-4o",
"gen_ai.response.text": "the model response",
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["attributes"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["attributes"][attr] == value

elif stream_gen_ai_spans:
items = capture_items("span")

Expand Down Expand Up @@ -4197,27 +4177,19 @@ def test_ai_client_span_responses_api(
"gen_ai.request.messages": safe_serialize(expected_request_messages),
"gen_ai.request.model": "gpt-4o",
"gen_ai.response.text": "the model response",
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["attributes"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["attributes"][attr] == value

else:
events = capture_events()

Expand Down Expand Up @@ -4254,16 +4226,15 @@ def test_ai_client_span_responses_api(
"gen_ai.request.messages": safe_serialize(expected_request_messages[-1:]),
"gen_ai.request.model": "gpt-4o",
"gen_ai.response.text": "the model response",
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["data"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["data"][attr] == value


@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down Expand Up @@ -4634,27 +4605,19 @@ 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",
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["attributes"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["attributes"][attr] == value

elif stream_gen_ai_spans:
items = capture_items("span")

Expand Down Expand Up @@ -4688,27 +4651,19 @@ 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",
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["attributes"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["attributes"][attr] == value

else:
events = capture_events()

Expand Down Expand Up @@ -4745,16 +4700,15 @@ 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",
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["data"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["data"][attr] == value


@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down Expand Up @@ -4987,24 +4941,17 @@ async def test_ai_client_span_streaming_responses_async_api(
"sentry.environment": "production",
"sentry.op": "gen_ai.responses",
"sentry.origin": "auto.ai.openai",
"process.runtime.name": mock.ANY,
"process.runtime.version": mock.ANY,
"sentry.release": mock.ANY,
"sentry.sdk.name": "sentry.python",
"sentry.sdk.version": mock.ANY,
"sentry.segment.id": mock.ANY,
"sentry.segment.name": "openai tx",
"server.address": mock.ANY,
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["attributes"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["attributes"][attr] == value

else:
events = capture_events()

Expand Down Expand Up @@ -5050,16 +4997,15 @@ 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": "hello world",
"thread.id": mock.ANY,
"thread.name": mock.ANY,
}

if expected_system_instructions is not None:
expected_data["gen_ai.system_instructions"] = safe_serialize(
expected_system_instructions
)

assert spans[0]["data"] == expected_data
for attr, value in expected_data.items():
assert spans[0]["data"][attr] == value


@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down
55 changes: 22 additions & 33 deletions tests/integrations/rust_tracing/test_rust_tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from string import Template
from typing import Dict
from unittest import mock

import pytest

Expand Down Expand Up @@ -761,26 +760,24 @@ def test_include_tracing_fields(
span_after_record = sentry_sdk.traces.get_current_span()._to_json()

if tracing_fields_expected:
assert span_after_record["attributes"] == {
"thread.id": mock.ANY,
"thread.name": mock.ANY,
"sentry.op": "function",
"sentry.origin": "auto.function.rust_tracing.test_record",
"use_memoized": True,
"version": "memoized",
"index": 10,
}
assert span_after_record["attributes"]["sentry.op"] == "function"
assert (
span_after_record["attributes"]["sentry.origin"]
== "auto.function.rust_tracing.test_record"
)
assert span_after_record["attributes"]["use_memoized"] is True
assert span_after_record["attributes"]["version"] == "memoized"
assert span_after_record["attributes"]["index"] == 10

else:
assert span_after_record["attributes"] == {
"thread.id": mock.ANY,
"thread.name": mock.ANY,
"sentry.op": "function",
"sentry.origin": "auto.function.rust_tracing.test_record",
"use_memoized": "[Filtered]",
"version": "[Filtered]",
"index": "[Filtered]",
}
assert span_after_record["attributes"]["sentry.op"] == "function"
assert (
span_after_record["attributes"]["sentry.origin"]
== "auto.function.rust_tracing.test_record"
)
assert span_after_record["attributes"]["use_memoized"] == "[Filtered]"
assert span_after_record["attributes"]["version"] == "[Filtered]"
assert span_after_record["attributes"]["index"] == "[Filtered]"
else:
with start_transaction():
rust_tracing.new_span(RustTracingLevel.Info, 3)
Expand All @@ -796,19 +793,11 @@ def test_include_tracing_fields(
span_after_record = sentry_sdk.get_current_span().to_json()

if tracing_fields_expected:
assert span_after_record["data"] == {
"thread.id": mock.ANY,
"thread.name": mock.ANY,
"use_memoized": True,
"version": "memoized",
"index": 10,
}
assert span_after_record["data"]["use_memoized"] is True
assert span_after_record["data"]["version"] == "memoized"
assert span_after_record["data"]["index"] == 10

else:
assert span_after_record["data"] == {
"thread.id": mock.ANY,
"thread.name": mock.ANY,
"use_memoized": "[Filtered]",
"version": "[Filtered]",
"index": "[Filtered]",
}
assert span_after_record["data"]["use_memoized"] == "[Filtered]"
assert span_after_record["data"]["version"] == "[Filtered]"
assert span_after_record["data"]["index"] == "[Filtered]"
1 change: 1 addition & 0 deletions tests/tracing/test_span_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,6 +1722,7 @@ def test_default_attributes(sentry_init, capture_envelopes):
"sentry.dist": {"value": "1.0", "type": "string"},
"sentry.origin": {"value": "manual", "type": "string"},
"sentry.sdk.integrations": {"value": mock.ANY, "type": "array"},
"sentry.trace_lifecycle": {"value": "stream", "type": "string"},
"process.runtime.name": {
"type": "string",
"value": mock.ANY,
Expand Down
Loading