fix failing test on py*-test-instrumentation-openai_agents-v2-oldest

Author: adammw

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/src/opentelemetry/instrumentation/openai_agents/span_processor.py

@@ -2043,23 +2043,13 @@ def _get_attributes_from_response_span_data(
             if self._capture_tool_definitions and hasattr(
                 span_data.response, "tools"
             ):
-
-                def _serialize_tool_value(value: Any) -> Optional[str]:
-                    if value is None:
-                        return None
-                    return {
-                        "name": getattr(value, "name", None),
-                        "type": getattr(value, "type", None),
-                        "description": getattr(value, "description", None),
-                        "parameters": getattr(value, "parameters", None),
-                    }
-
                 yield (
                     GEN_AI_TOOL_DEFINITIONS,
                     safe_json_dumps(
                         list(
                             map(
-                                _serialize_tool_value, span_data.response.tools
+                                lambda tool: tool.to_dict(),
+                                span_data.response.tools,
                             )
                         )
                     ),

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/test_tracer.py

@@ -25,6 +25,7 @@
     set_trace_processors,
     trace,
 )
+from openai.types.responses import FunctionTool  # noqa: E402
 
 from opentelemetry.instrumentation.openai_agents import (  # noqa: E402
     OpenAIAgentsInstrumentor,
@@ -62,6 +63,9 @@
 GEN_AI_OUTPUT_MESSAGES = getattr(
     GenAI, "GEN_AI_OUTPUT_MESSAGES", "gen_ai.output.messages"
 )
+GEN_AI_TOOL_DEFINITIONS = getattr(
+    GenAI, "GEN_AI_TOOL_DEFINITIONS", "gen_ai.tool.definitions"
+)
 
 
 def _instrument_with_provider(**instrument_kwargs):
@@ -484,26 +488,29 @@ def __init__(self, input_tokens: int, output_tokens: int) -> None:
             self.input_tokens = input_tokens
             self.output_tokens = output_tokens
 
-    class _FunctionTool:
-        def __init__(self) -> None:
-            self.name = "get_current_weather"
-            self.type = "function"
-            self.description = "Get the current weather in a given location"
-            self.parameters = {
-                "type": "object",
-                "properties": {
-                    "location": {"title": "Location", "type": "string"},
-                },
-                "required": ["location"],
-            }
-
     class _Response:
         def __init__(self) -> None:
             self.id = "resp-123"
             self.instructions = "You are a helpful assistant."
             self.model = "gpt-4o-mini"
             self.usage = _Usage(42, 9)
-            self.tools = [_FunctionTool()]
+            self.tools = [
+                FunctionTool(
+                    name="get_current_weather",
+                    type="function",
+                    description="Get the current weather in a given location",
+                    parameters={
+                        "type": "object",
+                        "properties": {
+                            "location": {
+                                "title": "Location",
+                                "type": "string",
+                            },
+                        },
+                        "required": ["location"],
+                    },
+                )
+            ]
             self.output = [{"finish_reason": "stop"}]
 
     try:
@@ -539,7 +546,7 @@ def __init__(self) -> None:
             {"type": "text", "content": "You are a helpful assistant."}
         ]
         tool_definitions = json.loads(
-            response.attributes[GenAI.GEN_AI_TOOL_DEFINITIONS]
+            response.attributes[GEN_AI_TOOL_DEFINITIONS]
         )
         assert tool_definitions == [
             {