Merge branch 'master' into potel-base

Author: sentrivana

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

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

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8","3.10","3.12","3.13"]
+        python-version: ["3.8","3.12","3.13"]
         os: [ubuntu-22.04]
     services:
       postgres:

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2.25.1
+
+### Various fixes & improvements
+
+- fix(logs): Add a class which batches groups of logs together. (#4229) by @colin-sentry
+- fix(logs): Use repr instead of json for message and arguments (#4227) by @colin-sentry
+- fix(logs): Debug output from Sentry logs should always be `debug` level. (#4224) by @antonpirker
+- fix(ai): Do not consume anthropic streaming stop (#4232) by @colin-sentry
+- fix(spotlight): Do not spam sentry_sdk.warnings logger w/ Spotlight (#4219) by @BYK
+- fix(docs): fixed code snippet (#4218) by @antonpirker
+- build(deps): bump actions/create-github-app-token from 1.11.7 to 1.12.0 (#4214) by @dependabot
+
 ## 2.25.0
 
 ### Various fixes & improvements
@@ -13,6 +25,8 @@
   This is how you can use it (Sentry Logs is in beta right now so the API can still change):
 
   ```python
+  import logging
+
   import sentry_sdk
   from sentry_sdk.integrations.logging import LoggingIntegration
 
@@ -23,12 +37,11 @@
         "enable_sentry_logs": True
     }
     integrations=[
-      LoggingIntegration(sentry_logs_level="error"),
+      LoggingIntegration(sentry_logs_level=logging.ERROR),
     ]
   )
 
   # Your existing logging setup
-  import logging
   some_logger = logging.Logger("some-logger")
 
   some_logger.info('In this example info events will not be sent to Sentry logs. my_value=%s', my_value)

docs/conf.py

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

scripts/populate_tox/config.py

@@ -29,6 +29,25 @@
     "clickhouse_driver": {
         "package": "clickhouse-driver",
     },
+    "django": {
+        "package": "django",
+        "deps": {
+            "*": [
+                "psycopg2-binary",
+                "djangorestframework",
+                "pytest-django",
+                "Werkzeug",
+            ],
+            ">=3.0": ["pytest-asyncio"],
+            ">=2.2,<3.1": ["six"],
+            "<3.3": [
+                "djangorestframework>=3.0,<4.0",
+                "Werkzeug<2.1.0",
+            ],
+            "<3.1": ["pytest-django<4.0"],
+            ">=2.0": ["channels[daphne]"],
+        },
+    },
     "dramatiq": {
         "package": "dramatiq",
     },

scripts/populate_tox/populate_tox.py

@@ -69,7 +69,6 @@
     "boto3",
     "chalice",
     "cohere",
-    "django",
     "fastapi",
     "gcp",
     "httpx",

scripts/populate_tox/tox.jinja

@@ -80,21 +80,6 @@ envlist =
     {py3.9,py3.11,py3.12}-cohere-v5
     {py3.9,py3.11,py3.12}-cohere-latest
 
-    # Django
-    # - Django 1.x
-    {py3.7}-django-v{1.11}
-    # - Django 2.x
-    {py3.7}-django-v{2.0}
-    {py3.7,py3.9}-django-v{2.2}
-    # - Django 3.x
-    {py3.7,py3.9}-django-v{3.0}
-    {py3.7,py3.9,py3.11}-django-v{3.2}
-    # - Django 4.x
-    {py3.8,py3.11,py3.12}-django-v{4.0,4.1,4.2}
-    # - Django 5.x
-    {py3.10,py3.11,py3.12}-django-v{5.0,5.1}
-    {py3.10,py3.12,py3.13}-django-latest
-
     # FastAPI
     {py3.7,py3.10}-fastapi-v{0.79}
     {py3.8,py3.12,py3.13}-fastapi-latest
@@ -266,35 +251,6 @@ deps =
     cohere-v5: cohere~=5.3.3
     cohere-latest: cohere
 
-    # Django
-    django: psycopg2-binary
-    django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
-    django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne]
-    django-v{2.2,3.0}: six
-    django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0
-    django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0
-    django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django
-    django-v{4.0,4.1,4.2,5.0,5.1}: djangorestframework
-    django-v{4.0,4.1,4.2,5.0,5.1}: pytest-asyncio
-    django-v{4.0,4.1,4.2,5.0,5.1}: Werkzeug
-    django-latest: djangorestframework
-    django-latest: pytest-asyncio
-    django-latest: pytest-django
-    django-latest: Werkzeug
-    django-latest: channels[daphne]
-
-    django-v1.11: Django~=1.11.0
-    django-v2.0: Django~=2.0.0
-    django-v2.2: Django~=2.2.0
-    django-v3.0: Django~=3.0.0
-    django-v3.2: Django~=3.2.0
-    django-v4.0: Django~=4.0.0
-    django-v4.1: Django~=4.1.0
-    django-v4.2: Django~=4.2.0
-    django-v5.0: Django~=5.0.0
-    django-v5.1: Django==5.1rc1
-    django-latest: Django
-
     # FastAPI
     fastapi: httpx
     # (this is a dependency of httpx)

sentry_sdk/__init__.py

@@ -42,7 +42,7 @@
     "start_transaction",
     "trace",
     "monitor",
-    "_experimental_logger",
+    "logger",
 ]
 
 # Initialize the debug support after everything is loaded

sentry_sdk/_log_batcher.py

@@ -0,0 +1,142 @@
+import os
+import random
+import threading
+from datetime import datetime, timezone
+from typing import Optional, List, Callable, TYPE_CHECKING, Any
+
+from sentry_sdk.utils import format_timestamp, safe_repr
+from sentry_sdk.envelope import Envelope
+
+if TYPE_CHECKING:
+    from sentry_sdk._types import Log
+
+
+class LogBatcher:
+    MAX_LOGS_BEFORE_FLUSH = 100
+    FLUSH_WAIT_TIME = 5.0
+
+    def __init__(
+        self,
+        capture_func,  # type: Callable[[Envelope], None]
+    ):
+        # type: (...) -> None
+        self._log_buffer = []  # type: List[Log]
+        self._capture_func = capture_func
+        self._running = True
+        self._lock = threading.Lock()
+
+        self._flush_event = threading.Event()  # type: threading.Event
+
+        self._flusher = None  # type: Optional[threading.Thread]
+        self._flusher_pid = None  # type: Optional[int]
+
+    def _ensure_thread(self):
+        # type: (...) -> bool
+        """For forking processes we might need to restart this thread.
+        This ensures that our process actually has that thread running.
+        """
+        if not self._running:
+            return False
+
+        pid = os.getpid()
+        if self._flusher_pid == pid:
+            return True
+
+        with self._lock:
+            # Recheck to make sure another thread didn't get here and start the
+            # the flusher in the meantime
+            if self._flusher_pid == pid:
+                return True
+
+            self._flusher_pid = pid
+
+            self._flusher = threading.Thread(target=self._flush_loop)
+            self._flusher.daemon = True
+
+            try:
+                self._flusher.start()
+            except RuntimeError:
+                # Unfortunately at this point the interpreter is in a state that no
+                # longer allows us to spawn a thread and we have to bail.
+                self._running = False
+                return False
+
+        return True
+
+    def _flush_loop(self):
+        # type: (...) -> None
+        while self._running:
+            self._flush_event.wait(self.FLUSH_WAIT_TIME + random.random())
+            self._flush_event.clear()
+            self._flush()
+
+    def add(
+        self,
+        log,  # type: Log
+    ):
+        # type: (...) -> None
+        if not self._ensure_thread() or self._flusher is None:
+            return None
+
+        with self._lock:
+            self._log_buffer.append(log)
+            if len(self._log_buffer) >= self.MAX_LOGS_BEFORE_FLUSH:
+                self._flush_event.set()
+
+    def kill(self):
+        # type: (...) -> None
+        if self._flusher is None:
+            return
+
+        self._running = False
+        self._flush_event.set()
+        self._flusher = None
+
+    def flush(self):
+        # type: (...) -> None
+        self._flush()
+
+    @staticmethod
+    def _log_to_otel(log):
+        # type: (Log) -> Any
+        def format_attribute(key, val):
+            # type: (str, int | float | str | bool) -> Any
+            if isinstance(val, bool):
+                return {"key": key, "value": {"boolValue": val}}
+            if isinstance(val, int):
+                return {"key": key, "value": {"intValue": str(val)}}
+            if isinstance(val, float):
+                return {"key": key, "value": {"doubleValue": val}}
+            if isinstance(val, str):
+                return {"key": key, "value": {"stringValue": val}}
+            return {"key": key, "value": {"stringValue": safe_repr(val)}}
+
+        otel_log = {
+            "severityText": log["severity_text"],
+            "severityNumber": log["severity_number"],
+            "body": {"stringValue": log["body"]},
+            "timeUnixNano": str(log["time_unix_nano"]),
+            "attributes": [
+                format_attribute(k, v) for (k, v) in log["attributes"].items()
+            ],
+        }
+
+        if "trace_id" in log:
+            otel_log["traceId"] = log["trace_id"]
+
+        return otel_log
+
+    def _flush(self):
+        # type: (...) -> Optional[Envelope]
+
+        envelope = Envelope(
+            headers={"sent_at": format_timestamp(datetime.now(timezone.utc))}
+        )
+        with self._lock:
+            for log in self._log_buffer:
+                envelope.add_log(self._log_to_otel(log))
+            self._log_buffer.clear()
+        if envelope.items:
+            self._capture_func(envelope)
+            return envelope
+        return None

sentry_sdk/_types.py

@@ -30,6 +30,17 @@ def __eq__(self, other):
 
         return self.value == other.value and self.metadata == other.metadata
 
+    def __str__(self):
+        # type: (AnnotatedValue) -> str
+        return str({"value": str(self.value), "metadata": str(self.metadata)})
+
+    def __len__(self):
+        # type: (AnnotatedValue) -> int
+        if self.value is not None:
+            return len(self.value)
+        else:
+            return 0
+
     @classmethod
     def removed_because_raw_data(cls):
         # type: () -> AnnotatedValue
@@ -151,8 +162,8 @@ class SDKInfo(TypedDict):
     Event = TypedDict(
         "Event",
         {
-            "breadcrumbs": dict[
-                Literal["values"], list[dict[str, Any]]
+            "breadcrumbs": Annotated[
+                dict[Literal["values"], list[dict[str, Any]]]
             ],  # TODO: We can expand on this type
             "check_in_id": str,
             "contexts": dict[str, dict[str, object]],