Add a method for normalizing data passed to set_data

Author: colin-sentry

sentry_sdk/tracing.py

@@ -410,9 +410,26 @@ def set_tag(self, key, value):
         # type: (str, Any) -> None
         self._tags[key] = value
 
+    @staticmethod
+    def _normalize_data(data):
+        # type: (Any) -> Any
+
+        # convert pydantic data (e.g. OpenAI v1+) to json compatible format
+        if hasattr(data, "model_dump"):
+            try:
+                return data.model_dump()
+            except Exception as e:
+                logger.warning("Could not convert pydantic data to JSON: %s", e)
+                return data
+        if isinstance(data, list):
+            return list(Span._normalize_data(x) for x in data)
+        if isinstance(data, dict):
+            return {k: Span._normalize_data(v) for (k, v) in data.items()}
+        return data
+
     def set_data(self, key, value):
         # type: (str, Any) -> None
-        self._data[key] = value
+        self._data[key] = self._normalize_data(value)
 
     def set_status(self, value):
         # type: (str) -> None

tests/integrations/openai/test_openai.py

@@ -73,7 +73,7 @@ def test_nonstreaming_chat_completion(
 
     if send_default_pii and include_prompts:
         assert "hello" in span["data"]["ai.input_messages"][0]["content"]
-        assert "the model response" in span["data"]["ai.responses"][0]
+        assert "the model response" in span["data"]["ai.responses"][0]["content"]
     else:
         assert "ai.input_messages" not in span["data"]
         assert "ai.responses" not in span["data"]