Skip to content

Commit bab0627

Browse files
committed
create overloads to make W3CTraceParent util easier to use
1 parent 0d19785 commit bab0627

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,7 @@ public void setAction(AgentSpan span, Connection connection) {
284284
if (priority == null) {
285285
return;
286286
}
287-
final String traceContext =
288-
DD_INSTRUMENTATION_PREFIX
289-
+ W3CTraceParent.build(span.getTraceId(), span.getSpanId(), priority);
287+
final String traceContext = DD_INSTRUMENTATION_PREFIX + W3CTraceParent.from(span);
290288

291289
connection.setClientInfo("OCSID.ACTION", traceContext);
292290

@@ -372,8 +370,7 @@ public void setApplicationName(AgentSpan span, Connection connection) {
372370
if (priority == null) {
373371
return;
374372
}
375-
final String traceParent =
376-
W3CTraceParent.build(span.getTraceId(), span.getSpanId(), priority);
373+
final String traceParent = W3CTraceParent.from(span);
377374
final String traceContext = "_DD_" + traceParent;
378375

379376
connection.setClientInfo("ApplicationName", traceContext);

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static AgentScope onEnter(
120120
Integer priority = span.forceSamplingDecision();
121121
if (priority != null) {
122122
if (!isSqlServer) {
123-
traceParent = W3CTraceParent.build(span.getTraceId(), span.getSpanId(), priority);
123+
traceParent = W3CTraceParent.from(span);
124124
}
125125
// set the dbm trace injected tag on the span
126126
span.setTag(DBM_TRACE_INJECTED, true);

dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ public static String buildComment(AgentSpan dbSpan, String hostname, String dbNa
7575
String dbService = dbSpan.getServiceName();
7676
String traceParent =
7777
Config.get().getDbmPropagationMode().equals(DBM_PROPAGATION_MODE_FULL)
78-
? W3CTraceParent.build(
79-
dbSpan.getTraceId(), dbSpan.getSpanId(), dbSpan.context().getSamplingPriority())
78+
? W3CTraceParent.from(dbSpan)
8079
: null;
8180

8281
// Use shared comment builder directly

dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ public <C> void inject(
7070
}
7171

7272
private <C> void injectTraceParent(DDSpanContext context, C carrier, CarrierSetter<C> setter) {
73-
String traceparent =
74-
W3CTraceParent.build(
75-
context.getTraceId(), context.getSpanId(), context.getSamplingPriority());
73+
String traceparent = W3CTraceParent.from(context);
7674
setter.set(carrier, TRACE_PARENT_KEY, traceparent);
7775
}
7876

dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CTraceParent.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import datadog.trace.api.DDSpanId;
44
import datadog.trace.api.DDTraceId;
5+
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
6+
import datadog.trace.core.DDSpanContext;
57

68
/**
79
* Utility class for building W3C traceparent headers.
@@ -22,11 +24,20 @@ private W3CTraceParent() {}
2224
* @param samplingPriority the sampling priority (positive values result in sampled flag set)
2325
* @return the W3C traceparent header value
2426
*/
25-
public static String build(DDTraceId traceId, long spanId, int samplingPriority) {
27+
public static String from(DDTraceId traceId, long spanId, int samplingPriority) {
2628
return "00-"
2729
+ traceId.toHexString()
2830
+ '-'
2931
+ DDSpanId.toHexStringPadded(spanId)
3032
+ (samplingPriority > 0 ? "-01" : "-00");
3133
}
34+
35+
public static String from(AgentSpan span) {
36+
return from(span.getTraceId(), span.getSpanId(), span.context().getSamplingPriority());
37+
}
38+
39+
public static String from(DDSpanContext spanContext) {
40+
return from(
41+
spanContext.getTraceId(), spanContext.getSpanId(), spanContext.getSamplingPriority());
42+
}
3243
}

0 commit comments

Comments
 (0)