Merge branch 'master' into potel-base

Author: sentrivana

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test AI
 on:
   push:

.github/workflows/test-integrations-aws-lambda.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test AWS Lambda
 on:
   push:

.github/workflows/test-integrations-cloud-computing.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Cloud Computing
 on:
   push:

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Common
 on:
   push:

.github/workflows/test-integrations-data-processing.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Data Processing
 on:
   push:

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Databases
 on:
   push:

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test GraphQL
 on:
   push:

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Miscellaneous
 on:
   push:

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Networking
 on:
   push:

.github/workflows/test-integrations-web-frameworks-1.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Web Frameworks 1
 on:
   push:

.github/workflows/test-integrations-web-frameworks-2.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test Web Frameworks 2
 on:
   push:

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

@@ -1,3 +1,6 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
+
 {% with lowercase_group=group | replace(" ", "_") | lower %}
 name: Test {{ group }}
 

sentry_sdk/integrations/aiohttp.py

@@ -6,7 +6,7 @@
 from sentry_sdk.consts import OP, SPANSTATUS, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations.logging import ignore_logger
-from sentry_sdk.sessions import auto_session_tracking_scope
+from sentry_sdk.sessions import track_session
 from sentry_sdk.integrations._wsgi_common import (
     _filter_headers,
     request_body_within_bounds,
@@ -105,7 +105,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
             weak_request = weakref.ref(request)
 
             with sentry_sdk.isolation_scope() as scope:
-                with auto_session_tracking_scope(scope, session_mode="request"):
+                with track_session(scope, session_mode="request"):
                     # Scope data will not leak between requests because aiohttp
                     # create a task to wrap each request.
                     scope.generate_propagation_context()

sentry_sdk/integrations/asgi.py

@@ -19,7 +19,7 @@
     _get_request_data,
     _get_url,
 )
-from sentry_sdk.sessions import auto_session_tracking_scope
+from sentry_sdk.sessions import track_session
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
     TRANSACTION_SOURCE_ROUTE,
@@ -169,7 +169,7 @@ async def _run_app(self, scope, receive, send, asgi_version):
         _asgi_middleware_applied.set(True)
         try:
             with sentry_sdk.isolation_scope() as sentry_scope:
-                with auto_session_tracking_scope(sentry_scope, session_mode="request"):
+                with track_session(sentry_scope, session_mode="request"):
                     sentry_scope.clear_breadcrumbs()
                     sentry_scope._name = "asgi"
                     processor = partial(self.event_processor, asgi_scope=scope)

sentry_sdk/integrations/wsgi.py

@@ -8,9 +8,7 @@
 from sentry_sdk.consts import OP
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
-from sentry_sdk.sessions import (
-    auto_session_tracking_scope as auto_session_tracking,
-)  # When the Hub is removed, this should be renamed (see comment in sentry_sdk/sessions.py)
+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.utils import (
@@ -83,7 +81,7 @@ def __call__(self, environ, start_response):
         _wsgi_middleware_applied.set(True)
         try:
             with sentry_sdk.isolation_scope() as scope:
-                with auto_session_tracking(scope, session_mode="request"):
+                with track_session(scope, session_mode="request"):
                     with capture_internal_exceptions():
                         scope.clear_breadcrumbs()
                         scope._name = "wsgi"

sentry_sdk/sessions.py

@@ -1,5 +1,6 @@
 import os
 import time
+import warnings
 from threading import Thread, Lock
 from contextlib import contextmanager
 
@@ -21,8 +22,15 @@
 
 def is_auto_session_tracking_enabled(hub=None):
     # type: (Optional[sentry_sdk.Hub]) -> Union[Any, bool, None]
-    """Utility function to find out if session tracking is enabled."""
-    # TODO: add deprecation warning
+    """DEPRECATED: Utility function to find out if session tracking is enabled."""
+
+    # Internal callers should use private _is_auto_session_tracking_enabled, instead.
+    warnings.warn(
+        "This function is deprecated and will be removed in the next major release. "
+        "There is no public API replacement.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
     if hub is None:
         hub = sentry_sdk.Hub.current
@@ -39,12 +47,21 @@ def is_auto_session_tracking_enabled(hub=None):
 @contextmanager
 def auto_session_tracking(hub=None, session_mode="application"):
     # type: (Optional[sentry_sdk.Hub], str) -> Generator[None, None, None]
-    """Starts and stops a session automatically around a block."""
-    # TODO: add deprecation warning
+    """DEPRECATED: Use track_session instead
+    Starts and stops a session automatically around a block.
+    """
+    warnings.warn(
+        "This function is deprecated and will be removed in the next major release. "
+        "Use track_session instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
     if hub is None:
         hub = sentry_sdk.Hub.current
-    should_track = is_auto_session_tracking_enabled(hub)
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", DeprecationWarning)
+        should_track = is_auto_session_tracking_enabled(hub)
     if should_track:
         hub.start_session(session_mode=session_mode)
     try:
@@ -57,12 +74,26 @@ def auto_session_tracking(hub=None, session_mode="application"):
 def is_auto_session_tracking_enabled_scope(scope):
     # type: (sentry_sdk.Scope) -> bool
     """
-    Utility function to find out if session tracking is enabled.
+    DEPRECATED: Utility function to find out if session tracking is enabled.
+    """
+
+    warnings.warn(
+        "This function is deprecated and will be removed in the next major release. "
+        "There is no public API replacement.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
-    TODO: This uses the new scopes. When the Hub is removed, the function
-    is_auto_session_tracking_enabled should be removed and this function
-    should be renamed to is_auto_session_tracking_enabled.
+    # Internal callers should use private _is_auto_session_tracking_enabled, instead.
+    return _is_auto_session_tracking_enabled(scope)
+
+
+def _is_auto_session_tracking_enabled(scope):
+    # type: (sentry_sdk.Scope) -> bool
+    """
+    Utility function to find out if session tracking is enabled.
     """
+
     should_track = scope._force_auto_session_tracking
     if should_track is None:
         client_options = sentry_sdk.get_client().options
@@ -74,14 +105,29 @@ def is_auto_session_tracking_enabled_scope(scope):
 @contextmanager
 def auto_session_tracking_scope(scope, session_mode="application"):
     # type: (sentry_sdk.Scope, str) -> Generator[None, None, None]
-    """
+    """DEPRECATED: This function is a deprecated alias for track_session.
     Starts and stops a session automatically around a block.
+    """
+
+    warnings.warn(
+        "This function is a deprecated alias for track_session and will be removed in the next major release.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    with track_session(scope, session_mode=session_mode):
+        yield
 
-    TODO: This uses the new scopes. When the Hub is removed, the function
-    auto_session_tracking should be removed and this function
-    should be renamed to auto_session_tracking.
+
+@contextmanager
+def track_session(scope, session_mode="application"):
+    # type: (sentry_sdk.Scope, str) -> Generator[None, None, None]
     """
-    should_track = is_auto_session_tracking_enabled_scope(scope)
+    Start a new session in the provided scope, assuming session tracking is enabled.
+    This is a no-op context manager if session tracking is not enabled.
+    """
+
+    should_track = _is_auto_session_tracking_enabled(scope)
     if should_track:
         scope.start_session(session_mode=session_mode)
     try:

tests/test_sessions.py

@@ -1,7 +1,7 @@
 from unittest import mock
 
 import sentry_sdk
-from sentry_sdk.sessions import auto_session_tracking
+from sentry_sdk.sessions import auto_session_tracking, track_session
 
 
 def sorted_aggregates(item):
@@ -50,6 +50,48 @@ def test_aggregates(sentry_init, capture_envelopes):
     )
     envelopes = capture_envelopes()
 
+    with sentry_sdk.isolation_scope() as scope:
+        with track_session(scope, session_mode="request"):
+            try:
+                scope.set_user({"id": "42"})
+                raise Exception("all is wrong")
+            except Exception:
+                sentry_sdk.capture_exception()
+
+    with sentry_sdk.isolation_scope() as scope:
+        with track_session(scope, session_mode="request"):
+            pass
+
+    sentry_sdk.get_isolation_scope().start_session(session_mode="request")
+    sentry_sdk.get_isolation_scope().end_session()
+    sentry_sdk.flush()
+
+    assert len(envelopes) == 2
+    assert envelopes[0].get_event() is not None
+
+    sess = envelopes[1]
+    assert len(sess.items) == 1
+    sess_event = sess.items[0].payload.json
+    assert sess_event["attrs"] == {
+        "release": "fun-release",
+        "environment": "not-fun-env",
+    }
+
+    aggregates = sorted_aggregates(sess_event)
+    assert len(aggregates) == 1
+    assert aggregates[0]["exited"] == 2
+    assert aggregates[0]["errored"] == 1
+
+
+def test_aggregates_deprecated(
+    sentry_init, capture_envelopes, suppress_deprecation_warnings
+):
+    sentry_init(
+        release="fun-release",
+        environment="not-fun-env",
+    )
+    envelopes = capture_envelopes()
+
     with auto_session_tracking(session_mode="request"):
         with sentry_sdk.new_scope() as scope:
             try:
@@ -90,6 +132,39 @@ def test_aggregates_explicitly_disabled_session_tracking_request_mode(
     )
     envelopes = capture_envelopes()
 
+    with sentry_sdk.isolation_scope() as scope:
+        with track_session(scope, session_mode="request"):
+            try:
+                raise Exception("all is wrong")
+            except Exception:
+                sentry_sdk.capture_exception()
+
+    with sentry_sdk.isolation_scope() as scope:
+        with track_session(scope, session_mode="request"):
+            pass
+
+    sentry_sdk.get_isolation_scope().start_session(session_mode="request")
+    sentry_sdk.get_isolation_scope().end_session()
+    sentry_sdk.flush()
+
+    sess = envelopes[1]
+    assert len(sess.items) == 1
+    sess_event = sess.items[0].payload.json
+
+    aggregates = sorted_aggregates(sess_event)
+    assert len(aggregates) == 1
+    assert aggregates[0]["exited"] == 1
+    assert "errored" not in aggregates[0]
+
+
+def test_aggregates_explicitly_disabled_session_tracking_request_mode_deprecated(
+    sentry_init, capture_envelopes, suppress_deprecation_warnings
+):
+    sentry_init(
+        release="fun-release", environment="not-fun-env", auto_session_tracking=False
+    )
+    envelopes = capture_envelopes()
+
     with auto_session_tracking(session_mode="request"):
         with sentry_sdk.new_scope():
             try:
@@ -120,6 +195,35 @@ def test_no_thread_on_shutdown_no_errors(sentry_init):
         environment="not-fun-env",
     )
 
+    # make it seem like the interpreter is shutting down
+    with mock.patch(
+        "threading.Thread.start",
+        side_effect=RuntimeError("can't create new thread at interpreter shutdown"),
+    ):
+        with sentry_sdk.isolation_scope() as scope:
+            with track_session(scope, session_mode="request"):
+                try:
+                    raise Exception("all is wrong")
+                except Exception:
+                    sentry_sdk.capture_exception()
+
+        with sentry_sdk.isolation_scope() as scope:
+            with track_session(scope, session_mode="request"):
+                pass
+
+        sentry_sdk.get_isolation_scope().start_session(session_mode="request")
+        sentry_sdk.get_isolation_scope().end_session()
+        sentry_sdk.flush()
+
+
+def test_no_thread_on_shutdown_no_errors_deprecated(
+    sentry_init, suppress_deprecation_warnings
+):
+    sentry_init(
+        release="fun-release",
+        environment="not-fun-env",
+    )
+
     # make it seem like the interpreter is shutting down
     with mock.patch(
         "threading.Thread.start",