Merge branch 'potel-base' into potel-base-run-all-tests

Author: antonpirker

sentry_sdk/integrations/wsgi.py

@@ -1,4 +1,5 @@
 import sys
+from contextlib import nullcontext
 from functools import partial
 
 import sentry_sdk
@@ -8,10 +9,11 @@
 from sentry_sdk.integrations._wsgi_common import (
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
     _filter_headers,
+    nullcontext,
 )
 from sentry_sdk.sessions import track_session
+from sentry_sdk.scope import use_isolation_scope
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
-from sentry_sdk.tracing_utils import finish_running_transaction
 from sentry_sdk.utils import (
     ContextVar,
     capture_internal_exceptions,
@@ -44,9 +46,6 @@ def __call__(self, status, response_headers, exc_info=None):  # type: ignore
             pass
 
 
-MAX_TRANSACTION_DURATION_SECONDS = 5 * 60
-
-
 _wsgi_middleware_applied = ContextVar("sentry_wsgi_middleware_applied")
 
 DEFAULT_TRANSACTION_NAME = "generic WSGI request"
@@ -113,7 +112,6 @@ def __call__(self, environ, start_response):
                 scope.set_transaction_name(
                     DEFAULT_TRANSACTION_NAME, source=TRANSACTION_SOURCE_ROUTE
                 )
-                current_scope = sentry_sdk.get_current_scope()
 
                 with track_session(scope, session_mode="request"):
                     with capture_internal_exceptions():
@@ -124,14 +122,11 @@ def __call__(self, environ, start_response):
                                 environ, self.use_x_forwarded_for
                             )
                         )
-
                     method = environ.get("REQUEST_METHOD", "").upper()
                     should_trace = method in self.http_methods_to_capture
-                    transaction = None
-
                     with sentry_sdk.continue_trace(environ):
-                        if should_trace:
-                            transaction = sentry_sdk.start_span(
+                        with (
+                            sentry_sdk.start_span(
                                 op=OP.HTTP_SERVER,
                                 name=DEFAULT_TRANSACTION_NAME,
                                 source=TRANSACTION_SOURCE_ROUTE,
@@ -140,9 +135,9 @@ def __call__(self, environ, start_response):
                                     environ, self.use_x_forwarded_for
                                 ),
                             )
-                            transaction.__enter__()
-                            current_scope = transaction.scope
-
+                            if should_trace
+                            else nullcontext()
+                        ) as transaction:
                             try:
                                 response = self.app(
                                     environ,
@@ -153,20 +148,12 @@ def __call__(self, environ, start_response):
                                     ),
                                 )
                             except BaseException:
-                                exc_info = sys.exc_info()
-                                _capture_exception(exc_info)
-                                finish_running_transaction(transaction, exc_info)
-                                reraise(*exc_info)
+                                reraise(*_capture_exception())
 
         finally:
             _wsgi_middleware_applied.set(False)
 
