Skip to content

DSM: Testing system-tests behaviour #10969

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

Draft
robcarlan-datadog wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

DSM: Testing system-tests behaviour #10969

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
14 changes: 1 addition & 13 deletions dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.Objects;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.function.Function;
import javax.annotation.Nonnull;
Expand Down Expand Up @@ -690,18 +689,7 @@ public void mergePathwayContext(PathwayContext pathwayContext) {
if (pathwayContext == null) {
return;
}

// This is purposely not thread safe
// The code randomly chooses between the two PathwayContexts.
// If there is a race, then that's okay
if (this.pathwayContext.isStarted()) {
// Randomly select between keeping the current context (0) or replacing (1)
if (ThreadLocalRandom.current().nextInt(2) == 1) {
this.pathwayContext = pathwayContext;
}
} else {
this.pathwayContext = pathwayContext;
}
this.pathwayContext = pathwayContext;
}

public CoreTracer getTracer() {
Expand Down
Loading