Switch to 128-bit trace ID tracking

dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java

@@ -10,6 +10,7 @@
 import com.sun.jna.Pointer;
 import datadog.cws.erpc.Erpc;
 import datadog.cws.erpc.Request;
+import datadog.trace.api.DD128bTraceId;
 import datadog.trace.api.DDTraceId;
 
 /**
@@ -21,7 +22,9 @@
 public class ErpcTls implements Tls {
   public static final byte REGISTER_SPAN_TLS_OP = 6;
   public static final long TLS_FORMAT = 0;
-  static final long ENTRY_SIZE = Native.LONG_SIZE * 2;
+  static final int SPAN_ID_SIZE = 8; // 64 bits
+  static final int TRACE_ID_SIZE = 16; // 128 bits
+  static final long ENTRY_SIZE = SPAN_ID_SIZE + TRACE_ID_SIZE;
 
   // Thread local storage
   private Pointer tls;
@@ -134,15 +137,16 @@ private long getSpanIdOffset(int threadId) {
   }
 
   private long getTraceIdOffset(int threadId) {
-    return getSpanIdOffset(threadId) + Native.LONG_SIZE;
+    return getSpanIdOffset(threadId) + SPAN_ID_SIZE;
   }
 
   public void registerSpan(int threadId, DDTraceId traceId, long spanId) {
     long spanIdOffset = getSpanIdOffset(threadId);
     long traceIdOffset = getTraceIdOffset(threadId);
 
     tls.setLong(spanIdOffset, spanId);
-    tls.setLong(traceIdOffset, traceId.toLong());
+    tls.setLong(traceIdOffset, traceId.toLong()); // low bits
+    tls.setLong(traceIdOffset + 8, traceId.toHighOrderLong()); // high bits
   }
 
   public void registerSpan(DDTraceId traceId, long spanId) {
@@ -160,7 +164,9 @@ public long getSpanId() {
 
   public DDTraceId getTraceId(int threadId) {
     long offset = getTraceIdOffset(threadId);
-    return DDTraceId.from(tls.getLong(offset));
+    long lowBits = tls.getLong(offset);
+    long highBits = tls.getLong(offset + 8);
+    return DD128bTraceId.from(highBits, lowBits);
   }
 
   public DDTraceId getTraceId() {

dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/NoTls.java

@@ -1,5 +1,6 @@
 package datadog.cws.tls;
 
+import datadog.trace.api.DD128bTraceId;
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 
@@ -12,6 +13,6 @@ public long getSpanId() {
   }
 
   public DDTraceId getTraceId() {
-    return DDTraceId.ZERO;
+    return DD128bTraceId.ZERO;
   }
 }

dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/TlsScopeListener.java

@@ -1,5 +1,6 @@
 package datadog.cws.tls;
 
+import datadog.trace.api.DD128bTraceId;
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.scopemanager.ExtendedScopeListener;
@@ -24,8 +25,7 @@ void push(DDTraceId traceId, long spanId) {
     Deque<Span> stack = spanStack.get();
 
     Span top = stack.peek();
-    if (top == null || top.getTraceId().toLong() != traceId.toLong() || top.getSpanId() != spanId) {
-
+    if (top == null || !top.getTraceId().equals(traceId) || top.getSpanId() != spanId) {
       Span span = new Span(traceId, spanId);
       stack.push(span);
     }
@@ -44,7 +44,7 @@ void poll() {
         return;
       }
     }
-    tls.registerSpan(DDTraceId.ZERO, DDSpanId.ZERO);
+    tls.registerSpan(DD128bTraceId.ZERO, DDSpanId.ZERO);
   }
 
   @Override

dd-java-agent/cws-tls/src/test/groovy/datadog/cws/tls/ErpcTlsTest.groovy

@@ -2,7 +2,7 @@ package datadog.cws.tls
 
 import com.sun.jna.Native
 
-import datadog.trace.api.DDTraceId
+import datadog.trace.api.DD128bTraceId
 import datadog.trace.test.util.DDSpecification
 
 class ErpcTlsTest extends DDSpecification {
@@ -11,14 +11,14 @@ class ErpcTlsTest extends DDSpecification {
     DummyErpcTls tls = new DummyErpcTls(1000)
 
     when:
-    DDTraceId traceId = DDTraceId.from(789L)
+    DD128bTraceId traceId = DD128bTraceId.from(123L, 789L)
     long spanId = 456L
     tls.registerSpan(123, traceId, spanId)
 
     then:
     tls.getTraceId(123) == traceId
     tls.getSpanId(123) == spanId
-    tls.getTraceId(222) ==  DDTraceId.from(0L)
+    tls.getTraceId(222) ==  DD128bTraceId.from(0L, 0L)
     tls.getSpanId(111) == 0L
   }
 

dd-java-agent/cws-tls/src/test/groovy/datadog/cws/tls/TlsTest.groovy

@@ -1,7 +1,6 @@
 package datadog.cws.tls
 
-
-import datadog.trace.api.DDTraceId
+import datadog.trace.api.DD128bTraceId
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import datadog.trace.test.util.DDSpecification
 
@@ -12,24 +11,24 @@ class TlsTest extends DDSpecification {
     TlsScopeListener listener = new TlsScopeListener(tls)
 
     AgentSpan parent = Stub(AgentSpan)
-    parent.getTraceId() >> DDTraceId.from(11L)
+    parent.getTraceId() >> DD128bTraceId.from(10L, 11L)
     parent.getSpanId() >> 12L
 
     AgentSpan span = Stub(AgentSpan)
-    span.getTraceId() >> DDTraceId.from(21L)
+    span.getTraceId() >> DD128bTraceId.from(20, 21L)
     span.getSpanId() >> 22L
 
     when:
-    listener.afterScopeActivated(DDTraceId.from(11L), 12L)
-    listener.afterScopeActivated(DDTraceId.from(21L), 22L)
+    listener.afterScopeActivated(DD128bTraceId.from(10L, 11L), 12L)
+    listener.afterScopeActivated(DD128bTraceId.from(20L, 21L), 22L)
     then:
-    tls.getTraceId() == DDTraceId.from(21L)
+    tls.getTraceId() == DD128bTraceId.from(20L, 21L)
     tls.getSpanId() == 22L
 
     when:
     listener.afterScopeClosed()
     then:
-    tls.getTraceId() == DDTraceId.from(11L)
+    tls.getTraceId() == DD128bTraceId.from(10L, 11L)
     tls.getSpanId() == 12L
   }
 }