-        return _ScopedResponse(
-            response=response,
-            current_scope=current_scope,
-            isolation_scope=scope,
-            transaction=transaction,
-        )
+        return _ScopedResponse(scope, response)
 
 
 def _sentry_start_response(  # type: ignore
@@ -228,13 +215,13 @@ def get_client_ip(environ):
     return environ.get("REMOTE_ADDR")
 
 
-def _capture_exception(exc_info=None):
-    # type: (Optional[ExcInfo]) -> ExcInfo
+def _capture_exception():
+    # type: () -> ExcInfo
     """
     Captures the current exception and sends it to Sentry.
     Returns the ExcInfo tuple to it can be reraised afterwards.
     """
-    exc_info = exc_info or sys.exc_info()
+    exc_info = sys.exc_info()
     e = exc_info[1]
 
     # SystemExit(0) is the only uncaught exception that is expected behavior
@@ -252,7 +239,7 @@ def _capture_exception(exc_info=None):
 
 class _ScopedResponse:
     """
-    Use separate scopes for each response chunk.
+    Users a separate scope for each response chunk.
 
     This will make WSGI apps more tolerant against:
     - WSGI servers streaming responses from a different thread/from
@@ -261,54 +248,37 @@ class _ScopedResponse:
     - WSGI servers streaming responses interleaved from the same thread
     """
 
-    __slots__ = ("_response", "_current_scope", "_isolation_scope", "_transaction")
+    __slots__ = ("_response", "_scope")
 
-    def __init__(
-        self,
-        response,  # type: Iterator[bytes]
-        current_scope,  # type: sentry_sdk.scope.Scope
-        isolation_scope,  # type: sentry_sdk.scope.Scope
-        transaction=None,  # type: Optional[Transaction]
-    ):
-        # type: (...) -> None
+    def __init__(self, scope, response):
+        # type: (sentry_sdk.scope.Scope, Iterator[bytes]) -> None
+        self._scope = scope
         self._response = response
-        self._current_scope = current_scope
-        self._isolation_scope = isolation_scope
-        self._transaction = transaction
 
     def __iter__(self):
         # type: () -> Iterator[bytes]
         iterator = iter(self._response)
 
-        try:
-            while True:
-                with sentry_sdk.use_isolation_scope(self._isolation_scope):
-                    with sentry_sdk.use_scope(self._current_scope):
-                        try:
-                            chunk = next(iterator)
-                        except StopIteration:
-                            break
-                        except BaseException:
-                            reraise(*_capture_exception())
-
-                yield chunk
+        while True:
+            with sentry_sdk.use_isolation_scope(self._scope):
+                try:
+                    chunk = next(iterator)
+                except StopIteration:
+                    break
+                except BaseException:
+                    reraise(*_capture_exception())
 
-        finally:
-            with sentry_sdk.use_isolation_scope(self._isolation_scope):
-                with sentry_sdk.use_scope(self._current_scope):
-                    finish_running_transaction(transaction=self._transaction)
+            yield chunk
 
     def close(self):
         # type: () -> None
-        with sentry_sdk.use_isolation_scope(self._isolation_scope):
-            with sentry_sdk.use_scope(self._current_scope):
-                try:
-                    finish_running_transaction(transaction=self._transaction)
-                    self._response.close()  # type: ignore
-                except AttributeError:
-                    pass
-                except BaseException:
-                    reraise(*_capture_exception())
+        with sentry_sdk.use_isolation_scope(self._scope):
+            try:
+                self._response.close()  # type: ignore
+            except AttributeError:
+                pass
+            except BaseException:
+                reraise(*_capture_exception())
 
 
 def _make_wsgi_event_processor(environ, use_x_forwarded_for):

sentry_sdk/tracing_utils.py

@@ -36,9 +36,6 @@
 
     from types import FrameType
 
-    from sentry_sdk._types import ExcInfo
-    from threading import Timer
-
 
 SENTRY_TRACE_REGEX = re.compile(
     "^[ \t]*"  # whitespace
@@ -737,12 +734,3 @@ def get_current_span(scope=None):
 
 if TYPE_CHECKING:
     from sentry_sdk.tracing import Span
-
-
-def finish_running_transaction(transaction=None, exc_info=None):
-    # type: (Optional[sentry_sdk.Transaction], Optional[ExcInfo]) -> None
-    if transaction is not None and hasattr(transaction, "_ctx_token"):
-        if exc_info is not None:
-            transaction.__exit__(*exc_info)
-        else:
-            transaction.__exit__(None, None, None)

tests/integrations/django/test_basic.py

@@ -50,7 +50,7 @@ def test_view_exceptions(sentry_init, client, capture_exceptions, capture_events
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
     exceptions = capture_exceptions()
     events = capture_events()
-    unpack_werkzeug_response(client.get(reverse("view_exc")))
+    client.get(reverse("view_exc"))
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
@@ -71,9 +71,7 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
     exceptions = capture_exceptions()
     events = capture_events()
-    unpack_werkzeug_response(
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
-    )
+    client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
@@ -92,9 +90,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
     exceptions = capture_exceptions()
     events = capture_events()
-    unpack_werkzeug_response(
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
-    )
+    client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
@@ -106,7 +102,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
 def test_middleware_exceptions(sentry_init, client, capture_exceptions):
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
     exceptions = capture_exceptions()
-    unpack_werkzeug_response(client.get(reverse("middleware_exc")))
+    client.get(reverse("middleware_exc"))
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
@@ -160,7 +156,7 @@ def test_has_trace_if_performance_enabled(sentry_init, client, capture_events):
         traces_sample_rate=1.0,
     )
     events = capture_events()
-    unpack_werkzeug_response(client.head(reverse("view_exc_with_msg")))
+    client.head(reverse("view_exc_with_msg"))
 
     (msg_event, error_event, transaction_event) = events
 
@@ -216,10 +212,8 @@ def test_trace_from_headers_if_performance_enabled(sentry_init, client, capture_
     trace_id = "582b43a4192642f0b136d5159a501701"
     sentry_trace_header = "{}-{}-{}".format(trace_id, "6e8f22c393e68f19", 1)
 
-    unpack_werkzeug_response(
-        client.head(
-            reverse("view_exc_with_msg"), headers={"sentry-trace": sentry_trace_header}
-        )
+    client.head(
+        reverse("view_exc_with_msg"), headers={"sentry-trace": sentry_trace_header}
     )
 
     (msg_event, error_event, transaction_event) = events
@@ -936,7 +930,7 @@ def test_render_spans(sentry_init, client, capture_events, render_span_tree):
 
     for url, expected_line in views_tests:
         events = capture_events()
-        unpack_werkzeug_response(client.get(url))
+        client.get(url)
         transaction = events[0]
         assert expected_line in render_span_tree(transaction)
 
@@ -980,7 +974,7 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("message")))
+    client.get(reverse("message"))
 
     message, transaction = events
 
@@ -997,7 +991,7 @@ def test_middleware_spans_disabled(sentry_init, client, capture_events):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("message")))
+    client.get(reverse("message"))
 
     message, transaction = events
 
