ref: Rename only_if_parent to only_as_child_span (#4617)

sentrivana · web-flow · commit f76b02d98851 · 2025-07-24T11:14:37.000+02:00
diff --git a/sentry_sdk/ai/monitoring.py b/sentry_sdk/ai/monitoring.py
@@ -31,7 +31,7 @@ def sync_wrapped(*args: Any, **kwargs: Any) -> 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)
@@ -61,7 +61,7 @@ async def async_wrapped(*args: Any, **kwargs: Any) -> 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)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
@@ -238,7 +238,7 @@ async def on_request_start(
             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 = {
diff --git a/sentry_sdk/integrations/anthropic.py b/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__()
 
diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py
@@ -81,7 +81,7 @@ async def _sentry_enqueue_job(
             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)
 
diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py
@@ -49,7 +49,7 @@ async def _task_with_sentry_span_creation() -> Any:
                         op=OP.FUNCTION,
                         name=get_name(coro),
                         origin=AsyncioIntegration.origin,
-                        only_if_parent=True,
+                        only_as_child_span=True,
                     ):
                         try:
                             result = await coro
diff --git a/sentry_sdk/integrations/asyncpg.py b/sentry_sdk/integrations/asyncpg.py
@@ -166,7 +166,7 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
             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"),
diff --git a/sentry_sdk/integrations/boto3.py b/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
diff --git a/sentry_sdk/integrations/celery/__init__.py b/sentry_sdk/integrations/celery/__init__.py
@@ -269,7 +269,7 @@ def apply_async(*args: Any, **kwargs: Any) -> Any:
                 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 _inner(*args: Any, **kwargs: Any) -> Any:
                 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)
 
@@ -479,7 +479,7 @@ def sentry_publish(self: Producer, *args: Any, **kwargs: Any) -> Any:
             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)
diff --git a/sentry_sdk/integrations/clickhouse_driver.py b/sentry_sdk/integrations/clickhouse_driver.py
@@ -71,7 +71,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> 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]
diff --git a/sentry_sdk/integrations/cohere.py b/sentry_sdk/integrations/cohere.py
@@ -144,7 +144,7 @@ def new_chat(*args: Any, **kwargs: Any) -> 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 new_embed(*args: Any, **kwargs: Any) -> 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
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -649,7 +649,7 @@ def connect(self: BaseDatabaseWrapper) -> 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)
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
@@ -184,7 +184,7 @@ async def sentry_wrapped_callback(request: Any, *args: Any, **kwargs: Any) -> An
             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)
 
diff --git a/sentry_sdk/integrations/django/caching.py b/sentry_sdk/integrations/django/caching.py
@@ -62,7 +62,7 @@ def _instrument_call(
             op=op,
             name=description,
             origin=DjangoIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             value = original_method(*args, **kwargs)
 
diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py
@@ -86,7 +86,7 @@ def _check_middleware_span(old_method: Callable[..., Any]) -> Optional[Span]:
             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)
diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
@@ -70,7 +70,7 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
                     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)
diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
@@ -64,7 +64,7 @@ def rendered_content(self: SimpleTemplateResponse) -> str:
             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 render(
             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)
diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py
@@ -37,7 +37,7 @@ def sentry_patched_render(self: SimpleTemplateResponse) -> Any:
             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 sentry_wrapped_callback(request: Any, *args: Any, **kwargs: 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)
 
