FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(mcp): Nest MCP spans under HTTP transactions by alexander-alderman-webb · Pull Request #5292 · getsentry/sentry-python · GitHub

/ sentry-python Public

fix(mcp): Nest MCP spans under HTTP transactions - #5292

Merged
alexander-alderman-webb merged 20 commits into
masterfrom
webb/mcp-in-http
Feb 4, 2026
ConversationCommits (20)ChecksFiles changed
Merged

fix(mcp): Nest MCP spans under HTTP transactions#5292
alexander-alderman-webb merged 20 commits into
masterfrom
webb/mcp-in-http

Conversation

alexander-alderman-webb commented Jan 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

  • Patch StreamableHTTPServerTransport.handle_request() to store isolation and current scopes on the Starlette request object's scope attribute.

  • Run MCP handlers in the context of the stored scopes, if these are available.

  • Modify use_isolation_scope() and use_scope() context managers to accept None. The MCP protocol allows for transport layers that are not HTTP-based, so the scopes may not be available.

The Python MCP SDK uses an in-memory queue of requests. The HTTP propagation context is not active in the MCP decorators we patch, since they run after requests are retrieved from the queue.

Issues

Closes #5272
Closes PY-2022
Closes TET-1688

Reminders

linear Bot commented Jan 12, 2026

Copy link
Copy Markdown

PY-2022 MCP tool calls break distributed tracing within same service

TET-1688 Lengthy mcp.tool.result.content causes Sentry to drop critical MCP fields during serialization

alexander-alderman-webb commented Jan 12, 2026
View reviewed changes
Comment thread sentry_sdk/scope.py Outdated
alexander-alderman-webb marked this pull request as ready for review January 12, 2026 14:43
alexander-alderman-webb requested a review from a team as a code owner January 12, 2026 14:43

github-actions Bot commented Jan 13, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Semver Impact of This PR

🟢 Patch (bug fixes)

📋 Changelog Preview

This is how your changes will appear in the changelog.
Entries from this PR are highlighted with a left border (blockquote style).

New Features ✨

Span Streaming

  • feat(span-streaming): Add spans to telemetry pipeline, add span name and attributes (3) by sentrivana in #5399
  • feat(span-streaming): Add span batcher (2) by sentrivana in #5398
  • feat(span-streaming): Add experimental trace_lifecycle switch (1) by sentrivana in #5397

Other

  • feat(integration): add gen_ai.conversation.id if available by constantinius in #5307

Bug Fixes 🐛

Google Genai

  • fix(google-genai): Token reporting by alexander-alderman-webb in #5404
  • fix(google-genai): deactivate google genai when langchain is used by shellmayr in #5389

Mcp

  • fix(mcp): Nest MCP spans under HTTP transactions by alexander-alderman-webb in #5292
  • fix(mcp): Handle all awaitable return types by alexander-alderman-webb in #5415

Span Streaming

  • fix(span-streaming): Always preserialize attributes by sentrivana in #5407
  • fix(span-streaming): Warn about thread usage if any batcher is active by sentrivana in #5408

Other

  • fix(anthropic): Token reporting by alexander-alderman-webb in #5403
  • fix(arq): handle settings_cls passed as keyword argument by nc9 in #5393
  • fix(dramatiq): cleanup isolated scope and transaction when message is skipped by frankie567 in #5346
  • fix(openai): Token reporting by alexander-alderman-webb in #5406
  • fix(openai-agents): Inject propagation headers for HostedMCPTool when streaming by alexander-alderman-webb in #5405
  • fix: Fix list attribute type by sentrivana in #5417
  • fix: Adapt to new packaging in toxgen by sentrivana in #5382

Internal Changes 🔧

Fastmcp

  • test(fastmcp): Wrap prompt in Message by alexander-alderman-webb in #5411
  • test(fastmcp): Remove test_fastmcp_without_request_context() by alexander-alderman-webb in #5412
  • test(fastmcp): Use AsyncClient for SSE by alexander-alderman-webb in #5400
  • test(fastmcp): Use TestClient for Streamable HTTP by alexander-alderman-webb in #5384
  • test(fastmcp): Simulate stdio transport with memory streams by alexander-alderman-webb in #5333

Mcp

  • test(mcp): Use AsyncClient for SSE by alexander-alderman-webb in #5396
  • test(mcp): Use TestClient for Streamable HTTP by alexander-alderman-webb in #5383
  • test(mcp): Remove unused stdio helpers by alexander-alderman-webb in #5409
  • test(mcp): Simulate stdio transport with memory streams by alexander-alderman-webb in #5329

