Skip to content

feat(wsgi): Migrate SentryWsgiMiddleware to span-streaming SDK #5477

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
sentrivana wants to merge 1 commit into
base: feat/span-first-2
Choose a base branch
from
Draft

feat(wsgi): Migrate SentryWsgiMiddleware to span-streaming SDK #5477

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
72 changes: 50 additions & 22 deletions sentry_sdk/integrations/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
)
from sentry_sdk.scope import should_send_default_pii, use_isolation_scope
from sentry_sdk.sessions import track_session
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing import Transaction, TransactionSource
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import (
ContextVar,
capture_internal_exceptions,
Expand All @@ -22,7 +24,18 @@
)

if TYPE_CHECKING:
from typing import Any, Callable, Dict, Iterator, Optional, Protocol, Tuple, TypeVar
from typing import (
Any,
Callable,
ContextManager,
Dict,
Iterator,
Optional,
Protocol,
Tuple,
TypeVar,
Union,
)

from sentry_sdk._types import Event, EventProcessor
from sentry_sdk.utils import ExcInfo
Expand Down Expand Up @@ -92,6 +105,9 @@ def __call__(

_wsgi_middleware_applied.set(True)
try:
client = sentry_sdk.get_client()
span_streaming = has_span_streaming_enabled(client.options)

with sentry_sdk.isolation_scope() as scope:
with track_session(scope, session_mode="request"):
with capture_internal_exceptions():
Expand All @@ -104,31 +120,43 @@ def __call__(
)

method = environ.get("REQUEST_METHOD", "").upper()
transaction = None
if method in self.http_methods_to_capture:
transaction = continue_trace(
environ,
op=OP.HTTP_SERVER,
name="generic WSGI request",
source=TransactionSource.ROUTE,
origin=self.span_origin,
)

transaction_context = (
sentry_sdk.start_transaction(
transaction,
custom_sampling_context={"wsgi_environ": environ},
span_ctx: "ContextManager[Union[Transaction, StreamedSpan, None]]"
if span_streaming:
segment: "Optional[StreamedSpan]" = None
if method in self.http_methods_to_capture:
sentry_sdk.traces.continue_trace(environ)
segment = sentry_sdk.traces.start_span(
name="generic WSGI request"
)
segment.set_op(OP.HTTP_SERVER)
segment.set_source(TransactionSource.ROUTE)
segment.set_origin(self.span_origin)
span_ctx = segment or nullcontext()
else:
transaction = None
if method in self.http_methods_to_capture:
transaction = continue_trace(
environ,
op=OP.HTTP_SERVER,
name="generic WSGI request",
source=TransactionSource.ROUTE,
origin=self.span_origin,
)
span_ctx = (
sentry_sdk.start_transaction(
transaction,
custom_sampling_context={"wsgi_environ": environ},
)
if transaction is not None
else nullcontext()
)
if transaction is not None
else nullcontext()
)
with transaction_context:

with span_ctx as span:
try:
response = self.app(
environ,
partial(
_sentry_start_response, start_response, transaction
),
partial(_sentry_start_response, start_response, span),
)
except BaseException:
reraise(*_capture_exception())
Expand All @@ -140,7 +168,7 @@ def __call__(

def _sentry_start_response(
old_start_response: "StartResponse",
transaction: "Optional[Transaction]",
transaction: "Optional[Union[Transaction, StreamedSpan]]",
status: str,
response_headers: "WsgiResponseHeaders",
exc_info: "Optional[WsgiExcInfo]" = None,
Expand Down
Loading