Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/populate_tox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
},
"beam": {
"package": "apache-beam",
"include": "!=2.78.0rc4", # incomplete upload: no Linux wheels for py3.13+
"num_versions": 2,
"deps": {
"*": ["dill"],
Expand Down
319 changes: 75 additions & 244 deletions scripts/populate_tox/package_dependencies.jsonl

Large diffs are not rendered by default.

51 changes: 19 additions & 32 deletions scripts/populate_tox/releases.jsonl

Large diffs are not rendered by default.

25 changes: 17 additions & 8 deletions tests/integrations/django/test_cache_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,6 @@ def test_cache_spans_decorator(
items = capture_items("span")

client.get(reverse("cached_view"))
client.get(reverse("cached_view"))

sentry_sdk.flush()
spans = [item.payload for item in items]
# first_event - cache.get
Expand All @@ -315,6 +313,10 @@ def test_cache_spans_decorator(
)
assert "cache.hit" not in spans[1]["attributes"]
assert spans[1]["attributes"]["cache.item_size"] == 2

client.get(reverse("cached_view"))
sentry_sdk.flush()
spans = [item.payload for item in items]
# second_event - cache.get
assert spans[5]["attributes"]["sentry.op"] == "cache.get"
assert spans[5]["name"].startswith("views.decorators.cache.cache_page.")
Expand Down Expand Up @@ -347,11 +349,8 @@ def test_cache_spans_templatetag(
items = capture_items("span")

client.get(reverse("view_with_cached_template_fragment"))
client.get(reverse("view_with_cached_template_fragment"))

sentry_sdk.flush()
spans = [item.payload for item in items]
assert len(spans) == 5
# first_event - cache.get
assert spans[0]["attributes"]["sentry.op"] == "cache.get"
assert spans[0]["name"].startswith("template.cache.some_identifier.")
Expand All @@ -370,6 +369,12 @@ def test_cache_spans_templatetag(
)
assert "cache.hit" not in spans[1]["attributes"]
assert spans[1]["attributes"]["cache.item_size"] == 51

client.get(reverse("view_with_cached_template_fragment"))
sentry_sdk.flush()
spans = [item.payload for item in items]

assert len(spans) == 5
# second_event - cache.get
assert spans[3]["attributes"]["sentry.op"] == "cache.get"
assert spans[3]["name"].startswith("template.cache.some_identifier.")
Expand Down Expand Up @@ -537,11 +542,9 @@ def test_cache_spans_item_size(
items = capture_items("span")

client.get(reverse("cached_view"))
client.get(reverse("cached_view"))

sentry_sdk.flush()
spans = [item.payload for item in items]
assert len(spans) == 7

assert spans[0]["attributes"]["sentry.op"] == "cache.get"
assert not spans[0]["attributes"]["cache.hit"]
assert "cache.item_size" not in spans[0]["attributes"]
Expand All @@ -554,6 +557,12 @@ def test_cache_spans_item_size(
assert "cache.hit" not in spans[2]["attributes"]
assert spans[2]["attributes"]["cache.item_size"] == 58

client.get(reverse("cached_view"))
sentry_sdk.flush()
spans = [item.payload for item in items]

assert len(spans) == 7

assert spans[4]["attributes"]["sentry.op"] == "cache.get"
assert spans[4]["attributes"]["cache.hit"]
assert spans[4]["attributes"]["cache.item_size"] == 2
Expand Down
148 changes: 0 additions & 148 deletions tests/integrations/fastmcp/test_fastmcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,8 @@
- Error capture and instrumentation
- Request context data extraction
- Transport detection (stdio, http, sse)

All tests invoke tools/prompts/resources through the MCP Server's low-level
request handlers (via CallToolRequest, GetPromptRequest, ReadResourceRequest)
to properly trigger Sentry instrumentation and span creation. This ensures
accurate testing of the integration's behavior in real MCP Server scenarios.
"""

import asyncio
import json
import logging
from unittest import mock
Expand Down Expand Up @@ -76,14 +70,6 @@ async def __call__(self, *args, **kwargs):
except ImportError:
request_ctx = None

# Try to import MCP types for helper functions
try:
from mcp.types import CallToolRequest, GetPromptRequest, ReadResourceRequest
except ImportError:
# If mcp.types not available, tests will be skipped anyway
CallToolRequest = None
GetPromptRequest = None
ReadResourceRequest = None

# Collect available FastMCP implementations for parametrization
fastmcp_implementations = []
Expand All @@ -98,140 +84,6 @@ async def __call__(self, *args, **kwargs):
fastmcp_ids.append("fastmcp")


# Helper functions to call tools through MCP Server protocol
def call_tool_through_mcp(mcp_instance, tool_name, arguments):
"""
Call a tool through MCP Server's low-level handler.
This properly triggers Sentry instrumentation.

Args:
mcp_instance: The FastMCP instance
tool_name: Name of the tool to call
arguments: Dictionary of arguments to pass to the tool

Returns:
The tool result normalized to {"result": value} format
"""
handler = mcp_instance._mcp_server.request_handlers[CallToolRequest]
request = CallToolRequest(
method="tools/call", params={"name": tool_name, "arguments": arguments}
)

result = asyncio.run(handler(request))

if hasattr(result, "root"):
result = result.root
if hasattr(result, "structuredContent") and result.structuredContent:
result = result.structuredContent
elif hasattr(result, "content"):
if result.content:
text = result.content[0].text
try:
result = json.loads(text)
except (json.JSONDecodeError, TypeError):
result = text
else:
# Empty content means None return
result = None

# Normalize return value to consistent format
# If already a dict, return as-is (tool functions return dicts directly)
if isinstance(result, dict):
return result

# Handle string "None" or "null" as actual None
if isinstance(result, str) and result in ("None", "null"):
result = None

# Wrap primitive values (int, str, bool, None) in dict format for consistency
return {"result": result}


async def call_tool_through_mcp_async(mcp_instance, tool_name, arguments):
"""Async version of call_tool_through_mcp."""
handler = mcp_instance._mcp_server.request_handlers[CallToolRequest]
request = CallToolRequest(
method="tools/call", params={"name": tool_name, "arguments": arguments}
)

result = await handler(request)

if hasattr(result, "root"):
result = result.root
if hasattr(result, "structuredContent") and result.structuredContent:
result = result.structuredContent
elif hasattr(result, "content"):
if result.content:
text = result.content[0].text
try:
result = json.loads(text)
except (json.JSONDecodeError, TypeError):
result = text
else:
# Empty content means None return
result = None

# Normalize return value to consistent format
# If already a dict, return as-is (tool functions return dicts directly)
if isinstance(result, dict):
return result

# Handle string "None" or "null" as actual None
if isinstance(result, str) and result in ("None", "null"):
result = None

# Wrap primitive values (int, str, bool, None) in dict format for consistency
return {"result": result}


def call_prompt_through_mcp(mcp_instance, prompt_name, arguments=None):
"""Call a prompt through MCP Server's low-level handler."""
handler = mcp_instance._mcp_server.request_handlers[GetPromptRequest]
request = GetPromptRequest(
method="prompts/get", params={"name": prompt_name, "arguments": arguments or {}}
)

result = asyncio.run(handler(request))
if hasattr(result, "root"):
result = result.root
return result


async def call_prompt_through_mcp_async(mcp_instance, prompt_name, arguments=None):
"""Async version of call_prompt_through_mcp."""
handler = mcp_instance._mcp_server.request_handlers[GetPromptRequest]
request = GetPromptRequest(
method="prompts/get", params={"name": prompt_name, "arguments": arguments or {}}
)

result = await handler(request)
if hasattr(result, "root"):
result = result.root
return result


def call_resource_through_mcp(mcp_instance, uri):
"""Call a resource through MCP Server's low-level handler."""
handler = mcp_instance._mcp_server.request_handlers[ReadResourceRequest]
request = ReadResourceRequest(method="resources/read", params={"uri": str(uri)})

result = asyncio.run(handler(request))
if hasattr(result, "root"):
result = result.root
return result


async def call_resource_through_mcp_async(mcp_instance, uri):
"""Async version of call_resource_through_mcp."""
handler = mcp_instance._mcp_server.request_handlers[ReadResourceRequest]
request = ReadResourceRequest(method="resources/read", params={"uri": str(uri)})

result = await handler(request)
if hasattr(result, "root"):
result = result.root
return result


# Skip all tests if neither implementation is available
pytestmark = pytest.mark.skipif(
not (HAS_MCP_FASTMCP or HAS_STANDALONE_FASTMCP),
Expand Down
6 changes: 3 additions & 3 deletions tests/integrations/loguru/test_loguru.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ def test_levels(
expected_pattern = (
r" \| "
+ r"{:9}".format(level.name.upper())
+ r"\| tests\.integrations\.loguru\.test_loguru:test_levels:\d+ - test"
+ r"\| tests\.integrations\.loguru\.test_loguru:test_levels:\d+ - test$"
)

breadcrumbs = sentry_sdk.get_isolation_scope()._breadcrumbs
if not disable_breadcrumbs and created_breadcrumb:
(breadcrumb,) = breadcrumbs
assert breadcrumb["level"] == expected_event_level
assert breadcrumb["category"] == "tests.integrations.loguru.test_loguru"
assert re.fullmatch(expected_pattern, breadcrumb["message"][23:])
assert re.search(expected_pattern, breadcrumb["message"])
else:
assert not breadcrumbs

Expand All @@ -127,7 +127,7 @@ def test_levels(
for event in events:
assert event.payload["level"] == expected_event_level
assert event.payload["logger"] == "tests.integrations.loguru.test_loguru"
assert re.fullmatch(expected_pattern, event.payload["logentry"]["message"][23:])
assert re.search(expected_pattern, event.payload["logentry"]["message"])

for log in logs:
assert log.payload["level"] == expected_log_level
Expand Down
Loading
Loading