Fix threading by carrying forward span reference in use_scope
#3851
Conversation
This file contains 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
`use_scope` Since the otel context span reference is the source of truth for the current active span, we need to explicitly pass the span reference on the scope through when we use `use_scope` since we are changing context variables in the other thread. Also, * fixes some typing in the original scope * adds more types to the `contextvars_context` manager
sl0thentr0py
changed the title
use_scope
❌ 308 Tests Failed:
View the full list of 3 ❄️ flaky tests
To view more test analytics, go to the Test Analytics Dashboard |
sl0thentr0py
commented
Dec 4, 2024
| @@ -99,7 +86,8 @@ def _run_old_run_func(): | |||
| with sentry_sdk.use_scope(current_scope_to_use): | |||
| return _run_old_run_func() | |||
| else: | |||
| return _run_old_run_func() | |||
| with sentry_sdk.isolation_scope(): | |||
There was a problem hiding this comment.
I think the old logic here was actually wrong but kinda worked because of some fallback code in the scope implementation.
Semantically, if we don't explicitly propagate the scopes, we should ALWAYS have created a new isolation scope for the new thread.
sl0thentr0py
merged commit 92f5f0a
into
neel/potel/move-scope-init
67 of 125 checks passed
sl0thentr0py
added a commit
that referenced
this pull request
Dec 5, 2024
* Move scope context init outside integration * Fix ThreadingIntegration by carrying forward span reference in (#3851) `use_scope` Since the otel context span reference is the source of truth for the current active span, we need to explicitly pass the span reference on the scope through when we use `use_scope` since we are changing context variables in the other thread. Also, * fixes some typing in the original scope * adds more types to the `contextvars_context` manager
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.
Since the otel context span reference is the source of truth for the current active span, we need to explicitly pass the span reference on the scope through when we use
use_scopesince we are changing context variables in the other thread.Also,
propagate_hubcompletelycontextvars_contextmanager