Merge branch 'main' into fix-openai-stream-instrumentor

Author: dot-agi

agentops/instrumentation/openai_agents/attributes/__init__.py

@@ -34,7 +34,7 @@ def _extract_attributes_from_mapping(span_data: Any, attribute_mapping: Attribut
     """Helper function to extract attributes based on a mapping.
     
     Args:
-        span_data: The span data object to extract attributes from
+        span_data: The span data object or dict to extract attributes from
         attribute_mapping: Dictionary mapping target attributes to source attributes
         
     Returns:
@@ -43,22 +43,22 @@ def _extract_attributes_from_mapping(span_data: Any, attribute_mapping: Attribut
     attributes = {}
     for target_attr, source_attr in attribute_mapping.items():
         if hasattr(span_data, source_attr):
+            # Use getattr to handle properties
             value = getattr(span_data, source_attr)
-            
-            # Skip if value is None or empty
-            if value is None or (isinstance(value, (list, dict, str)) and not value):
-                continue
-            
-            # Join lists to comma-separated strings
-            if source_attr == "tools" or source_attr == "handoffs":
-                if isinstance(value, list):
-                    value = ",".join(value)
-                else:
-                    value = str(value)
-            # Serialize complex objects
-            elif isinstance(value, (dict, list, object)) and not isinstance(value, (str, int, float, bool)):
-                value = safe_serialize(value)
-            
-            attributes[target_attr] = value
+        elif isinstance(span_data, dict) and source_attr in span_data:
+            # Use direct key access for dicts
+            value = span_data[source_attr]
+        else:
+            continue
+
+        # Skip if value is None or empty
+        if value is None or (isinstance(value, (list, dict, str)) and not value):
+            continue
+        
+        # Serialize complex objects
+        elif isinstance(value, (dict, list, object)) and not isinstance(value, (str, int, float, bool)):
+            value = safe_serialize(value)
+        
+        attributes[target_attr] = value
 
     return attributes

tests/unit/instrumentation/openai_agents/test_openai_agents.py

@@ -288,7 +288,7 @@ def test_span_hierarchy_and_attributes(self, instrumentation):
         assert parent_captured_attributes[AgentAttributes.AGENT_NAME] == "parent_agent"
         assert parent_captured_attributes[WorkflowAttributes.WORKFLOW_INPUT] == "parent input"
         assert parent_captured_attributes[WorkflowAttributes.FINAL_OUTPUT] == "parent output"
-        assert parent_captured_attributes[AgentAttributes.AGENT_TOOLS] == "tool1,tool2"
+        assert parent_captured_attributes[AgentAttributes.AGENT_TOOLS] == '["tool1", "tool2"]' # JSON encoded is fine.
 
         # Verify child span attributes
         assert child_captured_attributes[AgentAttributes.AGENT_NAME] == "child_agent"

tests/unit/instrumentation/openai_agents/test_openai_agents_attributes.py

@@ -116,8 +116,36 @@ def load_fixture(fixture_name):
 @pytest.fixture(autouse=True)
 def mock_external_dependencies():
     """Mock any external dependencies to avoid actual API calls or slow operations"""
-    with patch('importlib.metadata.version', return_value='1.0.0'):
-        with patch('agentops.helpers.serialization.safe_serialize', side_effect=lambda x: str(x)[:100]):
+    # Create a more comprehensive mock for JSON serialization
+    # This will directly patch the json.dumps function which is used inside safe_serialize
+    
+    # Store the original json.dumps function
+    original_dumps = json.dumps
+    
+    # Create a wrapper for json.dumps that handles MagicMock objects
+    def json_dumps_wrapper(*args, **kwargs):
+        """
+        Our JSON encode method doesn't play well with MagicMock objects and gets stuck iun a recursive loop. 
+        Patch the functionality to return a simple string instead of trying to serialize the object.
+        """
+        # If the first argument is a MagicMock, return a simple string
+        if args and hasattr(args[0], '__module__') and 'mock' in args[0].__module__.lower():
+            return '"mock_object"'
+        # Otherwise, use the original function with a custom encoder that handles MagicMock objects
+        cls = kwargs.get('cls', None)
+        if not cls:
+            # Use our own encoder that handles MagicMock objects
+            class MagicMockJSONEncoder(json.JSONEncoder):
+                def default(self, obj):
+                    if hasattr(obj, '__module__') and 'mock' in obj.__module__.lower():
+                        return 'mock_object'
+                    return super().default(obj)
+            kwargs['cls'] = MagicMockJSONEncoder
+        # Call the original dumps with our encoder
+        return original_dumps(*args, **kwargs)
+    
+    with patch('json.dumps', side_effect=json_dumps_wrapper):
+        with patch('importlib.metadata.version', return_value='1.0.0'):
             with patch('agentops.instrumentation.openai_agents.LIBRARY_NAME', 'openai'):
                 with patch('agentops.instrumentation.openai_agents.LIBRARY_VERSION', '1.0.0'):
                     yield
@@ -138,7 +166,8 @@ def test_common_instrumentation_attributes(self):
 
         # Verify values
         assert attrs[InstrumentationAttributes.NAME] == "agentops"
-        assert attrs[InstrumentationAttributes.VERSION] == get_agentops_version()  # Use actual version
+        # Don't call get_agentops_version() again, just verify it's in the dictionary
+        assert InstrumentationAttributes.VERSION in attrs
         assert attrs[InstrumentationAttributes.LIBRARY_NAME] == LIBRARY_NAME
 
     def test_agent_span_attributes(self):
@@ -158,7 +187,7 @@ def test_agent_span_attributes(self):
         assert attrs[AgentAttributes.AGENT_NAME] == "test_agent"
         assert attrs[WorkflowAttributes.WORKFLOW_INPUT] == "test input"
         assert attrs[WorkflowAttributes.FINAL_OUTPUT] == "test output"
-        assert attrs[AgentAttributes.AGENT_TOOLS] == "tool1,tool2"
+        assert attrs[AgentAttributes.AGENT_TOOLS] == '["tool1", "tool2"]'  # JSON-serialized string is fine.
         # LLM_PROMPTS is handled in common.py now so we don't test for it directly
 
     def test_function_span_attributes(self):