Cleanup AI slop

Author: markushi

sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpInterceptorTest.kt

@@ -661,10 +661,6 @@ class SentryOkHttpInterceptorTest {
     val recordedRequest = fixture.server.takeRequest()
     assertNotNull(recordedRequest.getHeader("sentry-trace"))
     assertNotNull(recordedRequest.getHeader("traceparent"))
-
-    val traceparent = recordedRequest.getHeader("traceparent")!!
-    assertTrue(traceparent.startsWith("00-"))
-    assertEquals(4, traceparent.split("-").size)
   }
 
   @Test

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -2127,7 +2127,7 @@ public boolean isPropagateTraceparent() {
    *
    * @param propagateTraceparent true if enabled false otherwise
    */
-  public void setPropagateTraceparent(boolean propagateTraceparent) {
+  public void setPropagateTraceparent(final boolean propagateTraceparent) {
     this.propagateTraceparent = propagateTraceparent;
   }
 

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

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

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

@@ -471,42 +471,17 @@ class TracingUtilsTest {
     assertEquals("traceparent", tracingHeaders.w3cTraceparentHeader!!.name)
 
     val headerValue = tracingHeaders.w3cTraceparentHeader!!.value
-    assertTrue(headerValue.startsWith("00-"))
 
-    val parts = headerValue.split("-")
-    assertEquals(4, parts.size)
-    assertEquals(fixture.span.spanContext.traceId.toString(), parts[1])
-    assertEquals(fixture.span.spanContext.spanId.toString(), parts[2])
-  }
-
-  @Test
-  fun `trace returns w3c traceparent header with correct sampling info`() {
-    val fixture = Fixture()
-    fixture.setup()
-    fixture.options.isPropagateTraceparent = true
-
-    val tracingHeaders = TracingUtils.trace(fixture.scopes, null, fixture.span)
-
-    assertNotNull(tracingHeaders)
-    val w3cHeader = tracingHeaders.w3cTraceparentHeader!!
-    assertEquals("traceparent", w3cHeader.name)
-
-    val headerValue = w3cHeader.value
-    assertTrue(headerValue.startsWith("00-"))
-
-    val parts = headerValue.split("-")
-    assertEquals(4, parts.size)
-
-    val sentryTrace = fixture.span.toSentryTrace()
-    val expectedFlag = if (sentryTrace.isSampled() == true) "01" else "00"
-    assertEquals(expectedFlag, parts[3])
+    assertTrue(headerValue.contains(fixture.span.spanContext.traceId.toString()))
+    assertTrue(headerValue.contains(fixture.span.spanContext.spanId.toString()))
+    assertTrue(headerValue.endsWith("-01"))
   }
 
   @Test
   fun `trace returns w3c traceparent header when no span provided and propagateTraceparent is enabled`() {
     val fixture = Fixture()
-    fixture.setup()
     fixture.options.isPropagateTraceparent = true
+    fixture.setup()
 
     val tracingHeaders = TracingUtils.trace(fixture.scopes, null, null)
 
@@ -518,9 +493,8 @@ class TracingUtilsTest {
     assertEquals("traceparent", w3cTrace.name)
 
     val headerValue = w3cTrace.value
-    assertTrue(headerValue.startsWith("00-"))
-
-    val parts = headerValue.split("-")
-    assertEquals(4, parts.size)
+    assertTrue(headerValue.contains(fixture.scope.propagationContext.traceId.toString()))
+    assertTrue(headerValue.contains(fixture.scope.propagationContext.spanId.toString()))
+    assertTrue(headerValue.endsWith("-00"))
   }
 }