Merge branch 'master' into antonpirker/openai-agents-integration

Author: antonpirker

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

@@ -46,6 +46,11 @@ jobs:
           allow-prereleases: true
       - name: Start Redis
         uses: supercharge/[email protected]
+      - 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/[email protected]
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## 2.30.0
+
+### Various fixes & improvements
+
+- **New beta feature:** Sentry logs for Loguru (#4445) by @sentrivana
+
+  We can now capture Loguru logs and send them to Sentry.
+
+```python
+import sentry_sdk
+from sentry_sdk.integrations.loguru import LoguruIntegration
+
+# Setup Sentry SDK to send Loguru log messages with a level of "error" or higher to Sentry
+sentry_sdk.init(
+    _experiments={
+        "enable_logs": True,
+    },
+    integrations=[
+        LoguruIntegration(sentry_logs_level=logging.ERROR),
+    ]
+)
+```
+
+- fix(logs): Don't gate user behind `send_default_pii` (#4453) by @AbhiPrasad
+- fix(logging): Strip log `record.name` for more robust matching (#4411) by @romaingd-spi
+- Migrate to modern threading interface (#4452) by @emmanuel-ferdman
+- ref: Remove `_capture_experimental_log` `scope` parameter (#4424) by @szokeasaurusrex
+- feat(logs): Add user attributes to logs (#4423) by @szokeasaurusrex
+- fix: fix ARQ integration error (#4427) (#4428) by @ninoseki
+- fix(grpc): Fix AttributeError when instrumenting with OTel (#4405) by @sentrivana
+- fix(redis): Use `command_queue` instead of `command_stack` if available (#4404) by @sentrivana
+- fix: Handle invalid `SENTRY_DEBUG` values properly (#4400) by @szokeasaurusrex
+- Increase test coverage (#4393) by @mgaligniana
+- tests(logs): avoid failures when running with integrations enabled (#4388) by @rominf
+- Fix CI, adapt to new redis-py release (#4431) by @sentrivana
+- tests: Regenerate toxgen (#4403) by @sentrivana
+- tests: Regenerate tox.ini & fix CI (#4435) by @sentrivana
+- build(deps): bump codecov/codecov-action from 5.4.2 to 5.4.3 (#4397) by @dependabot
+
 ## 2.29.1
 
 ### Various fixes & improvements
@@ -122,7 +161,7 @@
   sentry_sdk.init(
     dsn="...",
     _experiments={
-        "enable_sentry_logs": True
+        "enable_logs": True
     }
     integrations=[
       LoggingIntegration(sentry_logs_level=logging.ERROR),

docs/conf.py

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

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": {

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

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.
@@ -289,6 +293,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()

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/[email protected]
@@ -58,6 +59,14 @@
         uses: supercharge/[email protected]
       {% 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

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 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:

sentry_sdk/consts.py

@@ -1175,4 +1175,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.29.1"
+VERSION = "2.30.0"

sentry_sdk/integrations/logging.py

@@ -5,6 +5,7 @@
 
 import sentry_sdk
 from sentry_sdk.client import BaseClient
+from sentry_sdk.logger import _log_level_to_otel
 from sentry_sdk.utils import (
     safe_repr,
     to_string,
@@ -14,7 +15,7 @@
 )
 from sentry_sdk.integrations import Integration
 
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import MutableMapping
@@ -36,6 +37,16 @@
     logging.CRITICAL: "fatal",  # CRITICAL is same as FATAL
 }
 
+# Map logging level numbers to corresponding OTel level numbers
+SEVERITY_TO_OTEL_SEVERITY = {
+    logging.CRITICAL: 21,  # fatal
+    logging.ERROR: 17,  # error
+    logging.WARNING: 13,  # warn
+    logging.INFO: 9,  # info
+    logging.DEBUG: 5,  # debug
+}
+
+
 # Capturing events from those loggers causes recursion errors. We cannot allow
 # the user to unconditionally create events from those loggers under any
 # circumstances.
@@ -119,7 +130,10 @@ def sentry_patched_callhandlers(self, record):
                 # the integration.  Otherwise we have a high chance of getting
                 # into a recursion error when the integration is resolved
                 # (this also is slower).
-                if ignored_loggers is not None and record.name not in ignored_loggers:
+                if (
+                    ignored_loggers is not None
+                    and record.name.strip() not in ignored_loggers
+                ):
                     integration = sentry_sdk.get_client().get_integration(
                         LoggingIntegration
                     )
@@ -164,7 +178,7 @@ def _can_record(self, record):
         # type: (LogRecord) -> bool
         """Prevents ignored loggers from recording"""
         for logger in _IGNORED_LOGGERS:
-            if fnmatch(record.name, logger):
+            if fnmatch(record.name.strip(), logger):
                 return False
         return True
 
@@ -312,21 +326,6 @@ def _breadcrumb_from_record(self, record):
         }
 
 
-def _python_level_to_otel(record_level):
-    # type: (int) -> Tuple[int, str]
-    for py_level, otel_severity_number, otel_severity_text in [
-        (50, 21, "fatal"),
-        (40, 17, "error"),
-        (30, 13, "warn"),
-        (20, 9, "info"),
-        (10, 5, "debug"),
-        (5, 1, "trace"),
-    ]:
-        if record_level >= py_level:
-            return otel_severity_number, otel_severity_text
-    return 0, "default"
-
-
 class SentryLogsHandler(_BaseHandler):
     """
     A logging handler that records Sentry logs for each Python log record.
@@ -352,8 +351,9 @@ 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)
+        otel_severity_number, otel_severity_text = _log_level_to_otel(
+            record.levelno, SEVERITY_TO_OTEL_SEVERITY
+        )
         project_root = client.options["project_root"]
         attrs = self._extra_from_record(record)  # type: Any
         attrs["sentry.origin"] = "auto.logger.log"
@@ -364,10 +364,7 @@ def _capture_log_from_record(self, client, record):
                 for i, arg in enumerate(record.args):
                     attrs[f"sentry.message.parameter.{i}"] = (
                         arg
-                        if isinstance(arg, str)
-                        or isinstance(arg, float)
-                        or isinstance(arg, int)
-                        or isinstance(arg, bool)
+                        if isinstance(arg, (str, float, int, bool))
                         else safe_repr(arg)
                     )
         if record.lineno:
@@ -394,7 +391,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,