merge master

Author: alexander-alderman-webb

.github/workflows/warden.yml

@@ -227,7 +227,6 @@ ignore = [
     "N804", # First argument of classmethod should be named cls
 
     # Additional ignores for codebase compatibility
-    "F401", # Unused imports - many in TYPE_CHECKING blocks used for type comments
     "E721", # Use isinstance instead of type() == - existing pattern in this codebase
 ]
 

pyproject.toml

@@ -20,7 +20,6 @@
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from pathlib import Path
-from textwrap import dedent
 from typing import Optional, Union
 
 # Adding the scripts directory to PATH. This is necessary in order to be able

scripts/populate_tox/populate_tox.py

@@ -4,7 +4,7 @@
 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.utils import format_timestamp
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
 
 if TYPE_CHECKING:

sentry_sdk/_batcher.py

@@ -2,7 +2,7 @@
 
 from sentry_sdk._batcher import Batcher
 from sentry_sdk.utils import serialize_attribute
-from sentry_sdk.envelope import Envelope, Item, PayloadRef
+from sentry_sdk.envelope import Item, PayloadRef
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/_log_batcher.py

@@ -2,7 +2,6 @@
 
 from sentry_sdk._batcher import Batcher
 from sentry_sdk.utils import serialize_attribute
-from sentry_sdk.envelope import Item
 
 if TYPE_CHECKING:
     from typing import Any

sentry_sdk/_metrics_batcher.py

@@ -4,14 +4,12 @@
 from typing import TYPE_CHECKING
 
 from sentry_sdk._batcher import Batcher
-from sentry_sdk.consts import SPANSTATUS
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
-from sentry_sdk.utils import format_timestamp, serialize_attribute, safe_repr
+from sentry_sdk.utils import format_timestamp, serialize_attribute
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Optional
     from sentry_sdk.traces import StreamedSpan
-    from sentry_sdk._types import SerializedAttributeValue
 
 
 class SpanBatcher(Batcher["StreamedSpan"]):

sentry_sdk/_span_batcher.py

@@ -1,3 +1,9 @@
+try:
+    from re import Pattern
+except ImportError:
+    # 3.6
+    from typing import Pattern
+
 from typing import TYPE_CHECKING, TypeVar, Union
 
 
@@ -103,7 +109,6 @@ def substituted_because_contains_sensitive_data(cls) -> "AnnotatedValue":
     from typing import Mapping
     from typing import NotRequired
     from typing import Optional
-    from typing import Tuple
     from typing import Type
     from typing_extensions import Literal, TypedDict
 
@@ -361,3 +366,11 @@ class SDKInfo(TypedDict):
     class TextPart(TypedDict):
         type: Literal["text"]
         content: str
+
+    IgnoreSpansName = Union[str, Pattern[str]]
+    IgnoreSpansContext = TypedDict(
+        "IgnoreSpansContext",
+        {"name": IgnoreSpansName, "attributes": Attributes},
+        total=False,
+    )
+    IgnoreSpansConfig = list[Union[IgnoreSpansName, IgnoreSpansContext]]

sentry_sdk/_types.py

@@ -1,8 +1,8 @@
 from .utils import (
-    set_data_normalized,
-    GEN_AI_MESSAGE_ROLE_MAPPING,
-    GEN_AI_MESSAGE_ROLE_REVERSE_MAPPING,
-    normalize_message_role,
-    normalize_message_roles,
-    set_conversation_id,
-)  # noqa: F401
+    set_data_normalized,  # noqa: F401
+    GEN_AI_MESSAGE_ROLE_MAPPING,  # noqa: F401
+    GEN_AI_MESSAGE_ROLE_REVERSE_MAPPING,  # noqa: F401
+    normalize_message_role,  # noqa: F401
+    normalize_message_roles,  # noqa: F401
+    set_conversation_id,  # noqa: F401
+)

sentry_sdk/ai/__init__.py

@@ -1,8 +1,6 @@
 import inspect
 import json
-from collections import deque
 from copy import deepcopy
-from sys import getsizeof
 from typing import TYPE_CHECKING
 
 from sentry_sdk._types import BLOB_DATA_SUBSTITUTE