fixed some merge problems

Author: antonpirker

sentry_sdk/integrations/openai_agents/spans/agent_workflow.py

@@ -1,7 +1,6 @@
 import sentry_sdk
 
 from ..consts import SPAN_ORIGIN
-from ..utils import _get_start_span_function
 
 from typing import TYPE_CHECKING
 
@@ -13,7 +12,7 @@ def agent_workflow_span(agent):
     # type: (agents.Agent) -> sentry_sdk.tracing.Span
 
     # Create a transaction or a span if an transaction is already active
-    span = _get_start_span_function()(
+    span = sentry_sdk.start_span(
         name=f"{agent.name} workflow",
         origin=SPAN_ORIGIN,
     )

sentry_sdk/integrations/openai_agents/utils.py

@@ -9,7 +9,6 @@
 
 if TYPE_CHECKING:
     from typing import Any
-    from typing import Callable
     from typing import Union
     from agents import Usage
 
@@ -30,15 +29,6 @@ def _capture_exception(exc):
     sentry_sdk.capture_event(event, hint=hint)
 
 
-def _get_start_span_function():
-    # type: () -> Callable[..., Any]
-    current_span = sentry_sdk.get_current_span()
-    transaction_exists = (
-        current_span is not None and current_span.containing_transaction == current_span
-    )
-    return sentry_sdk.start_span if transaction_exists else sentry_sdk.start_transaction
-
-
 def _set_agent_data(span, agent):
     # type: (sentry_sdk.tracing.Span, agents.Agent) -> None
     span.set_data(

sentry_sdk/integrations/ray.py

@@ -60,7 +60,9 @@ def new_func(*f_args, _tracing=None, **f_kwargs):
                 # type: (Any, Optional[dict[str, Any]], Any) -> Any
                 _check_sentry_initialized()
 
-                root_span_name = qualname_from_function(f) or DEFAULT_TRANSACTION_NAME
+                root_span_name = (
+                    qualname_from_function(user_f) or DEFAULT_TRANSACTION_NAME
+                )
                 sentry_sdk.get_current_scope().set_transaction_name(
                     root_span_name,
                     source=TransactionSource.TASK,