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

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/populate_tox/package_dependencies.jsonl

@@ -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,6 +1,7 @@
 import inspect
 import sys
 import warnings
+from contextvars import ContextVar
 from functools import wraps
 from typing import TYPE_CHECKING
 
@@ -11,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:

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

@@ -135,7 +135,7 @@ def iter_default_integrations(
     "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),

sentry_sdk/client.py

@@ -41,8 +41,6 @@
     should_propagate_trace,
 )
 from sentry_sdk.utils import (
-    CONTEXTVARS_ERROR_MESSAGE,
-    HAS_REAL_CONTEXTVARS,
     SENSITIVE_DATA_SUBSTITUTE,
     AnnotatedValue,
     _register_control_flow_exception,
@@ -108,14 +106,6 @@ def setup_once() -> None:
         version = parse_version(AIOHTTP_VERSION)
         _check_minimum_version(AioHttpIntegration, version)
 
-        if not HAS_REAL_CONTEXTVARS:
-            # We better have contextvars or we're going to leak state between
-            # requests.
-            raise DidNotEnable(
-                "The aiohttp integration for Sentry requires Python 3.7+ "
-                " or aiocontextvars package." + CONTEXTVARS_ERROR_MESSAGE
-            )
-
         # In the aiohttp integration, all of their HTTP responses are Exceptions.
         # Because they have to be raised and handled by the framework, we need to
         # register the exceptions as control flow exceptions so that we don't

sentry_sdk/integrations/__init__.py

@@ -7,6 +7,7 @@
 import inspect
 import sys
 from contextlib import nullcontext
+from contextvars import ContextVar
 from copy import deepcopy
 from functools import partial
 from typing import TYPE_CHECKING
@@ -42,9 +43,6 @@
 )
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
-    CONTEXTVARS_ERROR_MESSAGE,
-    HAS_REAL_CONTEXTVARS,
-    ContextVar,
     _get_installed_modules,
     capture_internal_exceptions,
     event_from_exception,
@@ -62,7 +60,9 @@
     from sentry_sdk.tracing import Span
 
 
-_asgi_middleware_applied = ContextVar("sentry_asgi_middleware_applied")
+_asgi_middleware_applied: "ContextVar[bool]" = ContextVar(
+    "sentry_asgi_middleware_applied"
+)
 
 _DEFAULT_TRANSACTION_NAME = "generic ASGI request"
 
@@ -114,7 +114,6 @@ class SentryAsgiMiddleware:
     def __init__(
         self,
         app: "Any",
-        unsafe_context_data: bool = False,
         transaction_style: str = "endpoint",
         mechanism_type: str = "asgi",
         span_origin: str = "manual",
@@ -127,15 +126,7 @@ def __init__(
         data to sent events and basic handling for exceptions bubbling up
         through the middleware.
 
-        :param unsafe_context_data: Disable errors when a proper contextvars installation could not be found. We do not recommend changing this from the default.
         """
-        if not unsafe_context_data and not HAS_REAL_CONTEXTVARS:
-            # We better have contextvars or we're going to leak state between
-            # requests.
-            raise RuntimeError(
-                "The ASGI middleware for Sentry requires Python 3.7+ "
-                "or the aiocontextvars package." + CONTEXTVARS_ERROR_MESSAGE
-            )
         if transaction_style not in TRANSACTION_STYLE_VALUES:
             raise ValueError(
                 "Invalid value for transaction_style: %s (must be in %s)"

sentry_sdk/integrations/aiohttp.py

@@ -1,13 +1,14 @@
 import weakref
+from contextvars import ContextVar
 from typing import TYPE_CHECKING
 
 import sentry_sdk
 from sentry_sdk.integrations import Integration
 from sentry_sdk.scope import add_global_event_processor
-from sentry_sdk.utils import ContextVar, logger
+from sentry_sdk.utils import logger
 
 if TYPE_CHECKING:
-    from typing import Optional
+    from typing import Any, Optional
 
     from sentry_sdk._types import Event, Hint
 
@@ -16,7 +17,7 @@ class DedupeIntegration(Integration):
     identifier = "dedupe"
 
     def __init__(self) -> None:
-        self._last_seen = ContextVar("last-seen")
+        self._last_seen: "ContextVar[Any]" = ContextVar("last-seen")
 
     @staticmethod
     def setup_once() -> None: