openai-agents-v2: Populate instructions and tool definitions from Response obj

Author: adammw

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

@@ -1056,10 +1056,20 @@ def _build_content_payload(self, span: Span[Any]) -> ContentPayload:
 
         elif _is_instance_of(span_data, ResponseSpanData):
             span_input = getattr(span_data, "input", None)
+            response_obj = getattr(span_data, "response", None)
             if capture_messages and span_input:
                 payload.input_messages = (
                     self._normalize_messages_to_role_parts(span_input)
                 )
+
+            if (
+                capture_system
+                and response_obj
+                and hasattr(response_obj, "instructions")
+            ):
+                payload.system_instructions = self._normalize_to_text_parts(
+                    response_obj.instructions
+                )
             if capture_system and span_input:
                 sys_instr = self._collect_system_instructions(span_input)
                 if sys_instr:
@@ -2029,6 +2039,32 @@ def _get_attributes_from_response_span_data(
                 if output_tokens is not None:
                     yield GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens
 
+            # Tool definitions from response
+            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
+                            )
+                        )
+                    ),
+                )
+
         # Input/output messages
         if (
             self.include_sensitive_data

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

@@ -484,11 +484,26 @@ 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.output = [{"finish_reason": "stop"}]
 
     try:
@@ -516,6 +531,30 @@ def __init__(self) -> None:
         assert response.attributes[GenAI.GEN_AI_RESPONSE_FINISH_REASONS] == (
             "stop",
         )
+
+        system_instructions = json.loads(
+            response.attributes[GenAI.GEN_AI_SYSTEM_INSTRUCTIONS]
+        )
+        assert system_instructions == [
+            {"type": "text", "content": "You are a helpful assistant."}
+        ]
+        tool_definitions = json.loads(
+            response.attributes[GenAI.GEN_AI_TOOL_DEFINITIONS]
+        )
+        assert tool_definitions == [
+            {
+                "type": "function",
+                "name": "get_current_weather",
+                "description": "Get the current weather in a given location",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "location": {"title": "Location", "type": "string"},
+                    },
+                    "required": ["location"],
+                },
+            }
+        ]
     finally:
         instrumentor.uninstrument()
         exporter.clear()