Merge branch 'potel-base' into srothh/complete-async-transport

srothh · srothh · commit 35a9a72b001d · 2025-08-01T09:49:44.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## 3.0.0a4
+
+### Various fixes & improvements
+
+- Migrate more type comments to annotations (#4651) by @sl0thentr0py
+- ref: Drop experimental logs options in 3.0 (#4653) by @sl0thentr0py
+- Polish migration guide (#4650) by @sl0thentr0py
+- Add `enable_logs`, `before_send_log` as top-level options (#4644) by @sentrivana
+- Add missing return type annotation (#3152) by @sl0thentr0py
+- Fix mypy (#4649) by @sentrivana
+- Better checking for empty tools list (#4647) by @antonpirker
+- ref: Remove `MAX_EVENT_BYTES` (#4630) by @sl0thentr0py
+- update changelog (9276f2a1) by @antonpirker
+- release: 2.34.1 (a71ef66d) by @getsentry-bot
+- typing (#3152) by @sl0thentr0py
+- Update tests (#3152) by @sl0thentr0py
+- Span data is always be a primitive data type (#4643) by @antonpirker
+- Fix typo in CHANGELOG.md (#4640) by @jgillard
+- updated test matrix (#3152) by @sl0thentr0py
+- Add new_trace api to force a new trace (#4642) by @sl0thentr0py
+- Revert "Add new_trace api to force a new trace" (#3152) by @sl0thentr0py
+- Add new_trace api to force a new trace (#3152) by @sl0thentr0py
+- Update changelog (72766a79) by @antonpirker
+- Update CHANGELOG.md (e1848d4f) by @sentrivana
+- release: 2.34.0 (e84f6f30) by @getsentry-bot
+- Considerably raise `DEFAULT_MAX_VALUE_LENGTH` (#4632) by @sentrivana
+- fix(celery): Latency should be in milliseconds, not seconds (#4637) by @sentrivana
+- OpenAI integration update (#4612) by @antonpirker
+
+_Plus 16 more_
+
 ## 3.0.0a3
 
 We're excited to announce that version 3.0 of the Sentry Python SDK is now
diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
@@ -40,6 +40,9 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - `MAX_PROFILE_DURATION_NS`, `PROFILE_MINIMUM_SAMPLES`, `Profile`, `Scheduler`, `ThreadScheduler`, `GeventScheduler`, `has_profiling_enabled`, `setup_profiler`, `teardown_profiler` are no longer accessible from `sentry_sdk.profiler`. They're still accessible from `sentry_sdk.profiler.transaction_profiler`.
 - `DEFAULT_SAMPLING_FREQUENCY`, `MAX_STACK_DEPTH`, `get_frame_name`, `extract_frame`, `extract_stack`, `frame_id` are no longer accessible from `sentry_sdk.profiler`. They're still accessible from `sentry_sdk.profiler.utils`.
 
+#### Logs
+
+- `enable_logs` and `before_send_log` are now regular SDK options. Their original versions under `_experiments` have been removed.
 
 #### Integrations
 - Redis: In Redis pipeline spans there is no `span["data"]["redis.commands"]` that contains a dict `{"count": 3, "first_ten": ["cmd1", "cmd2", ...]}` but instead `span["data"]["redis.commands.count"]` (containing `3`) and `span["data"]["redis.commands.first_ten"]` (containing `["cmd1", "cmd2", ...]`).
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "3.0.0a3"
+release = "3.0.0a4"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/scripts/build_aws_lambda_layer.py b/scripts/build_aws_lambda_layer.py
@@ -3,12 +3,10 @@
 import subprocess
 import sys
 import tempfile
-from typing import TYPE_CHECKING
+from typing import Optional
 
 from sentry_sdk.consts import VERSION as SDK_VERSION
 
-if TYPE_CHECKING:
-    from typing import Optional
 
 DIST_PATH = "dist"  # created by "make dist" that is called by "make aws-lambda-layer"
 PYTHON_SITE_PACKAGES = "python"  # see https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
@@ -17,10 +15,9 @@
 class LayerBuilder:
     def __init__(
         self,
-        base_dir,  # type: str
-        out_zip_filename=None,  # type: Optional[str]
-    ):
-        # type: (...) -> None
+        base_dir: str,
+        out_zip_filename: Optional[str] = None,
+    ) -> None:
         self.base_dir = base_dir
         self.python_site_packages = os.path.join(self.base_dir, PYTHON_SITE_PACKAGES)
         self.out_zip_filename = (
@@ -29,12 +26,10 @@ def __init__(
             else out_zip_filename
         )
 
-    def make_directories(self):
-        # type: (...) -> None
+    def make_directories(self) -> None:
         os.makedirs(self.python_site_packages)
 
-    def install_python_packages(self):
-        # type: (...) -> None
+    def install_python_packages(self) -> None:
         # Install requirements for Lambda Layer (these are more limited than the SDK requirements,
         # because Lambda does not support the newest versions of some packages)
         subprocess.check_call(
@@ -68,8 +63,7 @@ def install_python_packages(self):
             check=True,
         )
 
-    def create_init_serverless_sdk_package(self):
-        # type: (...) -> None
+    def create_init_serverless_sdk_package(self) -> None:
         """
         Method that creates the init_serverless_sdk pkg in the
         sentry-python-serverless zip
@@ -84,8 +78,7 @@ def create_init_serverless_sdk_package(self):
             "scripts/init_serverless_sdk.py", f"{serverless_sdk_path}/__init__.py"
         )
 
-    def zip(self):
-        # type: (...) -> None
+    def zip(self) -> None:
         subprocess.run(
             [
                 "zip",
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
@@ -9,15 +9,11 @@
 import os
 import sys
 import re
+from typing import Any
 
 import sentry_sdk
 from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
 
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Any
-
 
 # Configure Sentry SDK
 sentry_sdk.init(
@@ -70,8 +66,7 @@ def get_lambda_handler(self):
         return getattr(self.lambda_function_module, self.handler_name)
 
 
-def sentry_lambda_handler(event, context):
-    # type: (Any, Any) -> None
+def sentry_lambda_handler(event: Any, context: Any) -> None:
     """
     Handler function that invokes a lambda handler which path is defined in
     environment variables as "SENTRY_INITIAL_HANDLER"
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
@@ -339,6 +339,5 @@ def end_session() -> None:
 
 
 @scopemethod
-def set_transaction_name(name, source=None):
-    # type: (str, Optional[str]) -> None
+def set_transaction_name(name: str, source: Optional[str] = None) -> None:
     return get_current_scope().set_transaction_name(name, source)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -23,8 +23,6 @@
     get_default_release,
     handle_in_app,
     logger,
-    get_before_send_log,
-    has_logs_enabled,
 )
 from sentry_sdk.serializer import serialize
 from sentry_sdk.tracing import trace
@@ -327,7 +325,7 @@ def _capture_envelope(envelope: Envelope) -> None:
 
             self.log_batcher = None
 
-            if has_logs_enabled(self.options):
+            if self.options.get("enable_logs") is True:
                 from sentry_sdk._log_batcher import LogBatcher
 
                 self.log_batcher = LogBatcher(capture_func=_capture_envelope)
@@ -824,7 +822,7 @@ def capture_event(
         return return_value
 
     def _capture_experimental_log(self, log: Optional[Log]) -> None:
-        if not has_logs_enabled(self.options) or log is None:
+        if self.options.get("enable_logs") is not True or log is None:
             return
 
         current_scope = sentry_sdk.get_current_scope()
@@ -879,7 +877,7 @@ def _capture_experimental_log(self, log: Optional[Log]) -> None:
                 f'[Sentry Logs] [{log.get("severity_text")}] {log.get("body")}'
             )
 
-        before_send_log = get_before_send_log(self.options)
+        before_send_log = self.options.get("before_send_log")
         if before_send_log is not None:
             log = before_send_log(log, {})
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -79,8 +79,6 @@ class CompressionAlgo(Enum):
             "transport_num_pools": Optional[int],
             "transport_http2": Optional[bool],
             "transport_async": Optional[bool],
-            "enable_logs": Optional[bool],
-            "before_send_log": Optional[Callable[[Log, Hint], Optional[Log]]],
         },
         total=False,
     )
@@ -1275,4 +1273,4 @@ def _get_default_options() -> dict[str, Any]:
 del _get_default_options
 
 
-VERSION = "3.0.0a3"
+VERSION = "3.0.0a4"
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -712,8 +712,7 @@ def _set_db_data(span: Span, cursor_or_db: Any) -> None:
         span.set_attribute(SPANDATA.SERVER_SOCKET_ADDRESS, server_socket_address)
 
 
-def add_template_context_repr_sequence():
-    # type: () -> None
+def add_template_context_repr_sequence() -> None:
     try:
         from django.template.context import BaseContext
 
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -13,7 +13,6 @@
     event_from_exception,
     current_stacktrace,
     capture_internal_exceptions,
-    has_logs_enabled,
 )
 from sentry_sdk.integrations import Integration
 
@@ -337,7 +336,7 @@ def emit(self, record: LogRecord) -> Any:
             if not client.is_active():
                 return
 
-            if not has_logs_enabled(client.options):
+            if client.options.get("enable_logs") is not True:
                 return
 
             self._capture_log_from_record(client, record)
diff --git a/sentry_sdk/integrations/loguru.py b/sentry_sdk/integrations/loguru.py
@@ -9,7 +9,6 @@
     _BaseHandler,
 )
 from sentry_sdk.logger import _log_level_to_otel
-from sentry_sdk.utils import has_logs_enabled
 
 from typing import TYPE_CHECKING
 
@@ -148,7 +147,7 @@ def loguru_sentry_logs_handler(message: Message) -> None:
     if not client.is_active():
         return
 
-    if not has_logs_enabled(client.options):
+    if client.options.get("enable_logs") is not True:
         return
 
     record = message.record
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
@@ -53,11 +53,10 @@ def add_global_repr_processor(processor: ReprProcessor) -> None:
     global_repr_processors.append(processor)
 
 
-sequence_types = [Sequence, Set]  # type: List[type]
+sequence_types: list[type] = [Sequence, Set]
 
 
-def add_repr_sequence_type(ty):
-    # type: (type) -> None
+def add_repr_sequence_type(ty: type) -> None:
     sequence_types.append(ty)
 
 
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
@@ -59,7 +59,7 @@
     from gevent.hub import Hub as GeventHub
     from opentelemetry.util.types import AttributeValue
 
-    from sentry_sdk._types import Event, ExcInfo, Log, Hint
+    from sentry_sdk._types import Event, ExcInfo
 
     P = ParamSpec("P")
     R = TypeVar("R")
@@ -1875,12 +1875,12 @@ def set_thread_info_from_span(
             data[SPANDATA.THREAD_NAME] = span.get_attribute(SPANDATA.THREAD_NAME)
 
 
-def safe_serialize(data):
-    # type: (Any) -> str
+def safe_serialize(data: Any) -> str:
     """Safely serialize to a readable string."""
 
-    def serialize_item(item):
-        # type: (Any) -> Union[str, dict[Any, Any], list[Any], tuple[Any, ...]]
+    def serialize_item(
+        item: Any,
+    ) -> Union[str, dict[Any, Any], list[Any], tuple[Any, ...]]:
         if callable(item):
             try:
                 module = getattr(item, "__module__", None)
@@ -1919,24 +1919,3 @@ def serialize_item(item):
         return json.dumps(serialized, default=str)
     except Exception:
         return str(data)
-
-
-def has_logs_enabled(options):
-    # type: (Optional[dict[str, Any]]) -> bool
-    if options is None:
-        return False
-
-    return bool(
-        options.get("enable_logs", False)
-        or options["_experiments"].get("enable_logs", False)
-    )
-
-
-def get_before_send_log(options):
-    # type: (Optional[dict[str, Any]]) -> Optional[Callable[[Log, Hint], Optional[Log]]]
-    if options is None:
-        return None
-
-    return options.get("before_send_log") or options["_experiments"].get(
-        "before_send_log"
-    )
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="3.0.0a3",
+    version="3.0.0a4",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/integrations/chalice/test_chalice.py b/tests/integrations/chalice/test_chalice.py
@@ -10,11 +10,10 @@
 from pytest_chalice.handlers import RequestHandler
 
 
-def _generate_lambda_context(self):
+def _generate_lambda_context(self) -> LambdaContext:
     # Monkeypatch of the function _generate_lambda_context
     # from the class LocalGateway
     # for mock the timeout
-    # type: () -> LambdaContext
     if self._config.lambda_timeout is None:
         timeout = 10 * 1000
     else:
diff --git a/tests/integrations/django/test_middleware.py b/tests/integrations/django/test_middleware.py
@@ -5,8 +5,7 @@
 from sentry_sdk.integrations.django.middleware import _wrap_middleware
 
 
-def _sync_capable_middleware_factory(sync_capable):
-    # type: (Optional[bool]) -> type
+def _sync_capable_middleware_factory(sync_capable: Optional[bool]) -> type:
     """Create a middleware class with a sync_capable attribute set to the value passed to the factory.
     If the factory is called with None, the middleware class will not have a sync_capable attribute.
     """
diff --git a/tests/integrations/langchain/test_langchain.py b/tests/integrations/langchain/test_langchain.py
@@ -34,8 +34,8 @@ def get_word_length(word: str) -> int:
     return len(word)
 
 
-global stream_result_mock  # type: Mock
-global llm_type  # type: str
+stream_result_mock: Mock
+llm_type: str
 
 
 class MockOpenAI(ChatOpenAI):
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
diff --git a/tests/profiler/test_transaction_profiler.py b/tests/profiler/test_transaction_profiler.py
diff --git a/tests/test_basics.py b/tests/test_basics.py
diff --git a/tests/test_client.py b/tests/test_client.py
diff --git a/tests/test_logs.py b/tests/test_logs.py
diff --git a/tests/test_tracing_utils.py b/tests/test_tracing_utils.py
diff --git a/tests/test_transport.py b/tests/test_transport.py
diff --git a/tests/test_utils.py b/tests/test_utils.py
