fix(core): Fix span links serialization as tag

PerfectSlayer · PerfectSlayer · commit fe8227f556e3 · 2023-12-11T09:38:17.000+01:00
diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/OpenTelemetry14Test.groovy
@@ -175,10 +175,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
     def expectedLinksTag = """
     [
-      { traceId: "${traceId}",
-        spanId: "${spanId}",
-        traceFlags: 1,
-        traceState: "string-key=string-value"}
+      { trace_id: "${traceId}",
+        span_id: "${spanId}",
+        flags: 1,
+        tracestate: "string-key=string-value"}
     ]"""
 
     when:
@@ -212,10 +212,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
       def traceId = "1234567890abcdef1234567890abcde$it" as String
       def spanId = "fedcba098765432$it" as String
       def traceState = TraceState.builder().put('string-key', 'string-value'+it).build()
-      links << """{ traceId: "${traceId}",
-        spanId: "${spanId}",
-        traceFlags: 1,
-        traceState: "string-key=string-value$it"}"""
+      links << """{ trace_id: "${traceId}",
+        span_id: "${spanId}",
+        flags: 1,
+        tracestate: "string-key=string-value$it"}"""
       spanBuilder.addLink(SpanContext.create(traceId, spanId, TraceFlags.getSampled(), traceState))
     }
     def expectedLinksTag = "[${links.join(',')}]" as String
@@ -244,10 +244,10 @@ class OpenTelemetry14Test extends AgentTestRunner {
 
     def expectedLinksTag = """
     [
-      { traceId: "${traceId}",
-        spanId: "${spanId}",
-        traceFlags: 1,
-        traceState: "string-key=string-value"
+      { trace_id: "${traceId}",
+        span_id: "${spanId}",
+        flags: 1,
+        tracestate: "string-key=string-value"
         ${ expectedAttributes == null ? "" : ", attributes: " + expectedAttributes }}
     ]"""
 
@@ -282,12 +282,12 @@ class OpenTelemetry14Test extends AgentTestRunner {
     def traceId = "1234567890abcdef1234567890abcdef" as String
     def spanId = "fedcba0987654321" as String
 
-    def expectedTraceStateJson = expectedTraceState == null ? '' : ", traceState: \"$expectedTraceState\""
+    def expectedTraceStateJson = expectedTraceState == null ? '' : ", tracestate: \"$expectedTraceState\""
     def expectedLinksTag = """
     [
-      { traceId: "${traceId}",
-        spanId: "${spanId}",
-        traceFlags: 1
+      { trace_id: "${traceId}",
+        span_id: "${spanId}",
+        flags: 1
         $expectedTraceStateJson
       }
     ]"""
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
@@ -106,10 +106,10 @@ private static class SpanLinkAdapter {
     @ToJson
     SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
       SpanLinkJson json = new SpanLinkJson();
-      json.traceId = link.traceId().toHexString();
-      json.spanId = DDSpanId.toHexString(link.spanId());
-      json.traceFlags = link.traceFlags() == 0 ? null : link.traceFlags();
-      json.traceState = link.traceState().isEmpty() ? null : link.traceState();
+      json.trace_id = link.traceId().toHexString();
+      json.span_id = DDSpanId.toHexString(link.spanId());
+      json.flags = link.traceFlags() == 0 ? null : link.traceFlags();
+      json.tracestate = link.traceState().isEmpty() ? null : link.traceState();
       if (!link.attributes().isEmpty()) {
         json.attributes = link.attributes().asMap();
       }
@@ -119,19 +119,19 @@ SpanLinkJson toSpanLinkJson(AgentSpanLink link) {
     @FromJson
     AgentSpanLink fromSpanLinkJson(SpanLinkJson json) {
       return new DDSpanLink(
-          DDTraceId.fromHex(json.traceId),
-          DDSpanId.fromHex(json.spanId),
-          json.traceFlags,
-          json.traceState,
+          DDTraceId.fromHex(json.trace_id),
+          DDSpanId.fromHex(json.span_id),
+          json.flags,
+          json.tracestate,
           SpanLinkAttributes.fromMap(json.attributes));
     }
   }
 
   private static class SpanLinkJson {
-    String traceId;
-    String spanId;
-    Byte traceFlags;
-    String traceState;
+    String trace_id;
+    String span_id;
+    Byte flags;
+    String tracestate;
     Map<String, String> attributes;
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanLinkTest.groovy
@@ -106,7 +106,7 @@ class DDSpanLinkTest extends DDCoreSpecification {
     def spanLinksTag = writer[0][0].tags[SPAN_LINKS] as String
 
     then:
-    spanLinksTag == '[{"spanId":"123456789abcdef0","traceId":"11223344556677889900aabbccddeeff"}]'
+    spanLinksTag == '[{"span_id":"123456789abcdef0","trace_id":"11223344556677889900aabbccddeeff"}]'
   }
 
   def "add span link at any time"() {
@@ -176,17 +176,17 @@ class DDSpanLinkTest extends DDCoreSpecification {
   }
 
   def assertLink(SpanLink expected, DDSpanLink.SpanLinkJson actual) {
-    assert expected.traceId().toHexString() == actual.traceId
-    assert DDSpanId.toHexString(expected.spanId()) == actual.spanId
+    assert expected.traceId().toHexString() == actual.trace_id
+    assert DDSpanId.toHexString(expected.spanId()) == actual.span_id
     if (expected.traceFlags() == DEFAULT_FLAGS) {
-      assert null == actual.traceFlags
+      assert null == actual.flags
     } else {
-      assert expected.traceFlags() == actual.traceFlags
+      assert expected.traceFlags() == actual.flags
     }
     if (expected.traceState().isEmpty()) {
-      assert null == actual.traceState
+      assert null == actual.tracestate
     } else {
-      assert expected.traceState() == actual.traceState
+      assert expected.traceState() == actual.trace_id
     }
     if (expected.attributes().isEmpty()) {
       assert null == actual.attributes
