fixes again argh

Author: dot-agi

agentops/instrumentation/providers/openai/wrappers/chat.py

@@ -20,38 +20,41 @@
 from agentops.semconv.tool import ToolAttributes
 from agentops.semconv.span_kinds import AgentOpsSpanKindValues
 
-from opentelemetry.trace import SpanKind, get_tracer, set_span_in_context, get_current
+from opentelemetry.trace import SpanKind, get_tracer, set_span_in_context
 
 logger = logging.getLogger(__name__)
 
 LLM_REQUEST_TYPE = LLMRequestTypeValues.CHAT
 
 
-def _create_tool_span(parent_span: Span, tool_call_data: Dict[str, Any]):
+def _create_tool_span(parent_span: Span, tool_call_data: Dict[str, Any]) -> Span:
     """
-    Create a distinct span for each tool call.
-
+    Create a distinct span for each tool call and return it.
     Args:
         parent_span: The parent LLM span
         tool_call_data: The tool call data dictionary
+    Returns:
+        The created tool span.
     """
     # Get the tracer for this module
     tracer = get_tracer(__name__)
 
     # Create a child span for the tool call
-    with tracer.start_as_current_span(
+    tool_span = tracer.start_span(
         name=f"tool_call.{tool_call_data['function']['name']}",
         kind=SpanKind.INTERNAL,
-        context=set_span_in_context(parent_span, get_current()),
-    ) as tool_span:
-        # Set the span kind to TOOL
-        tool_span.set_attribute("agentops.span.kind", AgentOpsSpanKindValues.TOOL)
+        context=set_span_in_context(parent_span),
+    )
+
+    # Set the span kind to TOOL
+    tool_span.set_attribute("agentops.span.kind", AgentOpsSpanKindValues.TOOL)
 
-        # Set tool-specific attributes
-        tool_span.set_attribute(ToolAttributes.TOOL_NAME, tool_call_data["function"]["name"])
-        tool_span.set_attribute(ToolAttributes.TOOL_PARAMETERS, tool_call_data["function"]["arguments"])
-        tool_span.set_attribute("tool.call.id", tool_call_data["id"])
-        tool_span.set_attribute("tool.call.type", tool_call_data["type"])
+    # Set tool-specific attributes
+    tool_span.set_attribute(ToolAttributes.TOOL_NAME, tool_call_data["function"]["name"])
+    tool_span.set_attribute(ToolAttributes.TOOL_PARAMETERS, tool_call_data["function"]["arguments"])
+    tool_span.set_attribute("tool.call.id", tool_call_data["id"])
+    tool_span.set_attribute("tool.call.type", tool_call_data["type"])
+    return tool_span
 
 
 def handle_chat_attributes(
@@ -231,20 +234,23 @@ def handle_chat_attributes(
                     # Tool calls
                     if "tool_calls" in message:
                         tool_calls = message["tool_calls"]
-                        if tool_calls and span is not None:
-                            for i, tool_call in enumerate(tool_calls):
-                                # Convert tool_call to the format expected by _create_tool_span
-                                function = tool_call.get("function", {})
-                                tool_call_data = {
-                                    "id": tool_call.get("id", ""),
-                                    "type": tool_call.get("type", "function"),
-                                    "function": {
-                                        "name": function.get("name", ""),
-                                        "arguments": function.get("arguments", ""),
-                                    },
-                                }
-                                # Create a child span for this tool call
-                                _create_tool_span(span, tool_call_data)
+                        if tool_calls:
+                            if span is None:
+                                logger.debug("Skipping tool span creation: no parent span provided")
+                            else:
+                                for i, tool_call in enumerate(tool_calls):
+                                    # Convert tool_call to the format expected by _create_tool_span
+                                    function = tool_call.get("function", {})
+                                    tool_call_data = {
+                                        "id": tool_call.get("id", ""),
+                                        "type": tool_call.get("type", "function"),
+                                        "function": {
+                                            "name": function.get("name", ""),
+                                            "arguments": function.get("arguments", ""),
+                                        },
+                                    }
+                                    # Create a child span for this tool call
+                                    _create_tool_span(span, tool_call_data)
 
         # Prompt filter results
         if "prompt_filter_results" in response_dict: