Skip to content

Changing traceSource to volatile rather than an AtomicInteger #10614

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
dougqh merged 3 commits into from
Feb 18, 2026
+10 −6
Merged

Changing traceSource to volatile rather than an AtomicInteger #10614

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19382d9
Changing traceSource to volatile rather than an AtomicInteger
dougqh Feb 17, 2026
865e05a
Addressing review comments - renaming from AFU_<X> to <X>_UPDATER
dougqh Feb 17, 2026
5f28e32
Merge branch 'master' into dougqh/optimize-ptags
dougqh Feb 18, 2026
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
16 changes: 10 additions & 6 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import javax.annotation.Nonnull;

public class PTagsFactory implements PropagationTags.Factory {
Expand Down Expand Up @@ -84,7 +84,10 @@ static class PTags extends PropagationTags {
// extracted decision maker tag for easier updates
private volatile TagValue decisionMakerTagValue;

private final AtomicInteger traceSource;
private static final AtomicIntegerFieldUpdater<PTags> TRACE_SOURCE_UPDATER =
AtomicIntegerFieldUpdater.newUpdater(PTags.class, "traceSource");

private volatile int traceSource;
private volatile String debugPropagation;

// xDatadogTagsSize of the tagPairs, does not include the decision maker tag
Expand Down Expand Up @@ -152,7 +155,7 @@ public PTags(
this.tagPairs = tagPairs;
this.canChangeDecisionMaker = decisionMakerTagValue == null;
this.decisionMakerTagValue = decisionMakerTagValue;
this.traceSource = new AtomicInteger(traceSource);
this.traceSource = traceSource;
this.samplingPriority = samplingPriority;
this.origin = origin;
this.lastParentId = lastParentId;
Expand Down Expand Up @@ -230,7 +233,8 @@ private void doUpdateTraceSamplingPriority(int samplingPriority, int samplingMec

@Override
public void addTraceSource(final int product) {
traceSource.updateAndGet(
TRACE_SOURCE_UPDATER.updateAndGet(
this,
currentValue -> {
// If the product is already marked, return the same value (no change)
if (ProductTraceSource.isProductMarked(currentValue, product)) {
Expand All @@ -248,7 +252,7 @@ public void addTraceSource(final int product) {

@Override
public int getTraceSource() {
return traceSource.get();
return traceSource;
}

@Override
Expand Down Expand Up @@ -386,7 +390,7 @@ int getXDatadogTagsSize() {
size = PTagsCodec.calcXDatadogTagsSize(getTagPairs());
size = PTagsCodec.calcXDatadogTagsSize(size, DECISION_MAKER_TAG, decisionMakerTagValue);
size = PTagsCodec.calcXDatadogTagsSize(size, TRACE_ID_TAG, traceIdHighOrderBitsHexTagValue);
int currentProductTraceSource = traceSource.get();
int currentProductTraceSource = traceSource;
if (currentProductTraceSource != ProductTraceSource.UNSET) {
size =
PTagsCodec.calcXDatadogTagsSize(
Expand Down
Loading