fix(utils): Avoid double serialization of strings in safe_serialize

sentry_sdk/utils.py

@@ -2005,7 +2005,11 @@ def serialize_item(
 
     try:
         serialized = serialize_item(data)
-        return json.dumps(serialized, default=str)
+        return (
+            json.dumps(serialized, default=str)
+            if not isinstance(serialized, str)
+            else serialized
+        )
     except Exception:
         return str(data)
 

tests/integrations/google_genai/test_google_genai.py

@@ -1625,7 +1625,7 @@ def test_generate_content_with_function_response(
     assert messages[0]["role"] == "tool"
     assert messages[0]["content"]["toolCallId"] == "call_123"
     assert messages[0]["content"]["toolName"] == "get_weather"
-    assert messages[0]["content"]["output"] == '"Sunny, 72F"'
+    assert messages[0]["content"]["output"] == "Sunny, 72F"
 
 
 def test_generate_content_with_mixed_string_and_content(
@@ -1891,7 +1891,7 @@ def test_extract_contents_messages_function_response():
     assert result[0]["role"] == "tool"
     assert result[0]["content"]["toolCallId"] == "call_123"
     assert result[0]["content"]["toolName"] == "get_weather"
-    assert result[0]["content"]["output"] == '"sunny"'
+    assert result[0]["content"]["output"] == "sunny"
 
 
 def test_extract_contents_messages_function_response_with_output_key():
@@ -1908,7 +1908,7 @@ def test_extract_contents_messages_function_response_with_output_key():
     assert result[0]["content"]["toolCallId"] == "call_456"
     assert result[0]["content"]["toolName"] == "get_time"
     # Should prefer "output" key
-    assert result[0]["content"]["output"] == '"3:00 PM"'
+    assert result[0]["content"]["output"] == "3:00 PM"
 
 
 def test_extract_contents_messages_mixed_parts():

tests/integrations/mcp/test_mcp.py

@@ -241,15 +241,12 @@ async def test_tool_async(tool_name, arguments):
     assert span["data"][SPANDATA.MCP_TRANSPORT] == "http"
     assert span["data"][SPANDATA.MCP_REQUEST_ID] == "req-456"
     assert span["data"][SPANDATA.MCP_SESSION_ID] == session_id
-    assert span["data"]["mcp.request.argument.data"] == '"test"'
+    assert span["data"]["mcp.request.argument.data"] == "test"
 
     # Check PII-sensitive data
     if send_default_pii and include_prompts:
-        # TODO: Investigate why tool result is double-serialized.
         assert span["data"][SPANDATA.MCP_TOOL_RESULT_CONTENT] == json.dumps(
-            json.dumps(
-                {"status": "completed"},
-            )
+            {"status": "completed"}
         )
     else:
         assert SPANDATA.MCP_TOOL_RESULT_CONTENT not in span["data"]
@@ -366,8 +363,8 @@ async def test_prompt(name, arguments):
     assert span["data"][SPANDATA.MCP_METHOD_NAME] == "prompts/get"
     assert span["data"][SPANDATA.MCP_TRANSPORT] == "stdio"
     assert span["data"][SPANDATA.MCP_REQUEST_ID] == "req-prompt"
-    assert span["data"]["mcp.request.argument.name"] == '"code_help"'
-    assert span["data"]["mcp.request.argument.language"] == '"python"'
+    assert span["data"]["mcp.request.argument.name"] == "code_help"
+    assert span["data"]["mcp.request.argument.language"] == "python"
 
     # Message count is always captured
     assert span["data"][SPANDATA.MCP_PROMPT_RESULT_MESSAGE_COUNT] == 1
@@ -752,7 +749,7 @@ def test_tool_unstructured(tool_name, arguments):
     # Should extract and join text from content blocks only with PII
     if send_default_pii and include_prompts:
         assert (
-            span["data"][SPANDATA.MCP_TOOL_RESULT_CONTENT] == '"First part Second part"'
+            span["data"][SPANDATA.MCP_TOOL_RESULT_CONTENT] == "First part Second part"
         )
     else:
         assert SPANDATA.MCP_TOOL_RESULT_CONTENT not in span["data"]
@@ -959,7 +956,7 @@ def test_tool_complex(tool_name, arguments):
     assert span["data"]["mcp.request.argument.nested"] == json.dumps(
         {"key": "value", "list": [1, 2, 3]}
     )
-    assert span["data"]["mcp.request.argument.string"] == '"test"'
+    assert span["data"]["mcp.request.argument.string"] == "test"
     assert span["data"]["mcp.request.argument.number"] == "42"
 
 

tests/test_utils.py

@@ -35,6 +35,7 @@
     exc_info_from_error,
     get_lines_from_file,
     package_version,
+    safe_serialize,
 )
 
 
@@ -1062,5 +1063,36 @@ def fake_getlines(filename):
         assert result == expected_result
 
 
+def test_safe_serialize_plain_string():
+    assert safe_serialize("already a string") == "already a string"
+
+
+def test_safe_serialize_json_string():
+    assert safe_serialize('{"key": "value"}') == '{"key": "value"}'
+
+
+def test_safe_serialize_dict():
+    assert safe_serialize({"key": "value"}) == '{"key": "value"}'
+
+
+def test_safe_serialize_callable():
+    def my_func():
+        pass
+
+    result = safe_serialize(my_func)
+    assert result.startswith("<function")
+    assert '"' not in result[:1]  # no wrapping quotes from json.dumps
+
+
+def test_safe_serialize_object():
+    class MyClass:
+        def __init__(self):
+            self.x = 1
+
+    result = safe_serialize(MyClass())
+    assert result.startswith("<MyClass")
+    assert '"' not in result[:1]  # no wrapping quotes from json.dumps
+
+
 def test_package_version_is_none():
     assert package_version("non_existent_package") is None