fix(mcp): Nest MCP spans under HTTP transactions #5292
Draft
Conversation
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
sentry_sdk/scope.py
Outdated
Comment on lines
1874
to
1902
| def use_isolation_scope(isolation_scope: "Scope") -> "Generator[Scope, None, None]": | ||
| def use_isolation_scope(isolation_scope: "S") -> "Generator[S, None, None]": | ||
| """ | ||
| .. versionadded:: 2.0.0 | ||
| Context manager that uses the given `isolation_scope` and runs the wrapped code in it. | ||
| The current scope is also forked to not bleed data into the existing current scope. | ||
| After the wrapped code is executed, the original scopes are restored. | ||
| Example Usage: | ||
| .. code-block:: python | ||
| import sentry_sdk | ||
| with sentry_sdk.isolation_scope() as scope: | ||
| scope.set_tag("color", "green") | ||
| sentry_sdk.capture_message("hello") # will include `color` tag. | ||
| sentry_sdk.capture_message("hello, again") # will NOT include `color` tag. | ||
| """ | ||
| if isolation_scope is None: | ||
| yield isolation_scope | ||
| return |
Contributor
Author
There was a problem hiding this comment.
I'm not sure about accepting None in the context managers. It's convenient in the MCP integration since it helps avoid code duplication (or the need to break stuff into more functions).
We could also just check if the scopes are None, so I can adjust if needed.
Contributor
There was a problem hiding this comment.
I probably wouldn't allow None in the context managers. If they were just internal utils it'd probably be ok to update them to support this sort of internal usecase, but since they're part of the public API, we should keep them tidy.
You might be able to use nullcontext instead to get around some of the potential mess of having to conditionally wrap code in a with block.
Contributor
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. New Features ✨
Bug Fixes 🐛Integrations
Litellm
Other
Documentation 📚
Internal Changes 🔧Release
Other
🤖 This preview updates automatically when you update the PR. |
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
sentrivana
approved these changes
Jan 14, 2026
Contributor
sentrivana
left a comment
sentrivana
left a comment
There was a problem hiding this comment.
See comments, but other than that LGTM!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Patch
StreamableHTTPServerTransport.handle_request()to store isolation and current scopes on the Starlette request object'sscopeattribute.Run MCP handlers in the context of the stored scopes, if these are available.
Modify
use_isolation_scope()anduse_scope()context managers to acceptNone. 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
tox -e linters.feat:,fix:,ref:,meta:)