Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fe8227f

Browse files
fix(core): Fix span links serialization as tag
1 parent 5307b46 commit fe8227f

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
175175

176176
def expectedLinksTag = """
177177
[
178-
{ traceId: "${traceId}",
179-
spanId: "${spanId}",
180-
traceFlags: 1,
181-
traceState: "string-key=string-value"}
178+
{ trace_id: "${traceId}",
179+
span_id: "${spanId}",
180+
flags: 1,
181+
tracestate: "string-key=string-value"}
182182
]"""
183183

184184
when:
@@ -212,10 +212,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
212212
def traceId = "1234567890abcdef1234567890abcde$it" as String
213213
def spanId = "fedcba098765432$it" as String
214214
def traceState = TraceState.builder().put('string-key', 'string-value'+it).build()
215-
links << """{ traceId: "${traceId}",
216-
spanId: "${spanId}",
217-
traceFlags: 1,
218-
traceState: "string-key=string-value$it"}"""
215+
links << """{ trace_id: "${traceId}",
216+
span_id: "${spanId}",
217+
flags: 1,
218+
tracestate: "string-key=string-value$it"}"""
219219
spanBuilder.addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
220220
}
221221
def expectedLinksTag = "[${links.join(',')}]" as String
@@ -244,10 +244,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
244244

245245
def expectedLinksTag = """
246246
[
247-
{ traceId: "${traceId}",
248-
spanId: "${spanId}",
249-
traceFlags: 1,
250-
traceState: "string-key=string-value"
247+
{ trace_id: "${traceId}",
248+
span_id: "${spanId}",
249+
flags: 1,
250+
tracestate: "string-key=string-value"
251251
${ expectedAttributes == null ? "" : ", attributes: " + expectedAttributes }}
252252
]"""
253253

@@ -282,12 +282,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
282282
def traceId = "1234567890abcdef1234567890abcdef" as String
283283
def spanId = "fedcba0987654321" as String
284284

285-
def expectedTraceStateJson = expectedTraceState == null ? '' : ", traceState: \"$expectedTraceState\""
285+
def expectedTraceStateJson = expectedTraceState == null ? '' : ", tracestate: \"$expectedTraceState\""
286286
def expectedLinksTag = """
287287
[
288-
{ traceId: "${traceId}",
289-
spanId: "${spanId}",
290-
traceFlags: 1
288+
{ trace_id: "${traceId}",
289+
span_id: "${spanId}",
290+
flags: 1
291291
$expectedTraceStateJson
292292
}
293293
]"""

‎dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ private static class SpanLinkAdapter {
106106
@ToJson
107107
SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
108108
SpanLinkJson json = new SpanLinkJson();
109-
json.traceId = link.traceId().toHexString();
110-
json.spanId = DDSpanId.toHexString(link.spanId());
111-
json.traceFlags = link.traceFlags() == 0 ? null : link.traceFlags();
112-
json.traceState = link.traceState().isEmpty() ? null : link.traceState();
109+
json.trace_id = link.traceId().toHexString();
110+
json.span_id = DDSpanId.toHexString(link.spanId());
111+
json.flags = link.traceFlags() == 0 ? null : link.traceFlags();
112+
json.tracestate = link.traceState().isEmpty() ? null : link.traceState();
113113
if (!link.attributes().isEmpty()) {
114114
json.attributes = link.attributes().asMap();
115115
}
@@ -119,19 +119,19 @@ SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
119119
@FromJson
120120
AgentSpanLink fromSpanLinkJson(SpanLinkJson json) {
121121
return new DDSpanLink(
122-
DDTraceId.fromHex(json.traceId),
123-
DDSpanId.fromHex(json.spanId),
124-
json.traceFlags,
125-
json.traceState,
122+
DDTraceId.fromHex(json.trace_id),
123+
DDSpanId.fromHex(json.span_id),
124+
json.flags,
125+
json.tracestate,
126126
SpanLinkAttributes.fromMap(json.attributes));
127127
}
128128
}
129129

130130
private static class SpanLinkJson {
131-
String traceId;
132-
String spanId;
133-
Byte traceFlags;
134-
String traceState;
131+
String trace_id;
132+
String span_id;
133+
Byte flags;
134+
String tracestate;
135135
Map<String, String> attributes;
136136
}
137137
}

‎dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class DDSpanLinkTest extends DDCoreSpecification {
106106
def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
107107

108108
then:
109-
spanLinksTag == '[{"spanId":"123456789abcdef0","traceId":"11223344556677889900aabbccddeeff"}]'
109+
spanLinksTag == '[{"span_id":"123456789abcdef0","trace_id":"11223344556677889900aabbccddeeff"}]'
110110
}
111111

112112
def "add span link at any time"() {
@@ -176,17 +176,17 @@ class DDSpanLinkTest extends DDCoreSpecification {
176176
}
177177

178178
def assertLink(SpanLink expected, DDSpanLink.SpanLinkJson actual) {
179-
assert expected.traceId().toHexString() == actual.traceId
180-
assert DDSpanId.toHexString(expected.spanId()) == actual.spanId
179+
assert expected.traceId().toHexString() == actual.trace_id
180+
assert DDSpanId.toHexString(expected.spanId()) == actual.span_id
181181
if (expected.traceFlags() == DEFAULT_FLAGS) {
182-
assert null == actual.traceFlags
182+
assert null == actual.flags
183183
} else {
184-
assert expected.traceFlags() == actual.traceFlags
184+
assert expected.traceFlags() == actual.flags
185185
}
186186
if (expected.traceState().isEmpty()) {
187-
assert null == actual.traceState
187+
assert null == actual.tracestate
188188
} else {
189-
assert expected.traceState() == actual.traceState
189+
assert expected.traceState() == actual.trace_id
190190
}
191191
if (expected.attributes().isEmpty()) {
192192
assert null == actual.attributes

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /