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

Author: antonpirker

.github/workflows/test-integrations-dbs.yml

@@ -53,7 +53,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - uses: getsentry/action-clickhouse-in-ci@v1
+      - uses: getsentry/action-clickhouse-in-ci@v1.1
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
@@ -144,7 +144,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - uses: getsentry/action-clickhouse-in-ci@v1
+      - uses: getsentry/action-clickhouse-in-ci@v1.1
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 2.19.0
+
+### Various fixes & improvements
+
+- New: introduce `rust_tracing` integration. See https://docs.sentry.io/platforms/python/integrations/rust_tracing/ (#3717) by @matt-codecov
+- Auto enable Litestar integration (#3540) by @provinzkraut
+- Deprecate `sentry_sdk.init` context manager (#3729) by @szokeasaurusrex
+- feat(spotlight): Send PII to Spotlight when no DSN is set (#3804) by @BYK
+- feat(spotlight): Add info logs when Sentry is enabled (#3735) by @BYK
+- feat(spotlight): Inject Spotlight button on Django (#3751) by @BYK
+- feat(spotlight): Auto enable cache_spans for Spotlight on DEBUG (#3791) by @BYK
+- fix(logging): Handle parameter `stack_info` for the `LoggingIntegration` (#3745) by @gmcrocetti
+- fix(pure-eval): Make sentry-sdk[pure-eval] installable with pip==24.0 (#3757) by @sentrivana
+- fix(rust_tracing): include_tracing_fields arg to control unvetted data in rust_tracing integration (#3780) by @matt-codecov
+- fix(aws) Fix aws lambda tests (by reducing event size) (#3770) by @antonpirker
+- fix(arq): fix integration with Worker settings as a dict (#3742) by @saber-solooki
+- fix(httpx): Prevent Sentry baggage duplication (#3728) by @szokeasaurusrex
+- fix(falcon): Don't exhaust request body stream (#3768) by @szokeasaurusrex
+- fix(integrations): Check `retries_left` before capturing exception (#3803) by @malkovro
+- fix(openai): Use name instead of description (#3807) by @sourceful-rob
+- test(gcp): Only run GCP tests when they should (#3721) by @szokeasaurusrex
+- chore: Shorten CI workflow names (#3805) by @sentrivana
+- chore: Test with pyspark prerelease (#3760) by @sentrivana
+- build(deps): bump codecov/codecov-action from 4.6.0 to 5.0.2 (#3792) by @dependabot
+- build(deps): bump actions/checkout from 4.2.1 to 4.2.2 (#3691) by @dependabot
+
 ## 2.18.0
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.18.0"
+release = "2.19.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

scripts/split-tox-gh-actions/templates/test_group.jinja

@@ -47,7 +47,7 @@
           python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
           allow-prereleases: true
       {% if needs_clickhouse %}
-      - uses: getsentry/action-clickhouse-in-ci@v1
+      - uses: getsentry/action-clickhouse-in-ci@v1.1
       {% endif %}
 
       {% if needs_redis %}

sentry_sdk/client.py

@@ -122,7 +122,11 @@ def _get_options(*args, **kwargs):
         rv["traces_sample_rate"] = 1.0
 
     if rv["event_scrubber"] is None:
-        rv["event_scrubber"] = EventScrubber(send_default_pii=rv["send_default_pii"])
+        rv["event_scrubber"] = EventScrubber(
+            send_default_pii=(
+                False if rv["send_default_pii"] is None else rv["send_default_pii"]
+            )
+        )
 
     if rv["socket_options"] and not isinstance(rv["socket_options"], list):
         logger.warning(
@@ -402,7 +406,11 @@ def should_send_default_pii(self):
 
         Returns whether the client should send default PII (Personally Identifiable Information) data to Sentry.
         """
-        return self.options.get("send_default_pii", False)
+        result = self.options.get("send_default_pii")
+        if result is None:
+            result = not self.options["dsn"] and self.spotlight is not None
+
+        return result
 
     @property
     def dsn(self):

sentry_sdk/consts.py

@@ -476,6 +476,7 @@ class OP:
 # This type exists to trick mypy and PyCharm into thinking `init` and `Client`
 # take these arguments (even though they take opaque **kwargs)
 class ClientConstructor:
+
     def __init__(
         self,
         dsn=None,  # type: Optional[str]
@@ -493,7 +494,7 @@ def __init__(
         transport=None,  # type: Optional[Union[sentry_sdk.transport.Transport, Type[sentry_sdk.transport.Transport], Callable[[Event], None]]]
         transport_queue_size=DEFAULT_QUEUE_SIZE,  # type: int
         sample_rate=1.0,  # type: float
-        send_default_pii=False,  # type: bool
+        send_default_pii=None,  # type: Optional[bool]
         http_proxy=None,  # type: Optional[str]
         https_proxy=None,  # type: Optional[str]
         ignore_errors=[],  # type: Sequence[Union[type, str]]  # noqa: B006
@@ -561,4 +562,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.18.0"
+VERSION = "2.19.0"

sentry_sdk/integrations/launchdarkly.py

@@ -50,7 +50,7 @@ class LaunchDarklyHook(Hook):
     @property
     def metadata(self):
         # type: () -> Metadata
-        return Metadata(name="sentry-feature-flag-recorder")
+        return Metadata(name="sentry-flag-auditor")
 
     def after_evaluation(self, series_context, data, detail):
         # type: (EvaluationSeriesContext, dict[Any, Any], EvaluationDetail) -> dict[Any, Any]

sentry_sdk/integrations/wsgi.py

@@ -1,5 +1,4 @@
 import sys
-from contextlib import nullcontext
 from functools import partial
 
 import sentry_sdk
@@ -12,6 +11,7 @@
 )
 from sentry_sdk.sessions import track_session
 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,6 +44,9 @@ 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"
@@ -110,6 +113,7 @@ 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():
@@ -120,11 +124,14 @@ 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):
-                        with (
-                            sentry_sdk.start_span(
+                        if should_trace:
+                            transaction = sentry_sdk.start_span(
                                 op=OP.HTTP_SERVER,
                                 name=DEFAULT_TRANSACTION_NAME,
                                 source=TRANSACTION_SOURCE_ROUTE,
@@ -133,9 +140,9 @@ def __call__(self, environ, start_response):
                                     environ, self.use_x_forwarded_for
                                 ),
                             )
-                            if should_trace
-                            else nullcontext()
-                        ) as transaction:
+                            transaction.__enter__()
+                            current_scope = transaction.scope
+
                             try:
                                 response = self.app(
                                     environ,
@@ -146,12 +153,20 @@ def __call__(self, environ, start_response):
                                     ),
                                 )
                             except BaseException:
-                                reraise(*_capture_exception())
+                                exc_info = sys.exc_info()
+                                _capture_exception(exc_info)
+                                finish_running_transaction(transaction, exc_info)
+                                reraise(*exc_info)
 
         finally:
             _wsgi_middleware_applied.set(False)
 
-        return _ScopedResponse(scope, response)
+        return _ScopedResponse(
+            response=response,
+            current_scope=current_scope,
+            isolation_scope=scope,
+            transaction=transaction,
+        )
 
 
 def _sentry_start_response(  # type: ignore
@@ -213,13 +228,13 @@ def get_client_ip(environ):
     return environ.get("REMOTE_ADDR")
 
 
-def _capture_exception():
-    # type: () -> ExcInfo
+def _capture_exception(exc_info=None):
+    # type: (Optional[ExcInfo]) -> ExcInfo
     """
     Captures the current exception and sends it to Sentry.
     Returns the ExcInfo tuple to it can be reraised afterwards.
     """
-    exc_info = sys.exc_info()
+    exc_info = exc_info or sys.exc_info()
     e = exc_info[1]
 
     # SystemExit(0) is the only uncaught exception that is expected behavior
@@ -237,7 +252,7 @@ def _capture_exception():
 
 class _ScopedResponse:
     """
-    Users a separate scope for each response chunk.
+    Use separate scopes for each response chunk.
 
     This will make WSGI apps more tolerant against:
     - WSGI servers streaming responses from a different thread/from
@@ -246,37 +261,54 @@ class _ScopedResponse:
     - WSGI servers streaming responses interleaved from the same thread
     """
 
-    __slots__ = ("_response", "_scope")
+    __slots__ = ("_response", "_current_scope", "_isolation_scope", "_transaction")
 
-    def __init__(self, scope, response):
-        # type: (sentry_sdk.scope.Scope, Iterator[bytes]) -> None
-        self._scope = 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
         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)
 
-        while True:
-            with sentry_sdk.use_isolation_scope(self._scope):
-                try:
-                    chunk = next(iterator)
-                except StopIteration:
-                    break
-                except BaseException:
-                    reraise(*_capture_exception())
+        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
 
-            yield chunk
+        finally:
+            with sentry_sdk.use_isolation_scope(self._isolation_scope):
+                with sentry_sdk.use_scope(self._current_scope):
+                    finish_running_transaction(transaction=self._transaction)
 
     def close(self):
         # type: () -> None
-        with sentry_sdk.use_isolation_scope(self._scope):
-            try:
-                self._response.close()  # type: ignore
-            except AttributeError:
-                pass
-            except BaseException:
-                reraise(*_capture_exception())
+        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())
 
 
 def _make_wsgi_event_processor(environ, use_x_forwarded_for):

sentry_sdk/tracing.py

@@ -1317,6 +1317,7 @@ def __exit__(self, ty, value, tb):
 
         self.finish()
         context.detach(self._ctx_token)
+        del self._ctx_token
 
     @property
     def description(self):

sentry_sdk/tracing_utils.py

@@ -36,6 +36,9 @@
 
     from types import FrameType
 
+    from sentry_sdk._types import ExcInfo
+    from threading import Timer
+
 
 SENTRY_TRACE_REGEX = re.compile(
     "^[ \t]*"  # whitespace
@@ -731,3 +734,15 @@ def get_current_span(scope=None):
     LOW_QUALITY_TRANSACTION_SOURCES,
     SENTRY_TRACE_HEADER_NAME,
 )
+
+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)