Merge branch 'master' into feat/span-first-2

Author: sentrivana

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
         token: ${{ steps.token.outputs.token }}
         fetch-depth: 0
     - name: Prepare release
-      uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2
+      uses: getsentry/craft@beea4aba589c66381258cbd131c5551ae8245b82 # v2
       env:
         GITHUB_TOKEN: ${{ steps.token.outputs.token }}
       with:

tests/integrations/fastmcp/test_fastmcp.py

@@ -43,6 +43,12 @@ async def __call__(self, *args, **kwargs):
 from mcp.server.sse import SseServerTransport
 from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
 
+try:
+    from fastmcp.prompts import Message
+except ImportError:
+    Message = None
+
+
 from starlette.responses import Response
 from starlette.routing import Mount, Route
 from starlette.applications import Starlette
@@ -611,15 +617,18 @@ async def test_fastmcp_prompt_sync(
         @mcp.prompt()
         def code_help_prompt(language: str):
             """Get help for a programming language"""
-            return [
-                {
-                    "role": "user",
-                    "content": {
-                        "type": "text",
-                        "text": f"Tell me about {language}",
-                    },
-                }
-            ]
+            message = {
+                "role": "user",
+                "content": {
+                    "type": "text",
+                    "text": f"Tell me about {language}",
+                },
+            }
+
+            if FASTMCP_VERSION is not None and FASTMCP_VERSION.startswith("3"):
+                message = Message(message)
+
+            return [message]
 
         with start_transaction(name="fastmcp tx"):
             result = await stdio(
@@ -692,19 +701,24 @@ async def test_fastmcp_prompt_async(
         @mcp.prompt()
         async def async_prompt(topic: str):
             """Get async prompt for a topic"""
-            return [
-                {
-                    "role": "user",
-                    "content": {"type": "text", "text": f"What is {topic}?"},
-                },
-                {
-                    "role": "assistant",
-                    "content": {
-                        "type": "text",
-                        "text": "Let me explain that",
-                    },
+            message1 = {
+                "role": "user",
+                "content": {"type": "text", "text": f"What is {topic}?"},
+            }
+
+            message2 = {
+                "role": "assistant",
+                "content": {
+                    "type": "text",
+                    "text": "Let me explain that",
                 },
-            ]
+            }
+
+            if FASTMCP_VERSION is not None and FASTMCP_VERSION.startswith("3"):
+                message1 = Message(message1)
+                message2 = Message(message2)
+
+            return [message1, message2]
 
         _, result = json_rpc(
             app,
@@ -896,36 +910,6 @@ def test_tool(value: int) -> int:
     assert mcp_spans[0]["origin"] == "auto.ai.mcp"
 
 
-@pytest.mark.parametrize("FastMCP", fastmcp_implementations, ids=fastmcp_ids)
-def test_fastmcp_without_request_context(sentry_init, capture_events, FastMCP):
-    """Test FastMCP handling when no request context is available"""
-    sentry_init(
-        integrations=[MCPIntegration()],
-        traces_sample_rate=1.0,
-    )
-    events = capture_events()
-
-    mcp = FastMCP("Test Server")
-
-    # Clear request context
-    if request_ctx is not None:
-        request_ctx.set(None)
-
-    @mcp.tool()
-    def test_tool_no_ctx(x: int) -> dict:
-        """Test tool without context"""
-        return {"result": x + 1}
-
-    with start_transaction(name="fastmcp tx"):
-        result = call_tool_through_mcp(mcp, "test_tool_no_ctx", {"x": 99})
-
-    assert result == {"result": 100}
-
-    # Should still create transaction even if context is missing
-    (tx,) = events
-    assert tx["type"] == "transaction"
-
-
 # =============================================================================
 # Transport Detection Tests
 # =============================================================================