Skip to content

Take defensive copy of original scope stack when restoring on different thread #9403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2025
Merged

Take defensive copy of original scope stack when restoring on different thread #9403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public Context swap(Context context) {
ContinuableScope newScope;
if (context instanceof ScopeContext) {
// restore previously swapped context stack
newStack = ((ScopeContext) context).scopeStack;
newStack = ((ScopeContext) context).restore();
newScope = newStack.top;
} else if (context != Context.root()) {
// start a new stack and record the new context as active
Expand Down
8 changes: 7 additions & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

/** Wraps a {@link ScopeStack} as a {@link Context} so it can be swapped back later. */
final class ScopeContext implements Context {
final ScopeStack scopeStack;
private final Thread originalThread = Thread.currentThread();
private final ScopeStack scopeStack;
private final Context context;

ScopeContext(ScopeStack scopeStack) {
Expand All @@ -18,6 +19,11 @@ private ScopeContext(ScopeStack scopeStack, Context context) {
this.context = context;
}

ScopeStack restore() {
// take defensive copy of original scope stack when restoring on different thread
return originalThread == Thread.currentThread() ? scopeStack : scopeStack.copy();
}

@Nullable
@Override
public <T> T get(ContextKey<T> key) {
Expand Down