merge

Author: alexander-alderman-webb

MIGRATION_GUIDE.md

@@ -26,6 +26,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - In the AWS Lambda and GCP integrations, the message of the warning the SDK optionally emits if a function is about to time out has changed.
 - We changed the way we emit warnings. Deprecations will from now on be always emitted using `warnings.warn()`, while all other warnings will be emitted using `logger.warning()`.
 - `sentry_sdk.init()` can no longer be used as a context manager.
+- The `@trace` decorator doesn't accept a `template` parameter anymore.
 
 ### Logging
 
@@ -113,6 +114,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - Dropped support for Litestar below 2.0.
 - Dropped support for PySpark below 3.0.
 - Dropped support for redis-py below 4.2.
+- Dropped support for Pydantic AI below 1.76.
 - Removed the RedisIntegration `max_data_size` option.
 - Removed the possibility to supply a specific client to the LaunchDarklyIntegration.
 - The `enable_tracing` option was removed. Use `traces_sample_rate=1.0` instead.
@@ -150,6 +152,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - The SDK won't set any tags on its own anymore.
 - The `update_current_span` API was removed.
 - `SanicIntegration` no longer accepts `unsampled_statuses`.
+- The `trace_ignore_status_codes` option was removed.
 
 
 ## Deprecated

sentry_sdk/ai/monitoring.py

@@ -1,4 +1,3 @@
-from contextvars import ContextVar
 from typing import TYPE_CHECKING
 
 from sentry_sdk.ai.utils import _set_span_data_attribute
@@ -11,18 +10,6 @@
 
     F = TypeVar("F", bound=Union[Callable[..., Any], Callable[..., Awaitable[Any]]])
 
-_ai_pipeline_name: "ContextVar[Optional[str]]" = ContextVar(
-    "ai_pipeline_name", default=None
-)
-
-
-def set_ai_pipeline_name(name: "Optional[str]") -> None:
-    _ai_pipeline_name.set(name)
-
-
-def get_ai_pipeline_name() -> "Optional[str]":
-    return _ai_pipeline_name.get()
-
 
 def record_token_usage(
     span: "Union[Span, StreamedSpan]",
@@ -33,11 +20,6 @@ def record_token_usage(
     output_tokens_reasoning: "Optional[int]" = None,
     total_tokens: "Optional[int]" = None,
 ) -> None:
-    # TODO: move pipeline name elsewhere
-    ai_pipeline_name = get_ai_pipeline_name()
-    if ai_pipeline_name:
-        _set_span_data_attribute(span, SPANDATA.GEN_AI_PIPELINE_NAME, ai_pipeline_name)
-
     if input_tokens is not None:
         _set_span_data_attribute(span, SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, input_tokens)
 

sentry_sdk/client.py

@@ -364,11 +364,6 @@ def _get_options(*args: "Optional[str]", **kwargs: "Any") -> "Dict[str, Any]":
             env_to_bool(os.environ.get("SENTRY_KEEP_ALIVE"), strict=True) or False
         )
 
