Add missing version to header value

Author: markushi

sentry/src/main/java/io/sentry/W3CTraceparentHeader.java

@@ -27,6 +27,6 @@ public W3CTraceparentHeader(
 
   public @NotNull String getValue() {
     final String sampledFlag = sampled != null && sampled ? "01" : "00";
-    return String.format("%s-%s-%s", traceId, spanId, sampledFlag);
+    return String.format("00-%s-%s-%s", traceId, spanId, sampledFlag);
   }
 }

sentry/src/test/java/io/sentry/W3CTraceparentHeaderTest.kt

@@ -13,7 +13,7 @@ class W3CTraceparentHeaderTest {
     val header = W3CTraceparentHeader(traceId, spanId, true)
 
     assertEquals("traceparent", header.name)
-    assertEquals("12345678123456781234567812345678-1234567812345678-01", header.value)
+    assertEquals("00-12345678123456781234567812345678-1234567812345678-01", header.value)
   }
 
   @Test
@@ -23,7 +23,7 @@ class W3CTraceparentHeaderTest {
     val header = W3CTraceparentHeader(traceId, spanId, false)
 
     assertEquals("traceparent", header.name)
-    assertEquals("12345678123456781234567812345678-1234567812345678-00", header.value)
+    assertEquals("00-12345678123456781234567812345678-1234567812345678-00", header.value)
   }
 
   @Test
@@ -33,7 +33,7 @@ class W3CTraceparentHeaderTest {
     val header = W3CTraceparentHeader(traceId, spanId, null)
 
     assertEquals("traceparent", header.name)
-    assertEquals("12345678123456781234567812345678-1234567812345678-00", header.value)
+    assertEquals("00-12345678123456781234567812345678-1234567812345678-00", header.value)
   }
 
   @Test
@@ -45,9 +45,10 @@ class W3CTraceparentHeaderTest {
     val value = header.value
     val parts = value.split("-")
 
-    assertEquals(3, parts.size)
-    assertEquals("abcdefabcdefabcdabcdefabcdefabcd", parts[0]) // Trace ID (32 chars)
-    assertEquals("abcdefabcdefabcd", parts[1]) // Span ID (16 chars)
-    assertEquals("01", parts[2]) // Sampled flag (2 chars)
+    assertEquals(4, parts.size)
+    assertEquals("00", parts[0]) // Version
+    assertEquals("abcdefabcdefabcdabcdefabcdefabcd", parts[1]) // Trace ID (32 hex chars)
+    assertEquals("abcdefabcdefabcd", parts[2]) // Span ID (16 hex chars)
+    assertEquals("01", parts[3]) // Sampled flag
   }
 }

sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt

@@ -471,10 +471,14 @@ class TracingUtilsTest {
     assertEquals("traceparent", tracingHeaders.w3cTraceparentHeader!!.name)
 
     val headerValue = tracingHeaders.w3cTraceparentHeader!!.value
-
-    assertTrue(headerValue.contains(fixture.span.spanContext.traceId.toString()))
-    assertTrue(headerValue.contains(fixture.span.spanContext.spanId.toString()))
-    assertTrue(headerValue.endsWith("-01"))
+    assertTrue(headerValue.startsWith("00-"))
+
+    val parts = headerValue.split("-")
+    assertEquals(4, parts.size)
+    assertEquals("00", parts[0])
+    assertEquals(fixture.span.spanContext.traceId.toString(), parts[1])
+    assertEquals(fixture.span.spanContext.spanId.toString(), parts[2])
+    assertEquals("01", parts[3])
   }
 
   @Test
@@ -493,8 +497,13 @@ class TracingUtilsTest {
     assertEquals("traceparent", w3cTrace.name)
 
     val headerValue = w3cTrace.value
-    assertTrue(headerValue.contains(fixture.scope.propagationContext.traceId.toString()))
-    assertTrue(headerValue.contains(fixture.scope.propagationContext.spanId.toString()))
-    assertTrue(headerValue.endsWith("-00"))
+    assertTrue(headerValue.startsWith("00-"))
+
+    val parts = headerValue.split("-")
+    assertEquals(4, parts.size)
+    assertEquals("00", parts[0])
+    assertEquals(fixture.scope.propagationContext.traceId.toString(), parts[1])
+    assertEquals(fixture.scope.propagationContext.spanId.toString(), parts[2])
+    assertEquals("00", parts[3])
   }
 }