sentry-sdk 3.0.0a3__tar.gz → 3.0.0a4__tar.gz

{sentry_sdk-3.0.0a3/sentry_sdk.egg-info → sentry_sdk-3.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 3.0.0a3
+Version: 3.0.0a4
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/__init__.py

@@ -22,6 +22,7 @@ __all__ = [  # noqa
     "capture_exception",
     "capture_message",
     "continue_trace",
+    "new_trace",
     "flush",
     "get_baggage",
     "get_client",
@@ -47,6 +48,7 @@ __all__ = [  # noqa
     "logger",
     "start_session",
     "end_session",
+    "set_transaction_name",
 ]
 
 # Initialize the debug support after everything is loaded

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/ai/monitoring.py

@@ -31,14 +31,14 @@ def ai_track(description: str, **span_kwargs: Any) -> Callable[..., Any]:
             op = span_kwargs.pop("op", "ai.run" if curr_pipeline else "ai.pipeline")
 
             with start_span(
-                name=description, op=op, only_if_parent=True, **span_kwargs
+                name=description, op=op, only_as_child_span=True, **span_kwargs
             ) as span:
                 for k, v in kwargs.pop("sentry_tags", {}).items():
                     span.set_tag(k, v)
                 for k, v in kwargs.pop("sentry_data", {}).items():
                     span.set_attribute(k, v)
                 if curr_pipeline:
-                    span.set_attribute(SPANDATA.AI_PIPELINE_NAME, curr_pipeline)
+                    span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, curr_pipeline)
                     return f(*args, **kwargs)
                 else:
                     _ai_pipeline_name.set(description)
@@ -61,14 +61,14 @@ def ai_track(description: str, **span_kwargs: Any) -> Callable[..., Any]:
             op = span_kwargs.pop("op", "ai.run" if curr_pipeline else "ai.pipeline")
 
             with start_span(
-                name=description, op=op, only_if_parent=True, **span_kwargs
+                name=description, op=op, only_as_child_span=True, **span_kwargs
             ) as span:
                 for k, v in kwargs.pop("sentry_tags", {}).items():
                     span.set_tag(k, v)
                 for k, v in kwargs.pop("sentry_data", {}).items():
                     span.set_attribute(k, v)
                 if curr_pipeline:
-                    span.set_attribute(SPANDATA.AI_PIPELINE_NAME, curr_pipeline)
+                    span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, curr_pipeline)
                     return await f(*args, **kwargs)
                 else:
                     _ai_pipeline_name.set(description)
@@ -105,7 +105,7 @@ def record_token_usage(
     # TODO: move pipeline name elsewhere
     ai_pipeline_name = get_ai_pipeline_name()
     if ai_pipeline_name:
-        span.set_attribute(SPANDATA.AI_PIPELINE_NAME, ai_pipeline_name)
+        span.set_attribute(SPANDATA.GEN_AI_PIPELINE_NAME, ai_pipeline_name)
 
     if input_tokens is not None:
         span.set_attribute(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, input_tokens)
@@ -117,10 +117,10 @@ def record_token_usage(
         )
 
     if output_tokens is not None:
-        span.set_data(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens)
+        span.set_attribute(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens)
 
     if output_tokens_reasoning is not None:
-        span.set_data(
+        span.set_attribute(
             SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS_REASONING,
             output_tokens_reasoning,
         )

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/ai/utils.py

@@ -23,9 +23,13 @@ def _normalize_data(data: Any) -> Any:
         return list(_normalize_data(x) for x in data)
     if isinstance(data, dict):
         return {k: _normalize_data(v) for (k, v) in data.items()}
+
     return data
 
 
 def set_data_normalized(span: Span, key: str, value: Any) -> None:
     normalized = _normalize_data(value)
-    span.set_attribute(key, normalized)
+    if isinstance(normalized, (int, float, bool, str)):
+        span.set_attribute(key, normalized)
+    else:
+        span.set_attribute(key, str(normalized))

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/api.py

@@ -48,6 +48,7 @@ __all__ = [
     "capture_exception",
     "capture_message",
     "continue_trace",
+    "new_trace",
     "flush",
     "get_baggage",
     "get_client",
@@ -74,6 +75,7 @@ __all__ = [
     "use_isolation_scope",
     "start_session",
     "end_session",
+    "set_transaction_name",
 ]
 
 
@@ -315,6 +317,15 @@ def continue_trace(environ_or_headers: dict[str, Any]) -> Generator[None, None,
         yield
 
 
+@contextmanager
+def new_trace() -> Generator[None, None, None]:
+    """
+    Force creation of a new trace.
+    """
+    with get_isolation_scope().new_trace():
+        yield
+
+
 @scopemethod
 def start_session(
     session_mode: str = "application",
@@ -325,3 +336,8 @@ def start_session(
 @scopemethod
 def end_session() -> None:
     return get_isolation_scope().end_session()
+
+
+@scopemethod
+def set_transaction_name(name: str, source: Optional[str] = None) -> None:
+    return get_current_scope().set_transaction_name(name, source)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/client.py

@@ -46,7 +46,6 @@ from sentry_sdk.profiler.transaction_profiler import (
 )
 from sentry_sdk.scrubber import EventScrubber
 from sentry_sdk.monitor import Monitor
-from sentry_sdk.spotlight import setup_spotlight
 
 if TYPE_CHECKING:
     from typing import (
@@ -323,9 +322,9 @@ class _Client(BaseClient):
 
             self.session_flusher = SessionFlusher(capture_func=_capture_envelope)
 
-            experiments = self.options.get("_experiments", {})
             self.log_batcher = None
-            if experiments.get("enable_logs", False):
+
+            if self.options.get("enable_logs") is True:
                 from sentry_sdk._log_batcher import LogBatcher
 
                 self.log_batcher = LogBatcher(capture_func=_capture_envelope)
@@ -358,6 +357,10 @@ class _Client(BaseClient):
                 )
 
             if self.options.get("spotlight"):
+                # This is intentionally here to prevent setting up spotlight
+                # stuff we don't need unless spotlight is explicitly enabled
+                from sentry_sdk.spotlight import setup_spotlight
+
                 self.spotlight = setup_spotlight(self.options)
                 if not self.options["dsn"]:
                     sample_all = lambda *_args, **_kwargs: 1.0
@@ -817,9 +820,8 @@ class _Client(BaseClient):
 
         return return_value
 
-    def _capture_experimental_log(self, log: Log) -> None:
-        logs_enabled = self.options["_experiments"].get("enable_logs", False)
-        if not logs_enabled:
+    def _capture_experimental_log(self, log: Optional[Log]) -> None:
+        if self.options.get("enable_logs") is not True or log is None:
             return
 
         current_scope = sentry_sdk.get_current_scope()
@@ -874,9 +876,10 @@ class _Client(BaseClient):
                 f'[Sentry Logs] [{log.get("severity_text")}] {log.get("body")}'
             )
 
-        before_send_log = self.options["_experiments"].get("before_send_log")
+        before_send_log = self.options.get("before_send_log")
         if before_send_log is not None:
             log = before_send_log(log, {})
+
         if log is None:
             return
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/consts.py

@@ -17,7 +17,10 @@ if TYPE_CHECKING:
     )
 
 # up top to prevent circular import due to integration import
-DEFAULT_MAX_VALUE_LENGTH = 1024
+# This is more or less an arbitrary large-ish value for now, so that we allow
+# pretty long strings (like LLM prompts), but still have *some* upper limit
+# until we verify that removing the trimming completely is safe.
+DEFAULT_MAX_VALUE_LENGTH = 100_000
 
 DEFAULT_MAX_STACK_FRAMES = 100
 DEFAULT_ADD_FULL_STACK = False
@@ -75,8 +78,6 @@ if TYPE_CHECKING:
             "transport_compression_algo": Optional[CompressionAlgo],
             "transport_num_pools": Optional[int],
             "transport_http2": Optional[bool],
-            "enable_logs": Optional[bool],
-            "before_send_log": Optional[Callable[[Log, Hint], Optional[Log]]],
         },
         total=False,
     )
@@ -167,6 +168,7 @@ class SPANDATA:
     AI_PIPELINE_NAME = "ai.pipeline.name"
     """
     Name of the AI pipeline or chain being executed.
+    DEPRECATED: Use GEN_AI_PIPELINE_NAME instead.
     Example: "qa-pipeline"
     """
 
@@ -233,6 +235,7 @@ class SPANDATA:
     AI_STREAMING = "ai.streaming"
     """
     Whether or not the AI model call's response was streamed back asynchronously
+    DEPRECATED: Use GEN_AI_RESPONSE_STREAMING instead.
     Example: true
     """
 
@@ -382,6 +385,24 @@ class SPANDATA:
     Example: "chat"
     """
 
+    GEN_AI_PIPELINE_NAME = "gen_ai.pipeline.name"
+    """
+    Name of the AI pipeline or chain being executed.
+    Example: "qa-pipeline"
+    """
+
+    GEN_AI_RESPONSE_MODEL = "gen_ai.response.model"
+    """
+    Exact model identifier used to generate the response
+    Example: gpt-4o-mini-2024-07-18
+    """
+
+    GEN_AI_RESPONSE_STREAMING = "gen_ai.response.streaming"
+    """
+    Whether or not the AI model call's response was streamed back asynchronously
+    Example: true
+    """
+
     GEN_AI_RESPONSE_TEXT = "gen_ai.response.text"
     """
     The model's response text messages.
@@ -421,7 +442,7 @@ class SPANDATA:
     GEN_AI_REQUEST_MODEL = "gen_ai.request.model"
     """
     The model identifier being used for the request.
-    Example: "gpt-4-turbo-preview"
+    Example: "gpt-4-turbo"
     """
 
     GEN_AI_REQUEST_PRESENCE_PENALTY = "gen_ai.request.presence_penalty"
@@ -659,9 +680,11 @@ class OP:
     FUNCTION_AWS = "function.aws"
     FUNCTION_GCP = "function.gcp"
     GEN_AI_CHAT = "gen_ai.chat"
+    GEN_AI_EMBEDDINGS = "gen_ai.embeddings"
     GEN_AI_EXECUTE_TOOL = "gen_ai.execute_tool"
     GEN_AI_HANDOFF = "gen_ai.handoff"
     GEN_AI_INVOKE_AGENT = "gen_ai.invoke_agent"
+    GEN_AI_RESPONSES = "gen_ai.responses"
     GRAPHQL_EXECUTE = "graphql.execute"
     GRAPHQL_MUTATION = "graphql.mutation"
     GRAPHQL_PARSE = "graphql.parse"
@@ -686,8 +709,6 @@ class OP:
     MIDDLEWARE_STARLITE = "middleware.starlite"
     MIDDLEWARE_STARLITE_RECEIVE = "middleware.starlite.receive"
     MIDDLEWARE_STARLITE_SEND = "middleware.starlite.send"
-    OPENAI_CHAT_COMPLETIONS_CREATE = "ai.chat_completions.create.openai"
-    OPENAI_EMBEDDINGS_CREATE = "ai.embeddings.create.openai"
     HUGGINGFACE_HUB_CHAT_COMPLETIONS_CREATE = (
         "ai.chat_completions.create.huggingface_hub"
     )
@@ -831,6 +852,8 @@ class ClientConstructor:
         custom_repr: Optional[Callable[..., Optional[str]]] = None,
         add_full_stack: bool = DEFAULT_ADD_FULL_STACK,
         max_stack_frames: Optional[int] = DEFAULT_MAX_STACK_FRAMES,
+        enable_logs: bool = False,
+        before_send_log: Optional[Callable[[Log, Hint], Optional[Log]]] = None,
     ) -> None:
         """Initialize the Sentry SDK with the given parameters. All parameters described here can be used in a call to `sentry_sdk.init()`.
 
@@ -1217,6 +1240,14 @@ class ClientConstructor:
 
         :param instrumenter:
 
+        :param enable_logs: Set `enable_logs` to True to enable the SDK to emit
+            Sentry logs. Defaults to False.
+
+        :param before_send_log: An optional function to modify or filter out logs
+            before they're sent to Sentry. Any modifications to the log in this
+            function will be retained. If the function returns None, the log will
+            not be sent to Sentry.
+
         :param _experiments:
         """
         pass
@@ -1241,4 +1272,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "3.0.0a3"
+VERSION = "3.0.0a4"

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/aiohttp.py

@@ -238,7 +238,7 @@ def create_trace_config() -> TraceConfig:
             name="%s %s"
             % (method, parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE),
             origin=AioHttpIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
 
         data = {

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/anthropic.py

@@ -161,7 +161,7 @@ def _sentry_patched_create_common(f: Any, *args: Any, **kwargs: Any) -> Any:
         op=OP.ANTHROPIC_MESSAGES_CREATE,
         description="Anthropic messages create",
         origin=AnthropicIntegration.origin,
-        only_if_parent=True,
+        only_as_child_span=True,
     )
     span.__enter__()
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/arq.py

@@ -81,7 +81,7 @@ def patch_enqueue_job() -> None:
             op=OP.QUEUE_SUBMIT_ARQ,
             name=function,
             origin=ArqIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             return await old_enqueue_job(self, function, *args, **kwargs)
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/asyncio.py

@@ -49,7 +49,7 @@ def patch_asyncio() -> None:
                         op=OP.FUNCTION,
                         name=get_name(coro),
                         origin=AsyncioIntegration.origin,
-                        only_if_parent=True,
+                        only_as_child_span=True,
                     ):
                         try:
                             result = await coro

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/asyncpg.py

@@ -166,7 +166,7 @@ def _wrap_connect_addr(f: Callable[..., Awaitable[T]]) -> Callable[..., Awaitabl
             op=OP.DB,
             name="connect",
             origin=AsyncPGIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             data = _get_db_data(
                 addr=kwargs.get("addr"),

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/boto3.py

@@ -66,7 +66,7 @@ def _sentry_request_created(
         op=OP.HTTP_CLIENT,
         name=description,
         origin=Boto3Integration.origin,
-        only_if_parent=True,
+        only_as_child_span=True,
     )
 
     data = {
@@ -120,7 +120,7 @@ def _sentry_after_call(
         op=OP.HTTP_CLIENT_STREAM,
         name=span.name,
         origin=Boto3Integration.origin,
-        only_if_parent=True,
+        only_as_child_span=True,
     )
 
     orig_read = body.read

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/celery/__init__.py

@@ -269,7 +269,7 @@ def _wrap_task_run(f: F) -> F:
                 op=OP.QUEUE_SUBMIT_CELERY,
                 name=task_name,
                 origin=CeleryIntegration.origin,
-                only_if_parent=True,
+                only_as_child_span=True,
             )
             if not task_started_from_beat
             else NoOpMgr()
@@ -354,7 +354,7 @@ def _wrap_task_call(task: Any, f: F) -> F:
                 op=OP.QUEUE_PROCESS,
                 name=task.name,
                 origin=CeleryIntegration.origin,
-                only_if_parent=True,
+                only_as_child_span=True,
             ) as span:
                 _set_messaging_destination_name(task, span)
 
@@ -369,6 +369,7 @@ def _wrap_task_call(task: Any, f: F) -> F:
                         )
 
                 if latency is not None:
+                    latency *= 1000  # milliseconds
                     span.set_attribute(
                         SPANDATA.MESSAGING_MESSAGE_RECEIVE_LATENCY, latency
                     )
@@ -479,7 +480,7 @@ def _patch_producer_publish() -> None:
             op=OP.QUEUE_PUBLISH,
             name=task_name,
             origin=CeleryIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             if task_id is not None:
                 span.set_attribute(SPANDATA.MESSAGING_MESSAGE_ID, task_id)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/clickhouse_driver.py

@@ -71,7 +71,7 @@ def _wrap_start(f: Callable[P, T]) -> Callable[P, T]:
             op=OP.DB,
             name=query,
             origin=ClickhouseDriverIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
 
         connection._sentry_span = span  # type: ignore[attr-defined]

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/cohere.py

@@ -144,7 +144,7 @@ def _wrap_chat(f: Callable[..., Any], streaming: bool) -> Callable[..., Any]:
             op=consts.OP.COHERE_CHAT_COMPLETIONS_CREATE,
             name="cohere.client.Chat",
             origin=CohereIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
         span.__enter__()
         try:
@@ -228,7 +228,7 @@ def _wrap_embed(f: Callable[..., Any]) -> Callable[..., Any]:
             op=consts.OP.COHERE_EMBEDDINGS_CREATE,
             name="Cohere Embedding Creation",
             origin=CohereIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             if "texts" in kwargs and (
                 should_send_default_pii() and integration.include_prompts

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/__init__.py

@@ -9,7 +9,7 @@ from importlib import import_module
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA, SOURCE_FOR_STYLE, TransactionSource
 from sentry_sdk.scope import add_global_event_processor, should_send_default_pii
-from sentry_sdk.serializer import add_global_repr_processor
+from sentry_sdk.serializer import add_global_repr_processor, add_repr_sequence_type
 from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -254,6 +254,7 @@ class DjangoIntegration(Integration):
         patch_views()
         patch_templates()
         patch_signals()
+        add_template_context_repr_sequence()
 
         if patch_caching is not None:
             patch_caching()
@@ -649,7 +650,7 @@ def install_sql_hook() -> None:
             op=OP.DB,
             name="connect",
             origin=DjangoIntegration.origin_db,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             _set_db_data(span, self)
             return real_connect(self)
@@ -709,3 +710,12 @@ def _set_db_data(span: Span, cursor_or_db: Any) -> None:
     server_socket_address = connection_params.get("unix_socket")
     if server_socket_address is not None:
         span.set_attribute(SPANDATA.SERVER_SOCKET_ADDRESS, server_socket_address)
+
+
+def add_template_context_repr_sequence() -> None:
+    try:
+        from django.template.context import BaseContext
+
+        add_repr_sequence_type(BaseContext)
+    except Exception:
+        pass

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/asgi.py

@@ -184,7 +184,7 @@ def wrap_async_view(callback: Any) -> Any:
             op=OP.VIEW_RENDER,
             name=request.resolver_match.view_name,
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             return await callback(request, *args, **kwargs)
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/caching.py

@@ -62,7 +62,7 @@ def _patch_cache_method(
             op=op,
             name=description,
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             value = original_method(*args, **kwargs)
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/middleware.py

@@ -86,7 +86,7 @@ def _wrap_middleware(middleware: Any, middleware_name: str) -> Any:
             op=OP.MIDDLEWARE_DJANGO,
             name=description,
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
         middleware_span.set_tag("django.function_name", function_name)
         middleware_span.set_tag("django.middleware_name", middleware_name)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/signals_handlers.py

@@ -70,7 +70,7 @@ def patch_signals() -> None:
                     op=OP.EVENT_DJANGO,
                     name=signal_name,
                     origin=DjangoIntegration.origin,
-                    only_if_parent=True,
+                    only_as_child_span=True,
                 ) as span:
                     span.set_attribute("signal", signal_name)
                     return receiver(*args, **kwargs)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/templates.py

@@ -64,7 +64,7 @@ def patch_templates() -> None:
             op=OP.TEMPLATE_RENDER,
             name=_get_template_name_description(self.template_name),
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             if isinstance(self.context_data, dict):
                 for k, v in self.context_data.items():
@@ -98,7 +98,7 @@ def patch_templates() -> None:
             op=OP.TEMPLATE_RENDER,
             name=_get_template_name_description(template_name),
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             for k, v in context.items():
                 span.set_attribute(f"context.{k}", v)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/django/views.py

@@ -37,7 +37,7 @@ def patch_views() -> None:
             op=OP.VIEW_RESPONSE_RENDER,
             name="serialize response",
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             return old_render(self)
 
@@ -88,7 +88,7 @@ def _wrap_sync_view(callback: Any) -> Any:
             op=OP.VIEW_RENDER,
             name=request.resolver_match.view_name,
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             return callback(request, *args, **kwargs)
 

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/gnu_backtrace.py

@@ -13,23 +13,12 @@ if TYPE_CHECKING:
     from sentry_sdk._types import Event
 
 
-MODULE_RE = r"[a-zA-Z0-9/._:\\-]+"
-TYPE_RE = r"[a-zA-Z0-9._:<>,-]+"
-HEXVAL_RE = r"[A-Fa-f0-9]+"
-
+FUNCTION_RE = r"[^@]+?)\s+@\s+0x[0-9a-fA-F]+"
 
 FRAME_RE = r"""
-^(?P<index>\d+)\.\s
-(?P<package>{MODULE_RE})\(
-  (?P<retval>{TYPE_RE}\ )?
-  ((?P<function>{TYPE_RE})
-    (?P<args>\(.*\))?
-  )?
-  ((?P<constoffset>\ const)?\+0x(?P<offset>{HEXVAL_RE}))?
-\)\s
-\[0x(?P<retaddr>{HEXVAL_RE})\]$
+^(?P<index>\d+)\.\s+(?P<function>{FUNCTION_RE}\s+in\s+(?P<package>.+)$
 """.format(
-    MODULE_RE=MODULE_RE, HEXVAL_RE=HEXVAL_RE, TYPE_RE=TYPE_RE
+    FUNCTION_RE=FUNCTION_RE,
 )
 
 FRAME_RE = re.compile(FRAME_RE, re.MULTILINE | re.VERBOSE)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/graphene.py

@@ -137,7 +137,7 @@ def graphql_span(
     )
 
     with sentry_sdk.start_span(
-        op=op, name=operation_name, only_if_parent=True
+        op=op, name=operation_name, only_as_child_span=True
     ) as graphql_span:
         graphql_span.set_attribute("graphql.document", source)
         graphql_span.set_attribute("graphql.operation.name", operation_name)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/grpc/aio/client.py

@@ -51,7 +51,7 @@ class SentryUnaryUnaryClientInterceptor(ClientInterceptor, UnaryUnaryClientInter
             op=OP.GRPC_CLIENT,
             name="unary unary call to %s" % method,
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             span.set_attribute("type", "unary unary")
             span.set_attribute("method", method)
@@ -84,7 +84,7 @@ class SentryUnaryStreamClientInterceptor(
             op=OP.GRPC_CLIENT,
             name="unary stream call to %s" % method,
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             span.set_attribute("type", "unary stream")
             span.set_attribute("method", method)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/grpc/client.py

@@ -36,7 +36,7 @@ class ClientInterceptor(
             op=OP.GRPC_CLIENT,
             name="unary unary call to %s" % method,
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             span.set_attribute("type", "unary unary")
             span.set_attribute("method", method)
@@ -64,7 +64,7 @@ class ClientInterceptor(
             op=OP.GRPC_CLIENT,
             name="unary stream call to %s" % method,
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             span.set_attribute("type", "unary stream")
             span.set_attribute("method", method)

{sentry_sdk-3.0.0a3 → sentry_sdk-3.0.0a4}/sentry_sdk/integrations/httpx.py

@@ -59,7 +59,7 @@ def _install_httpx_client() -> None:
                 parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE,
             ),
             origin=HttpxIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             data = {
                 SPANDATA.HTTP_METHOD: request.method,
@@ -129,7 +129,7 @@ def _install_httpx_async_client() -> None:
                 parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE,
             ),
             origin=HttpxIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             data = {
                 SPANDATA.HTTP_METHOD: request.method,