-    if rv["trace_ignore_status_codes"] and has_span_streaming_enabled(rv):
-        logger.warning(
-            "The `trace_ignore_status_codes` parameter is ignored in span streaming mode.",
-        )
-
     if rv["ignore_spans"] and not has_span_streaming_enabled(rv):
         logger.warning(
             "The `ignore_spans` parameter only works when `trace_lifecycle` is set to `stream`.",

sentry_sdk/consts.py

@@ -29,7 +29,6 @@ class CompressionAlgo(Enum):
 
 if TYPE_CHECKING:
     from typing import (
-        AbstractSet,
         Any,
         Callable,
         Dict,
@@ -94,16 +93,6 @@ class CompressionAlgo(Enum):
 ]
 
 
-class SPANTEMPLATE(str, Enum):
-    DEFAULT = "default"
-    AI_AGENT = "ai_agent"
-    AI_TOOL = "ai_tool"
-    AI_CHAT = "ai_chat"
-
-    def __str__(self) -> str:
-        return self.value
-
-
 class SPANNAME:
     DB_COMMIT = "COMMIT"
     DB_ROLLBACK = "ROLLBACK"
@@ -1344,7 +1333,6 @@ def __init__(
         add_full_stack: bool = DEFAULT_ADD_FULL_STACK,
         max_stack_frames: "Optional[int]" = DEFAULT_MAX_STACK_FRAMES,
         before_send_log: "Optional[Callable[[Log, Hint], Optional[Log]]]" = None,
-        trace_ignore_status_codes: "AbstractSet[int]" = frozenset(),
         before_send_metric: "Optional[Callable[[Metric, Hint], Optional[Metric]]]" = None,
         before_send_span: "Optional[Callable[[SpanJSON, Hint], Optional[SpanJSON]]]" = None,
         org_id: "Optional[str]" = None,
@@ -1725,16 +1713,6 @@ def __init__(
             function will be retained. If the function returns None, the log will
             not be sent to Sentry.
 
-        :param trace_ignore_status_codes: An optional property that disables tracing for
-            HTTP requests with certain status codes.
-
-            Requests are not traced if the status code is contained in the provided set.
-
-            If `trace_ignore_status_codes` is not provided, requests with any status code
-            may be traced.
-
-            This option has no effect in span streaming mode (`trace_lifecycle="stream"`).
-
         :param strict_trace_continuation: If set to `True`, the SDK will only continue a trace if the `org_id` of the incoming trace found in the
            `baggage` header matches the `org_id` of the current Sentry client and only if BOTH are present.
 

sentry_sdk/tracing.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, cast
 
 import sentry_sdk
-from sentry_sdk.consts import SPANDATA, SPANSTATUS, SPANTEMPLATE
+from sentry_sdk.consts import SPANDATA, SPANSTATUS
 from sentry_sdk.profiler.continuous_profiler import get_profiler_id
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -915,32 +915,6 @@ def finish(
 
         super().finish(scope, end_timestamp)
 
-        status_code = self._data.get(SPANDATA.HTTP_STATUS_CODE)
-        if (
-            status_code is not None
-            and status_code in client.options["trace_ignore_status_codes"]
-        ):
-            logger.debug(
-                "[Tracing] Discarding {transaction_description} because the HTTP status code {status_code} is matched by trace_ignore_status_codes: {trace_ignore_status_codes}".format(
-                    transaction_description=self._get_log_representation(),
-                    status_code=self._data[SPANDATA.HTTP_STATUS_CODE],
-                    trace_ignore_status_codes=client.options[
-                        "trace_ignore_status_codes"
-                    ],
-                )
-            )
-            if client.transport:
-                client.transport.record_lost_event(
-                    "event_processor", data_category="transaction"
-                )
-
-                num_spans = len(self._span_recorder.spans) + 1
-                client.transport.record_lost_event(
-                    "event_processor", data_category="span", quantity=num_spans
-                )
-
-            self.sampled = False
-
         if not self.sampled:
             # At this point a `sampled = None` should have already been resolved
             # to a concrete decision.
@@ -1248,7 +1222,6 @@ def trace(
         op: "Optional[str]" = None,
         name: "Optional[str]" = None,
         attributes: "Optional[dict[str, Any]]" = None,
-        template: "SPANTEMPLATE" = SPANTEMPLATE.DEFAULT,
     ) -> "Callable[[Callable[P, R]], Callable[P, R]]":
         # Handles: @trace() and @trace(op="custom")
         pass
@@ -1265,7 +1238,6 @@ def trace(
     op: "Optional[str]" = None,
     name: "Optional[str]" = None,
     attributes: "Optional[dict[str, Any]]" = None,
-    template: "SPANTEMPLATE" = SPANTEMPLATE.DEFAULT,
 ) -> "Union[Callable[P, R], Callable[[Callable[P, R]], Callable[P, R]]]":
     """
     Decorator to start a child span around a function call.
@@ -1295,21 +1267,14 @@ def trace(
         attributes provide additional context about the span's execution.
     :type attributes: dict[str, Any] or None
 
-    :param template: The type of span to create. This determines what kind of
-        span instrumentation and data collection will be applied. Use predefined
-        constants from :py:class:`sentry_sdk.consts.SPANTEMPLATE`.
-        The default is `SPANTEMPLATE.DEFAULT` which is the right choice for most
-        use cases.
-    :type template: :py:class:`sentry_sdk.consts.SPANTEMPLATE`
-
     :returns: When used as ``@trace``, returns the decorated function. When used as
         ``@trace(...)`` with parameters, returns a decorator function.
     :rtype: Callable or decorator function
 
     Example::
 
         import sentry_sdk
-        from sentry_sdk.consts import OP, SPANTEMPLATE
+        from sentry_sdk.consts import OP
 
         # Simple usage with default values
         @sentry_sdk.trace
@@ -1326,20 +1291,13 @@ def process_data():
         def make_db_query(sql):
             # Function implementation
             pass
-
-        # With a custom template
-        @sentry_sdk.trace(template=SPANTEMPLATE.AI_TOOL)
-        def calculate_interest_rate(amount, rate, years):
-            # Function implementation
-            pass
     """
     from sentry_sdk.tracing_utils import create_span_decorator
 
     decorator = create_span_decorator(
         op=op,
         name=name,
         attributes=attributes,
-        template=template,
     )
 
     if func: