Skip to content

Commit 97d7e52

Browse files
bm1549claude
andcommitted
Address PR feedback: rename datadogTags to expectedDataTags, store ksr as primitive double
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent e0ce92a commit 97d7e52

2 files changed

Lines changed: 12 additions & 13 deletions

File tree

dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ class OpenTelemetryTest extends InstrumentationSpecification {
277277
"-${DDSpanId.toHexStringPadded(spanId)}" +
278278
"-" + (propagatedPriority > 0 ? "01" : "00")
279279
def expectedTracestate = "dd=s:${propagatedPriority};p:${DDSpanId.toHexStringPadded(spanId)}"
280-
def datadogTags = []
280+
def expectedDataTags = []
281281
if (propagatedMechanism != UNKNOWN) {
282-
datadogTags << "_dd.p.dm=-" + propagatedMechanism
282+
expectedDataTags << "_dd.p.dm=-" + propagatedMechanism
283283
expectedTracestate += ";t.dm:-" + propagatedMechanism
284284
}
285285
if (traceId.toHighOrderLong() != 0) {
@@ -289,10 +289,10 @@ class OpenTelemetryTest extends InstrumentationSpecification {
289289
expectedTracestate += ";t.ksr:1"
290290
}
291291
if (traceId.toHighOrderLong() != 0) {
292-
datadogTags << "_dd.p.tid=" + traceId.toHexStringPadded(32).substring(0, 16)
292+
expectedDataTags << "_dd.p.tid=" + traceId.toHexStringPadded(32).substring(0, 16)
293293
}
294294
if (contextPriority == UNSET) {
295-
datadogTags << "_dd.p.ksr=1"
295+
expectedDataTags << "_dd.p.ksr=1"
296296
}
297297
def expectedTextMap = [
298298
"x-datadog-trace-id" : "$traceId",
@@ -301,8 +301,8 @@ class OpenTelemetryTest extends InstrumentationSpecification {
301301
"traceparent" : expectedTraceparent,
302302
"tracestate" : expectedTracestate,
303303
]
304-
if (!datadogTags.empty) {
305-
expectedTextMap.put("x-datadog-tags", datadogTags.join(','))
304+
if (!expectedDataTags.empty) {
305+
expectedTextMap.put("x-datadog-tags", expectedDataTags.join(','))
306306
}
307307
textMap == expectedTextMap
308308

dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/PTagsFactory.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ static class PTags extends PropagationTags {
9292
private volatile int traceSource;
9393
private volatile String debugPropagation;
9494

95-
// extracted Knuth sampling rate tag for easier updates
96-
private volatile TagValue knuthSamplingRateTagValue;
95+
private volatile double knuthSamplingRate = Double.NaN;
9796

9897
// xDatadogTagsSize of the tagPairs, does not include the decision maker tag
9998
private volatile int xDatadogTagsSize = -1;
@@ -272,12 +271,11 @@ public String getDebugPropagation() {
272271

273272
@Override
274273
public void updateKnuthSamplingRate(double rate) {
275-
TagValue newValue = TagValue.from(formatKnuthSamplingRate(rate));
276-
if (!Objects.equals(knuthSamplingRateTagValue, newValue)) {
274+
if (Double.compare(knuthSamplingRate, rate) != 0) {
277275
clearCachedHeader(DATADOG);
278276
clearCachedHeader(W3C);
277+
knuthSamplingRate = rate;
279278
}
280-
knuthSamplingRateTagValue = newValue;
281279
}
282280

283281
/** Formats a sampling rate with up to 6 significant digits and no trailing zeros. */
@@ -298,7 +296,8 @@ static String formatKnuthSamplingRate(double rate) {
298296
}
299297

300298
TagValue getKnuthSamplingRateTagValue() {
301-
return knuthSamplingRateTagValue;
299+
double rate = knuthSamplingRate;
300+
return Double.isNaN(rate) ? null : TagValue.from(formatKnuthSamplingRate(rate));
302301
}
303302

304303
@Override
@@ -428,7 +427,7 @@ int getXDatadogTagsSize() {
428427
size = PTagsCodec.calcXDatadogTagsSize(size, TRACE_ID_TAG, traceIdHighOrderBitsHexTagValue);
429428
size =
430429
PTagsCodec.calcXDatadogTagsSize(
431-
size, KNUTH_SAMPLING_RATE_TAG, knuthSamplingRateTagValue);
430+
size, KNUTH_SAMPLING_RATE_TAG, getKnuthSamplingRateTagValue());
432431
int currentProductTraceSource = traceSource;
433432
if (currentProductTraceSource != ProductTraceSource.UNSET) {
434433
size =

0 commit comments

Comments
 (0)