Merge branch 'major/3.0' into ivana/major/drop-support-sqlalchemy

Author: sentrivana

MIGRATION_GUIDE.md

@@ -27,6 +27,9 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 ## Removed
 
 - The SDK no longer supports Python 3.6. The oldest supported version is now 3.7.
+- Dropped support for Django versions below 2.0.
+- Dropped support for gevent versions below 20.9.
+- Dropped support for greenlet versions below 0.4.17.
 - The `enable_tracing` option was removed. Use `traces_sample_rate=1.0` instead.
 - The deprecated `push_scope` and `configure_scope` APIs have been removed. Use `with new_scope():` to push a new scope and `scope = get_current_scope()` to retrieve the current scope instead.
 - Transaction profiling and related code was removed.

scripts/generate-test-files.sh

@@ -8,5 +8,5 @@ cd "$(dirname "$0")"
 
 export UV_PROJECT_ENVIRONMENT=toxgen.venv
 
-uv run --python 3.14t --group toxgen --with-editable .. python populate_tox/populate_tox.py
+uv run --python 3.14t --group toxgen --with-editable .. python populate_tox/populate_tox.py "$@"
 uv run --python 3.14t --group toxgen --with-editable .. python split_tox_gh_actions/split_tox_gh_actions.py

scripts/populate_tox/config.py

@@ -414,10 +414,9 @@
     "redis": {
         "package": "redis",
         "deps": {
-            "*": ["fakeredis!=1.7.4", "pytest<8.0.0"],
+            "*": ["fakeredis!=1.7.4", "pytest<8.0.0", "pytest-asyncio"],
             ">=4.0,<5.0": ["fakeredis<2.31.0"],
             "py3.7,py3.8": ["fakeredis<2.26.0"],
-            "py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13": ["pytest-asyncio"],
         },
     },
     "redis_py_cluster_legacy": {

scripts/populate_tox/package_dependencies.jsonl

@@ -1208,13 +1208,13 @@ def get_releases_to_test(integration, package) -> list[Version] | None:
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "--skip-version-update",
+        "--skip",
         nargs="*",
         default=[],
         help="Integrations to skip version updates for.",
     )
     parser.add_argument(
-        "--only-update",
+        "--only",
         nargs="*",
         default=[],
         help="Only update versions for these integrations (all others will be skipped).",
@@ -1281,12 +1281,17 @@ def main() -> dict[str, list]:
             }
 
     args = parse_args()
-    if args.skip_version_update and args.only_update:
-        print("--skip-version-update and --only-update are mutually exclusive.")
+    if args.skip and args.only:
+        print("--skip and --only are mutually exclusive.")
         sys.exit(1)
 
-    only_update = set(args.only_update)
-    skip_version_updates = set(args.skip_version_update)
+    only_update = set(args.only)
+    if only_update:
+        print(f"Only updating {' '.join(only_update)}.")
+
+    skip_update = set(args.skip)
+    if skip_update:
+        print(f"Skipping updates for {' '.join(skip_update)}.")
 
     # Process packages
     packages = defaultdict(list)
@@ -1301,7 +1306,7 @@ def main() -> dict[str, list]:
             package, extra = _get_package_name(integration)
 
             test_releases = None
-            skip = integration in skip_version_updates or (
+            skip = integration in skip_update or (
                 only_update and integration not in only_update
             )
             if skip:

scripts/populate_tox/populate_tox.py

@@ -1,7 +1,9 @@
+import re
 import warnings
 from typing import TYPE_CHECKING
 
 import sentry_sdk
+from sentry_sdk.utils import logger, parse_version
 
 if TYPE_CHECKING:
     from typing import Any, ContextManager, Optional
@@ -41,11 +43,32 @@ def __exit__(self, exc_type: "Any", exc_value: "Any", tb: "Any") -> None:
             c.close()
 
 
-def _check_python_deprecations() -> None:
-    # Since we're likely to deprecate Python versions in the future, I'm keeping
-    # this handy function around. Use this to detect the Python version used and
-    # to output logger.warning()s if it's deprecated.
-    pass
+def _check_version_deprecations() -> None:
+    try:
+        import gevent
+
+        gevent_version = tuple(
+            int(part) for part in re.split(r"a|b|rc|\.", gevent.__version__)[:2]
+        )
+        if gevent_version < (20, 9):
+            logger.warning(
+                "sentry-sdk 3.x supports gevent 20.9.0 or newer. "
+                "Please upgrade gevent or downgrade to sentry-sdk 2.x."
+            )
+    except Exception:
+        pass
+
+    try:
+        import greenlet
+
+        greenlet_version = parse_version(greenlet.__version__)
+        if greenlet_version is not None and greenlet_version < (0, 4, 17):
+            logger.warning(
+                "sentry-sdk 3.x supports greenlet 0.4.17 or newer. "
+                "Please upgrade greenlet or downgrade to sentry-sdk 2.x."
+            )
+    except Exception:
+        pass
 
 
 def _init(*args: "Optional[str]", **kwargs: "Any") -> "ContextManager[Any]":
@@ -55,7 +78,7 @@ def _init(*args: "Optional[str]", **kwargs: "Any") -> "ContextManager[Any]":
     """
     client = sentry_sdk.Client(*args, **kwargs)
     sentry_sdk.get_global_scope().set_client(client)
-    _check_python_deprecations()
+    _check_version_deprecations()
     rv = _InitGuard(client)
     return rv
 

scripts/populate_tox/releases.jsonl

@@ -1,5 +1,7 @@
 import inspect
 import sys
+import warnings
+from contextvars import ContextVar
 from functools import wraps
 from typing import TYPE_CHECKING
 
@@ -10,14 +12,16 @@
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing import Span
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
-from sentry_sdk.utils import ContextVar, capture_internal_exceptions, reraise
+from sentry_sdk.utils import capture_internal_exceptions, reraise
 
 if TYPE_CHECKING:
     from typing import Any, Awaitable, Callable, Optional, TypeVar, Union
 
     F = TypeVar("F", bound=Union[Callable[..., Any], Callable[..., Awaitable[Any]]])
 
-_ai_pipeline_name = ContextVar("ai_pipeline_name", default=None)
+_ai_pipeline_name: "ContextVar[Optional[str]]" = ContextVar(
+    "ai_pipeline_name", default=None
+)
 
 
 def set_ai_pipeline_name(name: "Optional[str]") -> None:
@@ -29,6 +33,13 @@ def get_ai_pipeline_name() -> "Optional[str]":
 
 
 def ai_track(description: str, **span_kwargs: "Any") -> "Callable[[F], F]":
+    warnings.warn(
+        "sentry_sdk.ai.ai_track is deprecated and will be removed in version 3.0 of sentry-sdk. "
+        "Use the manual span API instead, e.g. sentry_sdk.start_span().",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
     def decorator(f: "F") -> "F":
         def sync_wrapped(*args: "Any", **kwargs: "Any") -> "Any":
             client = sentry_sdk.get_client()

sentry_sdk/_init_implementation.py

@@ -7,6 +7,7 @@
 import uuid
 import warnings
 from collections.abc import Iterable, Mapping
+from contextvars import ContextVar
 from datetime import datetime, timezone
 from importlib import import_module
 from typing import TYPE_CHECKING, Dict, List, cast, overload
@@ -44,7 +45,6 @@
 )
 from sentry_sdk.utils import (
     AnnotatedValue,
-    ContextVar,
     capture_internal_exceptions,
     current_stacktrace,
     datetime_from_isoformat,
@@ -87,7 +87,7 @@
 
     I = TypeVar("I", bound=Integration)  # noqa: E741
 
-_client_init_debug = ContextVar("client_init_debug")
+_client_init_debug: "ContextVar[bool]" = ContextVar("client_init_debug")
 
 
 SDK_INFO: "SDKInfo" = {

sentry_sdk/ai/monitoring.py

@@ -131,11 +131,11 @@ def iter_default_integrations(
     "beam": (2, 12),
     "boto3": (1, 16),  # botocore
     "bottle": (0, 12),
-    "celery": (4, 4, 7),
+    "celery": (5, 0, 0),
     "chalice": (1, 16, 0),
     "clickhouse_driver": (0, 2, 0),
     "cohere": (5, 4, 0),
-    "django": (1, 8),
+    "django": (2, 0),
     "dramatiq": (1, 9),
     "falcon": (1, 4),
     "fastapi": (0, 79, 0),
@@ -146,10 +146,12 @@ def iter_default_integrations(
     "grpc": (1, 32, 0),  # grpcio
     "httpx": (0, 16, 0),
     "httpx2": (2, 0, 0),
+    "huey": (2, 0),
     "huggingface_hub": (0, 24, 7),
     "langchain": (0, 1, 0),
     "langgraph": (0, 6, 6),
     "launchdarkly": (9, 8, 0),
+    "litestar": (2, 0, 0),
     "litellm": (1, 77, 5),
     "loguru": (0, 7, 0),
     "mcp": (1, 15, 0),
@@ -158,18 +160,22 @@ def iter_default_integrations(
     "openfeature": (0, 7, 1),
     "pydantic_ai": (1, 0, 0),
     "pymongo": (3, 5, 0),
+    "pyramid": (1, 8),
     "pyreqwest": (0, 11, 6),
     "quart": (0, 16, 0),
     "ray": (2, 7, 0),
-    "requests": (2, 0, 0),
+    "redis": (2, 10, 0),
+    "requests": (2, 30, 0),
     "rq": (0, 6),
     "sanic": (0, 8),
+    "spark": (3, 0),  # pyspark
     "sqlalchemy": (1, 4),
     "starlette": (0, 16),
     "starlite": (1, 48),
     "statsig": (0, 55, 3),
     "strawberry": (0, 209, 5),
     "tornado": (6, 0),
+    "trytond": (4, 6),
     "typer": (0, 15),
     "unleash": (6, 0, 1),
 }