diff --git a/sentry_sdk/integrations/graphene.py b/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)
diff --git a/sentry_sdk/integrations/grpc/aio/client.py b/sentry_sdk/integrations/grpc/aio/client.py
@@ -51,7 +51,7 @@ async def intercept_unary_unary(
             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 @@ async def intercept_unary_stream(
             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)
diff --git a/sentry_sdk/integrations/grpc/client.py b/sentry_sdk/integrations/grpc/client.py
@@ -36,7 +36,7 @@ def intercept_unary_unary(
             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 @@ def intercept_unary_stream(
             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)
diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py
@@ -59,7 +59,7 @@ def send(self: Client, request: Request, **kwargs: Any) -> Response:
                 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 @@ async def send(self: AsyncClient, request: Request, **kwargs: Any) -> Response:
                 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,
diff --git a/sentry_sdk/integrations/huey.py b/sentry_sdk/integrations/huey.py
@@ -60,7 +60,7 @@ def _sentry_enqueue(self: Huey, task: Task) -> Optional[Union[Result, ResultGrou
             op=OP.QUEUE_SUBMIT_HUEY,
             name=task.name,
             origin=HueyIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             if not isinstance(task, PeriodicTask):
                 # Attach trace propagation data to task kwargs. We do
diff --git a/sentry_sdk/integrations/huggingface_hub.py b/sentry_sdk/integrations/huggingface_hub.py
@@ -73,7 +73,7 @@ def new_text_generation(*args: Any, **kwargs: Any) -> Any:
             op=consts.OP.HUGGINGFACE_HUB_CHAT_COMPLETIONS_CREATE,
             name="Text Generation",
             origin=HuggingfaceHubIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
         span.__enter__()
         try:
diff --git a/sentry_sdk/integrations/langchain.py b/sentry_sdk/integrations/langchain.py
@@ -144,7 +144,7 @@ def _create_span(
         parent_watched_span = self.span_map.get(parent_id) if parent_id else None
         sentry_span = sentry_sdk.start_span(
             parent_span=parent_watched_span.span if parent_watched_span else None,
-            only_if_parent=True,
+            only_as_child_span=True,
             **kwargs,
         )
         watched_span = WatchedSpan(sentry_span)
diff --git a/sentry_sdk/integrations/litestar.py b/sentry_sdk/integrations/litestar.py
@@ -157,7 +157,7 @@ async def _create_span_call(
             op=OP.MIDDLEWARE_LITESTAR,
             name=middleware_name,
             origin=LitestarIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as middleware_span:
             middleware_span.set_tag("litestar.middleware_name", middleware_name)
 
@@ -171,7 +171,7 @@ async def _sentry_receive(
                     op=OP.MIDDLEWARE_LITESTAR_RECEIVE,
                     name=getattr(receive, "__qualname__", str(receive)),
                     origin=LitestarIntegration.origin,
-                    only_if_parent=True,
+                    only_as_child_span=True,
                 ) as span:
                     span.set_tag("litestar.middleware_name", middleware_name)
                     return await receive(*args, **kwargs)
@@ -188,7 +188,7 @@ async def _sentry_send(message: Message) -> None:
                     op=OP.MIDDLEWARE_LITESTAR_SEND,
                     name=getattr(send, "__qualname__", str(send)),
                     origin=LitestarIntegration.origin,
-                    only_if_parent=True,
+                    only_as_child_span=True,
                 ) as span:
                     span.set_tag("litestar.middleware_name", middleware_name)
                     return await send(message)
diff --git a/sentry_sdk/integrations/pymongo.py b/sentry_sdk/integrations/pymongo.py
@@ -152,7 +152,7 @@ def started(self, event: CommandStartedEvent) -> None:
                 op=OP.DB,
                 name=query,
                 origin=PyMongoIntegration.origin,
-                only_if_parent=True,
+                only_as_child_span=True,
             )
 
             with capture_internal_exceptions():
diff --git a/sentry_sdk/integrations/ray.py b/sentry_sdk/integrations/ray.py
@@ -101,7 +101,7 @@ def _remote_method_with_header_propagation(
                     op=OP.QUEUE_SUBMIT_RAY,
                     name=qualname_from_function(user_f),
                     origin=RayIntegration.origin,
-                    only_if_parent=True,
+                    only_as_child_span=True,
                 ) as span:
                     tracing = {
                         k: v
diff --git a/sentry_sdk/integrations/redis/_async_common.py b/sentry_sdk/integrations/redis/_async_common.py
@@ -42,7 +42,7 @@ async def _sentry_execute(self: Any, *args: Any, **kwargs: Any) -> Any:
             op=OP.DB_REDIS,
             name="redis.pipeline.execute",
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         ) as span:
             with capture_internal_exceptions():
                 span_data = get_db_data_fn(self)
@@ -98,7 +98,7 @@ async def _sentry_execute_command(
                 op=cache_properties["op"],
                 name=cache_properties["description"],
                 origin=SPAN_ORIGIN,
-                only_if_parent=True,
+                only_as_child_span=True,
             )
             cache_span.__enter__()
 
@@ -108,7 +108,7 @@ async def _sentry_execute_command(
             op=db_properties["op"],
             name=db_properties["description"],
             origin=SPAN_ORIGIN,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
         db_span.__enter__()
 
diff --git a/sentry_sdk/integrations/redis/_sync_common.py b/sentry_sdk/integrations/redis/_sync_common.py
diff --git a/sentry_sdk/integrations/rust_tracing.py b/sentry_sdk/integrations/rust_tracing.py
diff --git a/sentry_sdk/integrations/socket.py b/sentry_sdk/integrations/socket.py
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
diff --git a/sentry_sdk/integrations/starlite.py b/sentry_sdk/integrations/starlite.py
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
diff --git a/tests/integrations/ray/test_ray.py b/tests/integrations/ray/test_ray.py
diff --git a/tests/integrations/threading/test_threading.py b/tests/integrations/threading/test_threading.py
diff --git a/tests/tracing/test_span_origin.py b/tests/tracing/test_span_origin.py

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ async def on_request_start(`
`238`	`238`	`name="%s %s"`
`239`	`239`	`% (method, parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE),`
`240`	`240`	`origin=AioHttpIntegration.origin,`
`241`		`- only_if_parent=True,`
	`241`	`+ only_as_child_span=True,`
`242`	`242`	`)`
`243`	`243`
`244`	`244`	`data = {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ def _sentry_patched_create_common(f: Any, args: Any, *kwargs: Any) -> Any:`
`161`	`161`	`op=OP.ANTHROPIC_MESSAGES_CREATE,`
`162`	`162`	`description="Anthropic messages create",`
`163`	`163`	`origin=AnthropicIntegration.origin,`
`164`		`- only_if_parent=True,`
	`164`	`+ only_as_child_span=True,`
`165`	`165`	`)`
`166`	`166`	`span.__enter__()`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ def _inner(args: P.args, *kwargs: P.kwargs) -> T:`
`71`	`71`	`op=OP.DB,`
`72`	`72`	`name=query,`
`73`	`73`	`origin=ClickhouseDriverIntegration.origin,`
`74`		`- only_if_parent=True,`
	`74`	`+ only_as_child_span=True,`
`75`	`75`	`)`
`76`	`76`
`77`	`77`	`connection._sentry_span = span # type: ignore[attr-defined]`