@@ -1021,7 +1015,7 @@ def test_signals_spans(sentry_init, client, capture_events, render_span_tree):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("message")))
+    client.get(reverse("message"))
 
     message, transaction = events
 
@@ -1044,7 +1038,7 @@ def test_signals_spans_disabled(sentry_init, client, capture_events):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("message")))
+    client.get(reverse("message"))
 
     message, transaction = events
 
@@ -1074,7 +1068,7 @@ def test_signals_spans_filtering(sentry_init, client, capture_events, render_spa
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("send_myapp_custom_signal")))
+    client.get(reverse("send_myapp_custom_signal"))
 
     (transaction,) = events
 
@@ -1202,7 +1196,7 @@ def test_span_origin(sentry_init, client, capture_events):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("view_with_signal")))
+    client.get(reverse("view_with_signal"))
 
     (transaction,) = events
 
@@ -1232,9 +1226,9 @@ def test_transaction_http_method_default(sentry_init, client, capture_events):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("nomessage")))
-    unpack_werkzeug_response(client.options(reverse("nomessage")))
-    unpack_werkzeug_response(client.head(reverse("nomessage")))
+    client.get(reverse("nomessage"))
+    client.options(reverse("nomessage"))
+    client.head(reverse("nomessage"))
 
     (event,) = events
 
@@ -1258,9 +1252,9 @@ def test_transaction_http_method_custom(sentry_init, client, capture_events):
     )
     events = capture_events()
 
-    unpack_werkzeug_response(client.get(reverse("nomessage")))
-    unpack_werkzeug_response(client.options(reverse("nomessage")))
-    unpack_werkzeug_response(client.head(reverse("nomessage")))
+    client.get("/nomessage")
+    client.options("/nomessage")
+    client.head("/nomessage")
 
     assert len(events) == 2