Skip to content

fix(starlette): Set transaction name on current scope in sync handler #7201

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

Draft
mjq wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −1
Draft

fix(starlette): Set transaction name on current scope in sync handler #7201

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
2 changes: 1 addition & 1 deletion sentry_sdk/integrations/starlette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ def _sentry_sync_func(*args: "Any", **kwargs: "Any") -> "Any":
request = args[0]

_set_transaction_name_and_source(
sentry_scope, integration.transaction_style, request
current_scope, integration.transaction_style, request
)

extractor = StarletteRequestExtractor(request)
Expand Down
41 changes: 41 additions & 0 deletions tests/integrations/starlette/test_starlette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,47 @@ def test_active_thread_id_span_streaming(sentry_init, capture_items, endpoint):
assert str(data["active"]) == segments[0]["attributes"]["thread.id"]


@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
def test_transaction_name_span_streaming(sentry_init, capture_items, endpoint):
sentry_init(
auto_enabling_integrations=False,
integrations=[StarletteIntegration(transaction_style="url")],
traces_sample_rate=1.0,
trace_lifecycle="stream",
)
app = starlette_app_factory()

items = capture_items("span")

client = TestClient(app)
response = client.get(endpoint)
assert response.status_code == 200

sentry_sdk.flush()

segments = [item.payload for item in items if item.payload.get("is_segment")]
assert len(segments) == 1
assert segments[0]["name"] == endpoint
assert segments[0]["attributes"]["sentry.segment.name.source"] == "route"


@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
def test_transaction_name_static(sentry_init, capture_events, endpoint):
sentry_init(
integrations=[StarletteIntegration(transaction_style="url")],
traces_sample_rate=1.0,
)
events = capture_events()

client = TestClient(starlette_app_factory())
response = client.get(endpoint)
assert response.status_code == 200

(transaction,) = [e for e in events if e.get("type") == "transaction"]
assert transaction["transaction"] == endpoint
assert transaction["transaction_info"] == {"source": "route"}


def test_original_request_not_scrubbed(sentry_init, capture_events):
sentry_init(integrations=[StarletteIntegration()])

Expand Down
Loading