merge master

Author: alexander-alderman-webb

.craft.yml

@@ -1,4 +1,4 @@
-minVersion: 0.34.1
+minVersion: 2.17.0
 targets:
   - name: pypi
     includeNames: /^sentry[_\-]sdk.*$/

.git-blame-ignore-revs

@@ -2,3 +2,4 @@
 afea4a017bf13f78e82f725ea9d6a56a8e02cb34
 23a340a9dca60eea36de456def70c00952a33556
 973dda79311cf6b9cb8f1ba67ca0515dfaf9f49c
+e275c9e94323b429f39196881fb992d81a2e52ea

.github/release.yml

@@ -10,23 +10,28 @@ changelog:
         - "Changelog: Feature"
       commit_patterns:
         - "^feat\\b"
+      semver: minor
     - title: Bug Fixes 🐛
       labels:
         - "Changelog: Bugfix"
       commit_patterns:
         - "^(fix|bugfix)\\b"
+      semver: patch
     - title: Deprecations 🏗️
       labels:
         - "Changelog: Deprecation"
       commit_patterns:
         - "deprecat"  # deprecation, deprecated
+      semver: patch
     - title: Documentation 📚
       labels:
         - "Changelog: Docs"
       commit_patterns:
         - "^docs?\\b"
+      semver: patch
     - title: Internal Changes 🔧
       labels:
         - "Changelog: Internal"
       commit_patterns:
         - "^(build|ref|chore|ci|tests?)\\b"
+      semver: patch

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 2.49.0
+
+### New Features ✨
+
+- feat(api): Add `Scope.set_attribute` by @sentrivana in [#5256](https://github.com/getsentry/sentry-python/pull/5256)
+
+### Bug Fixes 🐛
+
+- fix(grpc): Gate third-party imports by @alexander-alderman-webb in [#5246](https://github.com/getsentry/sentry-python/pull/5246)
+- fix(opentelemetry): Gate third-party imports by @alexander-alderman-webb in [#5247](https://github.com/getsentry/sentry-python/pull/5247)
+- fix(ray): Keep variadic kwargs last in signatures by @alexander-alderman-webb in [#5244](https://github.com/getsentry/sentry-python/pull/5244)
+- fix(trytond): Gate third-party imports by @alexander-alderman-webb in [#5245](https://github.com/getsentry/sentry-python/pull/5245)
+- Fix openai count_tokens by @sl0thentr0py in [#5281](https://github.com/getsentry/sentry-python/pull/5281)
+
+### Documentation 📚
+
+- docs: Fix typo in comment by @sentrivana in [#5280](https://github.com/getsentry/sentry-python/pull/5280)
+- docs: Fix `middleware_spans` docstring by @sentrivana in [#5279](https://github.com/getsentry/sentry-python/pull/5279)
+
+### Internal Changes 🔧
+
+- ref(scope): Set global attrs on global scope by @sentrivana in [#5259](https://github.com/getsentry/sentry-python/pull/5259)
+- chore: Ignore type migration for scripts/ and tests/ in blame by @alexander-alderman-webb in [#5284](https://github.com/getsentry/sentry-python/pull/5284)
+- ref: Properly override parent func by @sentrivana in [#5283](https://github.com/getsentry/sentry-python/pull/5283)
+- ci: Allow to use Craft's new auto-versioning by @sentrivana in [#5218](https://github.com/getsentry/sentry-python/pull/5218)
+- ref: Deduplicate batchers by @sentrivana in [#5263](https://github.com/getsentry/sentry-python/pull/5263)
+- tests: Add dedicated transport format test for metrics, logs by @sentrivana in [#5264](https://github.com/getsentry/sentry-python/pull/5264)
+- ci: 🤖 Update test matrix with new releases (01/05) by @github-actions in [#5273](https://github.com/getsentry/sentry-python/pull/5273)
+- tests: General logs tests should use Sentry logs API by @sentrivana in [#5262](https://github.com/getsentry/sentry-python/pull/5262)
+- tests: Test preserialization of attributes by @sentrivana in [#5260](https://github.com/getsentry/sentry-python/pull/5260)
+- ci: Unpin Pydantic 1.x version in tests by @alexander-alderman-webb in [#5261](https://github.com/getsentry/sentry-python/pull/5261)
+- ref: Make logs, metrics go via scope by @sentrivana in [#5213](https://github.com/getsentry/sentry-python/pull/5213)
+- ci: Fix failing arq, fastapi tests on 3.7; update test matrix by @sentrivana in [#5258](https://github.com/getsentry/sentry-python/pull/5258)
+
 ## 2.48.0
 
 Middleware spans are now disabled by default in Django, Starlette and FastAPI integrations. Set the `middleware_spans` integration-level

README.md

@@ -9,7 +9,7 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
 [![Discord](https://img.shields.io/discord/621778831602221064?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb)](https://discord.com/invite/Ww9hbqr)
 [![X Follow](https://img.shields.io/twitter/follow/sentry?label=sentry&style=social)](https://x.com/intent/follow?screen_name=sentry)
 [![PyPi page link -- version](https://img.shields.io/pypi/v/sentry-sdk.svg)](https://pypi.python.org/pypi/sentry-sdk)
-<img src="https://img.shields.io/badge/python-3.7 | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | 3.13-blue.svg" alt="python">
+<img src="https://img.shields.io/badge/python-3.7 | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | 3.13 | 3.14-blue.svg" alt="python">
 [![Build Status](https://github.com/getsentry/sentry-python/actions/workflows/ci.yml/badge.svg)](https://github.com/getsentry/sentry-python/actions/workflows/ci.yml)
 
 <br/>

docs/conf.py

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

scripts/populate_tox/package_dependencies.jsonl

@@ -0,0 +1,139 @@
+import os
+import random
+import threading
+from datetime import datetime, timezone
+from typing import TYPE_CHECKING, TypeVar, Generic
+
+from sentry_sdk.utils import format_timestamp, safe_repr, serialize_attribute
+from sentry_sdk.envelope import Envelope, Item, PayloadRef
+
+if TYPE_CHECKING:
+    from typing import Optional, Callable, Any
+
+T = TypeVar("T")
+
+
+class Batcher(Generic[T]):
+    MAX_BEFORE_FLUSH = 100
+    MAX_BEFORE_DROP = 1_000
+    FLUSH_WAIT_TIME = 5.0
+
+    TYPE = ""
+    CONTENT_TYPE = ""
+
+    def __init__(
+        self,
+        capture_func: "Callable[[Envelope], None]",
+        record_lost_func: "Callable[..., None]",
+    ) -> None:
+        self._buffer: "list[T]" = []
+        self._capture_func = capture_func
+        self._record_lost_func = record_lost_func
+        self._running = True
+        self._lock = threading.Lock()
+
+        self._flush_event: "threading.Event" = threading.Event()
+
+        self._flusher: "Optional[threading.Thread]" = None
+        self._flusher_pid: "Optional[int]" = None
+
+    def _ensure_thread(self) -> 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) -> None:
+        while self._running:
+            self._flush_event.wait(self.FLUSH_WAIT_TIME + random.random())
+            self._flush_event.clear()
+            self._flush()
+
+    def add(self, item: "T") -> None:
+        if not self._ensure_thread() or self._flusher is None:
+            return None
+
+        with self._lock:
+            if len(self._buffer) >= self.MAX_BEFORE_DROP:
+                self._record_lost(item)
+                return None
+
+            self._buffer.append(item)
+            if len(self._buffer) >= self.MAX_BEFORE_FLUSH:
+                self._flush_event.set()
+
+    def kill(self) -> None:
+        if self._flusher is None:
+            return
+
+        self._running = False
+        self._flush_event.set()
+        self._flusher = None
+
+    def flush(self) -> None:
+        self._flush()
+
+    def _add_to_envelope(self, envelope: "Envelope") -> None:
+        envelope.add_item(
+            Item(
+                type=self.TYPE,
+                content_type=self.CONTENT_TYPE,
+                headers={
+                    "item_count": len(self._buffer),
+                },
+                payload=PayloadRef(
+                    json={
+                        "items": [
+                            self._to_transport_format(item) for item in self._buffer
+                        ]
+                    }
+                ),
+            )
+        )
+
+    def _flush(self) -> "Optional[Envelope]":
+        envelope = Envelope(
+            headers={"sent_at": format_timestamp(datetime.now(timezone.utc))}
+        )
+        with self._lock:
+            if len(self._buffer) == 0:
+                return None
+
+            self._add_to_envelope(envelope)
+            self._buffer.clear()
+
+        self._capture_func(envelope)
+        return envelope
+
+    def _record_lost(self, item: "T") -> None:
+        pass
+
+    @staticmethod
+    def _to_transport_format(item: "T") -> "Any":
+        pass