Fix printing format of span identifiers (DataDog#8897)

vandonr · PerfectSlayer · web-flow · commit 3070e2ea0eac · 2025-05-30T16:36:20.000+02:00
* fix printing format of span IDs

* use DDSpanID.toString

Co-authored-by: Bruce Bujon &lt;PerfectSlayer@users.noreply.github.com&gt;

* use DDSpanID.toString

Co-authored-by: Bruce Bujon &lt;PerfectSlayer@users.noreply.github.com&gt;

* add test

* fix build

* fix test name

---------

Co-authored-by: Bruce Bujon &lt;PerfectSlayer@users.noreply.github.com&gt;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
@@ -5,6 +5,7 @@
 import static datadog.trace.api.cache.RadixTreeCache.HTTP_STATUSES;
 import static datadog.trace.bootstrap.instrumentation.api.ErrorPriorities.UNSET;
 
+import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.Functions;
@@ -892,9 +893,9 @@ public String toString() {
             .append("DDSpan [ t_id=")
             .append(traceId)
             .append(", s_id=")
-            .append(spanId)
+            .append(DDSpanId.toString(spanId))
             .append(", p_id=")
-            .append(parentId)
+            .append(DDSpanId.toString(parentId))
             .append(" ] trace=")
             .append(getServiceName())
             .append('/')
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy
@@ -19,7 +19,7 @@ import static datadog.trace.core.DDSpanContext.SPAN_SAMPLING_MAX_PER_SECOND_TAG
 class DDSpanContextTest extends DDCoreSpecification {
 
   def writer
-  def tracer
+  CoreTracer tracer
   def profilingContextIntegration
 
   def setup() {
@@ -289,6 +289,29 @@ class DDSpanContextTest extends DDCoreSpecification {
     "_dd.${tag}.json"
   }
 
+  def "Span IDs printed as unsigned long"() {
+    setup:
+    def parent = tracer.buildSpan("fakeOperation")
+      .withServiceName("fakeService")
+      .withResourceName("fakeResource")
+      .withSpanId(-987654321)
+      .start()
+
+    def span = tracer.buildSpan("fakeOperation")
+      .withServiceName("fakeService")
+      .withResourceName("fakeResource")
+      .withSpanId(-123456789)
+      .asChildOf(parent.context())
+      .start()
+
+    def context = span.context() as DDSpanContext
+
+    expect:
+    // even though span ID and parent ID are setup as negative numbers, they should be printed as their unsigned value
+    // asserting there is no negative sign after ids is the best I can do.
+    context.toString().contains("id=-") == false
+  }
+
   static void assertTagmap(Map source, Map comparison, boolean removeThread = false) {
     def sourceWithoutCommonTags = new HashMap(source)
     sourceWithoutCommonTags.remove("runtime-id")
