Merge branch 'master' into romaingd-spi/strip-log-record-name

sentrivana · web-flow · commit 6b7e41c039d1 · 2025-06-10T14:09:39.000+02:00
diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml
@@ -46,6 +46,11 @@ jobs:
           allow-prereleases: true
       - name: Start Redis
         uses: supercharge/redis-github-action@1.8.0
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
@@ -135,6 +140,11 @@ jobs:
           allow-prereleases: true
       - name: Start Redis
         uses: supercharge/redis-github-action@1.8.0
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
@@ -58,14 +58,14 @@
                 "pytest-django",
                 "Werkzeug",
             ],
-            ">=3.0": ["pytest-asyncio"],
+            ">=2.0": ["channels[daphne]"],
             ">=2.2,<3.1": ["six"],
+            ">=3.0": ["pytest-asyncio"],
             "<3.3": [
                 "djangorestframework>=3.0,<4.0",
                 "Werkzeug<2.1.0",
             ],
             "<3.1": ["pytest-django<4.0"],
-            ">=2.0": ["channels[daphne]"],
         },
     },
     "dramatiq": {
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -172,6 +172,7 @@ deps =
     # for justification of the upper bound on pytest
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
+    gevent: pytest-asyncio
 
     # === Integrations ===
 
@@ -362,6 +363,7 @@ setenv =
     py3.6: COVERAGE_RCFILE=.coveragerc36
 
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
+    spark-v{3.0.3,3.5.6}: JAVA_HOME=/usr/lib/jvm/temurin-11-jdk-amd64
 
     common: TESTPATH=tests
     gevent: TESTPATH=tests
diff --git a/scripts/split_tox_gh_actions/split_tox_gh_actions.py b/scripts/split_tox_gh_actions/split_tox_gh_actions.py
@@ -47,6 +47,10 @@
     "aws_lambda",
 }
 
+FRAMEWORKS_NEEDING_JAVA = {
+    "spark",
+}
+
 # Frameworks grouped here will be tested together to not hog all GitHub runners.
 # If you add or remove a group, make sure to git rm the generated YAML file as
 # well.
@@ -288,6 +292,7 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
         "needs_docker": bool(set(frameworks) & FRAMEWORKS_NEEDING_DOCKER),
         "needs_postgres": bool(set(frameworks) & FRAMEWORKS_NEEDING_POSTGRES),
         "needs_redis": bool(set(frameworks) & FRAMEWORKS_NEEDING_REDIS),
+        "needs_java": bool(set(frameworks) & FRAMEWORKS_NEEDING_JAVA),
         "py_versions": {
             category: [f'"{version}"' for version in _normalize_py_versions(versions)]
             for category, versions in py_versions.items()
diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja
@@ -48,6 +48,7 @@
         with:
           python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
           allow-prereleases: true
+
       {% if needs_clickhouse %}
       - name: "Setup ClickHouse Server"
         uses: getsentry/action-clickhouse-in-ci@v1.6
@@ -58,6 +59,14 @@
         uses: supercharge/redis-github-action@1.8.0
       {% endif %}
 
+      {% if needs_java %}
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      {% endif %}
+
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
@@ -170,7 +170,7 @@ class SDKInfo(TypedDict):
             "contexts": dict[str, dict[str, object]],
             "dist": str,
             "duration": Optional[float],
-            "environment": str,
+            "environment": Optional[str],
             "errors": list[dict[str, Any]],  # TODO: We can expand on this type
             "event_id": str,
             "exception": dict[
@@ -188,7 +188,7 @@ class SDKInfo(TypedDict):
             "monitor_slug": Optional[str],
             "platform": Literal["python"],
             "profile": object,  # Should be sentry_sdk.profiler.Profile, but we can't import that here due to circular imports
-            "release": str,
+            "release": Optional[str],
             "request": dict[str, object],
             "sdk": Mapping[str, object],
             "server_name": str,
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING, List, Dict, cast, overload
 import warnings
 
+import sentry_sdk
 from sentry_sdk._compat import PY37, check_uwsgi_thread_support
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -215,8 +216,8 @@ def capture_event(self, *args, **kwargs):
         # type: (*Any, **Any) -> Optional[str]
         return None
 
-    def _capture_experimental_log(self, scope, log):
-        # type: (Scope, Log) -> None
+    def _capture_experimental_log(self, log):
+        # type: (Log) -> None
         pass
 
     def capture_session(self, *args, **kwargs):
@@ -893,12 +894,14 @@ def capture_event(
 
         return return_value
 
-    def _capture_experimental_log(self, current_scope, log):
-        # type: (Scope, Log) -> None
+    def _capture_experimental_log(self, log):
+        # type: (Log) -> None
         logs_enabled = self.options["_experiments"].get("enable_logs", False)
         if not logs_enabled:
             return
-        isolation_scope = current_scope.get_isolation_scope()
+
+        current_scope = sentry_sdk.get_current_scope()
+        isolation_scope = sentry_sdk.get_isolation_scope()
 
         log["attributes"]["sentry.sdk.name"] = SDK_INFO["name"]
         log["attributes"]["sentry.sdk.version"] = SDK_INFO["version"]
@@ -927,6 +930,21 @@ def _capture_experimental_log(self, current_scope, log):
             elif propagation_context is not None:
                 log["trace_id"] = propagation_context.trace_id
 
+        # The user, if present, is always set on the isolation scope.
+        if self.should_send_default_pii() and isolation_scope._user is not None:
+            for log_attribute, user_attribute in (
+                ("user.id", "id"),
+                ("user.name", "username"),
+                ("user.email", "email"),
+            ):
+                if (
+                    user_attribute in isolation_scope._user
+                    and log_attribute not in log["attributes"]
+                ):
+                    log["attributes"][log_attribute] = isolation_scope._user[
+                        user_attribute
+                    ]
+
         # If debug is enabled, log the log to the console
         debug = self.options.get("debug", False)
         if debug:
diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py
@@ -214,7 +214,8 @@ def _sentry_create_worker(*args, **kwargs):
             ]
         if hasattr(settings_cls, "cron_jobs"):
             settings_cls.cron_jobs = [
-                _get_arq_cron_job(cron_job) for cron_job in settings_cls.cron_jobs
+                _get_arq_cron_job(cron_job)
+                for cron_job in (settings_cls.cron_jobs or [])
             ]
 
         if "functions" in kwargs:
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
@@ -237,9 +237,9 @@ async def __acall__(self, *args, **kwargs):
             middleware_span = _check_middleware_span(old_method=f)
 
             if middleware_span is None:
-                return await f(*args, **kwargs)
+                return await f(*args, **kwargs)  # type: ignore
 
             with middleware_span:
-                return await f(*args, **kwargs)
+                return await f(*args, **kwargs)  # type: ignore
 
     return SentryASGIMixin
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -355,7 +355,6 @@ def emit(self, record):
 
     def _capture_log_from_record(self, client, record):
         # type: (BaseClient, LogRecord) -> None
-        scope = sentry_sdk.get_current_scope()
         otel_severity_number, otel_severity_text = _python_level_to_otel(record.levelno)
         project_root = client.options["project_root"]
         attrs = self._extra_from_record(record)  # type: Any
@@ -397,7 +396,6 @@ def _capture_log_from_record(self, client, record):
 
         # noinspection PyProtectedMember
         client._capture_experimental_log(
-            scope,
             {
                 "severity_text": otel_severity_text,
                 "severity_number": otel_severity_number,
diff --git a/sentry_sdk/integrations/redis/_async_common.py b/sentry_sdk/integrations/redis/_async_common.py
@@ -41,13 +41,21 @@ async def _sentry_execute(self, *args, **kwargs):
             origin=SPAN_ORIGIN,
         ) as span:
             with capture_internal_exceptions():
+                try:
+                    command_seq = self._execution_strategy._command_queue
+                except AttributeError:
+                    if is_cluster:
+                        command_seq = self._command_stack
+                    else:
+                        command_seq = self.command_stack
+
                 set_db_data_fn(span, self)
                 _set_pipeline_data(
                     span,
                     is_cluster,
                     get_command_args_fn,
                     False if is_cluster else self.is_transaction,
-                    self._command_stack if is_cluster else self.command_stack,
+                    command_seq,
                 )
 
             return await old_execute(self, *args, **kwargs)
diff --git a/sentry_sdk/integrations/redis/redis_cluster.py b/sentry_sdk/integrations/redis/redis_cluster.py
@@ -36,11 +36,19 @@ def _set_async_cluster_db_data(span, async_redis_cluster_instance):
 def _set_async_cluster_pipeline_db_data(span, async_redis_cluster_pipeline_instance):
     # type: (Span, AsyncClusterPipeline[Any]) -> None
     with capture_internal_exceptions():
+        client = getattr(async_redis_cluster_pipeline_instance, "cluster_client", None)
+        if client is None:
+            # In older redis-py versions, the AsyncClusterPipeline had a `_client`
+            # attr but it is private so potentially problematic and mypy does not
+            # recognize it - see
+            # https://github.com/redis/redis-py/blame/v5.0.0/redis/asyncio/cluster.py#L1386
+            client = (
+                async_redis_cluster_pipeline_instance._client  # type: ignore[attr-defined]
+            )
+
         _set_async_cluster_db_data(
             span,
-            # the AsyncClusterPipeline has always had a `_client` attr but it is private so potentially problematic and mypy
-            # does not recognize it - see https://github.com/redis/redis-py/blame/v5.0.0/redis/asyncio/cluster.py#L1386
-            async_redis_cluster_pipeline_instance._client,  # type: ignore[attr-defined]
+            client,
         )
 
 
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
@@ -76,7 +76,7 @@ async def sentry_execute_request_handler(self, *args, **kwargs):
         else:
 
             @coroutine  # type: ignore
-            def sentry_execute_request_handler(self, *args, **kwargs):  # type: ignore
+            def sentry_execute_request_handler(self, *args, **kwargs):
                 # type: (RequestHandler, *Any, **Any) -> Any
                 with _handle_request_impl(self):
                     result = yield from old_execute(self, *args, **kwargs)
diff --git a/sentry_sdk/logger.py b/sentry_sdk/logger.py
@@ -3,14 +3,13 @@
 import time
 from typing import Any
 
-from sentry_sdk import get_client, get_current_scope
+from sentry_sdk import get_client
 from sentry_sdk.utils import safe_repr
 
 
 def _capture_log(severity_text, severity_number, template, **kwargs):
     # type: (str, int, str, **Any) -> None
     client = get_client()
-    scope = get_current_scope()
 
     attrs = {
         "sentry.message.template": template,
@@ -36,7 +35,6 @@ def _capture_log(severity_text, severity_number, template, **kwargs):
 
     # noinspection PyProtectedMember
     client._capture_experimental_log(
-        scope,
         {
             "severity_text": severity_text,
             "severity_number": severity_number,
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -612,7 +612,7 @@ def create_mock_http_server():
     mock_server_port = get_free_port()
     mock_server = HTTPServer(("localhost", mock_server_port), MockServerRequestHandler)
     mock_server_thread = Thread(target=mock_server.serve_forever)
-    mock_server_thread.setDaemon(True)
+    mock_server_thread.daemon = True
     mock_server_thread.start()
 
     return mock_server_port
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
@@ -6,11 +6,6 @@
 
 import pytest
 
-try:
-    import pytest_asyncio
-except ImportError:
-    pytest_asyncio = None
-
 from aiohttp import web, ClientSession
 from aiohttp.client import ServerDisconnectedError
 from aiohttp.web_request import Request
@@ -27,14 +22,6 @@
 from tests.conftest import ApproxDict
 
 
-if pytest_asyncio is None:
-    # `loop` was deprecated in `pytest-aiohttp`
-    # in favor of `event_loop` from `pytest-asyncio`
-    @pytest.fixture
-    def event_loop(loop):
-        yield loop
-
-
 @pytest.mark.asyncio
 async def test_basic(sentry_init, aiohttp_client, capture_events):
     sentry_init(integrations=[AioHttpIntegration()])
@@ -490,7 +477,7 @@ async def hello(request):
 
 @pytest.mark.asyncio
 async def test_crumb_capture(
-    sentry_init, aiohttp_raw_server, aiohttp_client, event_loop, capture_events
+    sentry_init, aiohttp_raw_server, aiohttp_client, capture_events
 ):
     def before_breadcrumb(crumb, hint):
         crumb["data"]["extra"] = "foo"
@@ -546,7 +533,6 @@ async def test_crumb_capture_client_error(
     sentry_init,
     aiohttp_raw_server,
     aiohttp_client,
-    event_loop,
     capture_events,
     status_code,
     level,
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
@@ -30,6 +30,9 @@
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
 @pytest.mark.forked
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_basic(sentry_init, capture_events, application):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -579,6 +582,9 @@ async def test_asgi_request_body(
         "asyncio.iscoroutinefunction has been replaced in 3.12 by inspect.iscoroutinefunction"
     ),
 )
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_asgi_mixin_iscoroutinefunction_before_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
@@ -636,6 +642,9 @@ def get_response(): ...
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
 async def test_async_view(sentry_init, capture_events, application):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -655,6 +664,9 @@ async def test_async_view(sentry_init, capture_events, application):
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_transaction_http_method_default(
     sentry_init, capture_events, application
 ):
@@ -687,6 +699,9 @@ async def test_transaction_http_method_default(
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_transaction_http_method_custom(sentry_init, capture_events, application):
     sentry_init(
         integrations=[
diff --git a/tests/test_logs.py b/tests/test_logs.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ def _sentry_create_worker(args, *kwargs):`
`214`	`214`	`]`
`215`	`215`	`if hasattr(settings_cls, "cron_jobs"):`
`216`	`216`	`settings_cls.cron_jobs = [`
`217`		`- _get_arq_cron_job(cron_job) for cron_job in settings_cls.cron_jobs`
	`217`	`+ _get_arq_cron_job(cron_job)`
	`218`	`+ for cron_job in (settings_cls.cron_jobs or [])`
`218`	`219`	`]`
`219`	`220`
`220`	`221`	`if "functions" in kwargs:`