Other

  • ci: Fix lint step by sentrivana in #5418
  • ci: 🤖 Update test matrix with new releases (02/02) by github-actions in #5413
  • ci: Update tox and pin packaging version for tox by alexander-alderman-webb in #5381
  • ci: migration to the new codecov action by MathurAditya724 in #5392

Other

🤖 This preview updates automatically when you update the PR.

sentry Bot reviewed Jan 13, 2026
View reviewed changes
Comment thread sentry_sdk/integrations/mcp.py Outdated
cursor Bot reviewed Jan 13, 2026
View reviewed changes
Comment thread sentry_sdk/integrations/mcp.py
sentry Bot reviewed Jan 13, 2026
View reviewed changes
Comment thread sentry_sdk/integrations/mcp.py
cursor Bot reviewed Jan 13, 2026
View reviewed changes
Comment thread sentry_sdk/integrations/mcp.py
sentrivana approved these changes Jan 14, 2026
View reviewed changes

sentrivana left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

See comments, but other than that LGTM!

alexander-alderman-webb marked this pull request as draft January 16, 2026 14:37

github-actions Bot commented Feb 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ 13 passed | Total: 13 | Pass Rate: 100% | Execution Time: 7.35s

All tests are passing successfully.

❌ Patch coverage is 1.82%. Project has 13629 uncovered lines.

Files with missing lines (180)
File Patch % Lines
langchain.py 3.28% ⚠️ 590 Missing
utils.py 52.57% ⚠️ 433 Missing and 79 partials
openai.py 5.57% ⚠️ 492 Missing
utils.py 0.00% ⚠️ 479 Missing
__init__.py 5.08% ⚠️ 374 Missing
tracing_utils.py 45.27% ⚠️ 324 Missing and 28 partials
starlette.py 5.34% ⚠️ 337 Missing
scope.py 70.52% ⚠️ 242 Missing and 66 partials
transport.py 23.54% ⚠️ 302 Missing and 2 partials
client.py 55.98% ⚠️ 221 Missing and 56 partials
mcp.py 5.24% ⚠️ 253 Missing
anthropic.py 9.16% ⚠️ 248 Missing
transaction_profiler.py 35.52% ⚠️ 216 Missing and 10 partials
langgraph.py 5.29% ⚠️ 215 Missing
utils.py 16.08% ⚠️ 214 Missing
span_processor.py 0.00% ⚠️ 205 Missing
__init__.py 5.14% ⚠️ 203 Missing
continuous_profiler.py 43.45% ⚠️ 177 Missing and 17 partials
strawberry.py 8.54% ⚠️ 182 Missing
tracing.py 71.37% ⚠️ 136 Missing and 38 partials
aws_lambda.py 16.50% ⚠️ 167 Missing
huggingface_hub.py 8.89% ⚠️ 164 Missing
sanic.py 9.60% ⚠️ 160 Missing
aiohttp.py 10.84% ⚠️ 148 Missing
cloud_resource_context.py 0.00% ⚠️ 145 Missing
ai_client.py 0.00% ⚠️ 145 Missing
rust_tracing.py 0.00% ⚠️ 143 Missing
litellm.py 0.00% ⚠️ 138 Missing
litestar.py 9.59% ⚠️ 132 Missing
starlite.py 8.33% ⚠️ 132 Missing
falcon.py 8.94% ⚠️ 112 Missing
flask.py 12.50% ⚠️ 112 Missing
spotlight.py 28.47% ⚠️ 103 Missing and 8 partials
asgi.py 20.71% ⚠️ 111 Missing
cohere.py 12.70% ⚠️ 110 Missing
agent_run.py 0.00% ⚠️ 110 Missing
asgi.py 0.00% ⚠️ 109 Missing
hub.py 45.60% ⚠️ 105 Missing and 3 partials
envelope.py 54.59% ⚠️ 89 Missing and 17 partials
pymongo.py 10.17% ⚠️ 106 Missing
caching.py 0.00% ⚠️ 106 Missing
utils.py 0.00% ⚠️ 103 Missing
templates.py 0.00% ⚠️ 100 Missing
asyncpg.py 11.61% ⚠️ 99 Missing
quart.py 16.10% ⚠️ 99 Missing
wsgi.py 22.66% ⚠️ 99 Missing
models.py 4.81% ⚠️ 99 Missing
gcp.py 0.00% ⚠️ 98 Missing
otlp.py 0.00% ⚠️ 97 Missing
utils.py 13.39% ⚠️ 97 Missing
sessions.py 27.82% ⚠️ 96 Missing
pyramid.py 13.76% ⚠️ 94 Missing
tornado.py 14.55% ⚠️ 94 Missing
__init__.py 0.00% ⚠️ 93 Missing
bottle.py 11.65% ⚠️ 91 Missing
middleware.py 0.00% ⚠️ 90 Missing
agent_run.py 0.00% ⚠️ 90 Missing
_wsgi_common.py 30.71% ⚠️ 88 Missing and 1 partials
runner.py 0.00% ⚠️ 87 Missing
loguru.py 11.58% ⚠️ 84 Missing
asyncio.py 0.00% ⚠️ 80 Missing
invoke_agent.py 0.00% ⚠️ 79 Missing
session.py 15.56% ⚠️ 76 Missing
clickhouse_driver.py 17.58% ⚠️ 75 Missing
pure_eval.py 0.00% ⚠️ 73 Missing
worker.py 22.58% ⚠️ 72 Missing
ariadne.py 14.46% ⚠️ 71 Missing
gql.py 10.13% ⚠️ 71 Missing
sqlalchemy.py 10.26% ⚠️ 70 Missing
fastapi.py 15.85% ⚠️ 69 Missing
monitoring.py 17.07% ⚠️ 68 Missing
graphene.py 12.82% ⚠️ 68 Missing
transactions.py 0.00% ⚠️ 67 Missing
_queue.py 26.67% ⚠️ 66 Missing
logging.py 66.67% ⚠️ 51 Missing and 15 partials
stdlib.py 60.45% ⚠️ 53 Missing and 11 partials
boto3.py 14.86% ⚠️ 63 Missing
streaming.py 0.00% ⚠️ 62 Missing
httpx.py 16.44% ⚠️ 61 Missing
chalice.py 16.18% ⚠️ 57 Missing
propagator.py 0.00% ⚠️ 57 Missing
server.py 0.00% ⚠️ 56 Missing
spark_driver.py 67.47% ⚠️ 54 Missing and 2 partials
api.py 64.43% ⚠️ 53 Missing
graph_nodes.py 0.00% ⚠️ 52 Missing
gnu_backtrace.py 0.00% ⚠️ 51 Missing
socket.py 0.00% ⚠️ 50 Missing
views.py 0.00% ⚠️ 50 Missing
tools.py 0.00% ⚠️ 49 Missing
_batcher.py 41.25% ⚠️ 47 Missing
invoke_agent.py 0.00% ⚠️ 46 Missing
_asgi_common.py 16.67% ⚠️ 45 Missing
signals_handlers.py 0.00% ⚠️ 44 Missing
utils.py 22.22% ⚠️ 42 Missing and 1 partials
threading.py 63.16% ⚠️ 35 Missing and 5 partials
client.py 0.00% ⚠️ 40 Missing
serializer.py 84.95% ⚠️ 28 Missing and 10 partials
executing.py 0.00% ⚠️ 38 Missing
client.py 0.00% ⚠️ 38 Missing
_span_batcher.py 35.71% ⚠️ 36 Missing
serverless.py 0.00% ⚠️ 36 Missing
server.py 0.00% ⚠️ 35 Missing
sys_exit.py 0.00% ⚠️ 32 Missing
caches.py 49.15% ⚠️ 30 Missing and 2 partials
launchdarkly.py 0.00% ⚠️ 31 Missing
trytond.py 0.00% ⚠️ 30 Missing
tools.py 0.00% ⚠️ 30 Missing
integration.py 0.00% ⚠️ 30 Missing
error_tracing.py 0.00% ⚠️ 29 Missing
ai_client.py 13.33% ⚠️ 26 Missing
execute_tool.py 0.00% ⚠️ 26 Missing
utils.py 74.67% ⚠️ 19 Missing and 7 partials
scrubber.py 76.81% ⚠️ 16 Missing and 9 partials
_openai_completions_api.py 19.35% ⚠️ 25 Missing
ray.py 70.24% ⚠️ 25 Missing
_werkzeug.py 11.11% ⚠️ 24 Missing
typer.py 0.00% ⚠️ 24 Missing
__init__.py 93.89% ⚠️ 14 Missing and 10 partials
tasks.py 0.00% ⚠️ 24 Missing
_compat.py 41.03% ⚠️ 23 Missing
statsig.py 0.00% ⚠️ 23 Missing
logger.py 43.59% ⚠️ 22 Missing
decorator.py 37.14% ⚠️ 22 Missing
__init__.py 84.78% ⚠️ 14 Missing and 8 partials
_log_batcher.py 0.00% ⚠️ 21 Missing
attachments.py 27.59% ⚠️ 21 Missing
unraisablehook.py 0.00% ⚠️ 21 Missing
__init__.py 8.70% ⚠️ 21 Missing
openfeature.py 0.00% ⚠️ 20 Missing
execute_tool.py 0.00% ⚠️ 20 Missing
dramatiq.py 90.91% ⚠️ 10 Missing and 9 partials
unleash.py 0.00% ⚠️ 19 Missing
_lru_cache.py 43.33% ⚠️ 17 Missing and 1 partials
model_request.py 0.00% ⚠️ 18 Missing
traces.py 41.38% ⚠️ 17 Missing
monitor.py 81.97% ⚠️ 11 Missing and 5 partials
beat.py 92.24% ⚠️ 9 Missing and 7 partials
utils.py 0.00% ⚠️ 16 Missing
redis_cluster.py 52.94% ⚠️ 16 Missing
atexit.py 56.25% ⚠️ 14 Missing and 1 partials
excepthook.py 56.25% ⚠️ 14 Missing and 1 partials
feature_flags.py 56.25% ⚠️ 14 Missing
__init__.py 27.78% ⚠️ 13 Missing
types.py 0.00% ⚠️ 12 Missing
_async_common.py 86.27% ⚠️ 7 Missing and 5 partials
_types.py 66.67% ⚠️ 10 Missing
handoff.py 0.00% ⚠️ 10 Missing
_sync_common.py 88.00% ⚠️ 6 Missing and 4 partials
spark_worker.py 89.29% ⚠️ 6 Missing and 4 partials
metrics.py 47.06% ⚠️ 9 Missing
beam.py 94.05% ⚠️ 5 Missing and 3 partials
dedupe.py 85.00% ⚠️ 6 Missing and 2 partials
rq.py 97.44% ⚠️ 2 Missing and 6 partials
_metrics_batcher.py 65.00% ⚠️ 7 Missing
consts.py 0.00% ⚠️ 7 Missing
redis_py_cluster_legacy.py 53.33% ⚠️ 7 Missing
_init_implementation.py 75.00% ⚠️ 6 Missing
_openai_responses_api.py 33.33% ⚠️ 6 Missing
arq.py 97.52% ⚠️ 3 Missing and 3 partials
queries.py 90.32% ⚠️ 3 Missing and 2 partials
debug.py 91.30% ⚠️ 2 Missing and 2 partials
consts.py 0.00% ⚠️ 4 Missing
__init__.py 20.00% ⚠️ 4 Missing
__init__.py 0.00% ⚠️ 4 Missing
__init__.py 89.66% ⚠️ 3 Missing and 1 partials
__init__.py 0.00% ⚠️ 3 Missing
__init__.py 40.00% ⚠️ 3 Missing
__init__.py 0.00% ⚠️ 3 Missing
__init__.py 0.00% ⚠️ 3 Missing
rb.py 70.00% ⚠️ 3 Missing
redis.py 85.00% ⚠️ 3 Missing
consts.py 99.43% ⚠️ 2 Missing
argv.py 100.00% ⚠️ 2 partials
huey.py 100.00% ⚠️ 2 partials
modules.py 94.12% ⚠️ 1 Missing and 1 partials
utils.py 88.24% ⚠️ 2 Missing
agent_workflow.py 71.43% ⚠️ 2 Missing
api.py 100.00% ⚠️ 1 partials
consts.py 0.00% ⚠️ 1 Missing
consts.py 0.00% ⚠️ 1 Missing

Generated by Codecov Action

alexander-alderman-webb marked this pull request as ready for review February 4, 2026 14:01
cursor Bot reviewed Feb 4, 2026
View reviewed changes
Comment thread tests/integrations/mcp/test_mcp.py
cursor Bot reviewed Feb 4, 2026
View reviewed changes

cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.

Comment thread tests/integrations/mcp/test_mcp.py
alexander-alderman-webb merged commit 3bb163a into master Feb 4, 2026
154 checks passed
alexander-alderman-webb deleted the webb/mcp-in-http branch February 4, 2026 14:42
This was referenced Feb 4, 2026
Closed
Closed
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

sentry[bot] sentry[bot] left review comments
cursor[bot] cursor[bot] left review comments
sentrivana sentrivana approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

MCP tool calls break distributed tracing within same service

2 participants

Back | FazBrowse Home | New Git URL