Format code

Author: getsentry-bot

sentry-ktor-client/src/main/java/io/sentry/ktorClient/SentryKtorClientPlugin.kt

@@ -137,9 +137,7 @@ public val SentryKtorClientPlugin: ClientPlugin<SentryKtorClientPluginConfig> =
               request.headers.remove(BaggageHeader.BAGGAGE_HEADER)
               request.headers[it.name] = it.value
             }
-            tracingHeaders.w3cTraceparentHeader?.let {
-              request.headers[it.name] = it.value
-            }
+            tracingHeaders.w3cTraceparentHeader?.let { request.headers[it.name] = it.value }
           }
       }
     }

sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt

@@ -116,9 +116,7 @@ public open class SentryOkHttpInterceptor(
               requestBuilder.removeHeader(BaggageHeader.BAGGAGE_HEADER)
               requestBuilder.addHeader(it.name, it.value)
             }
-            tracingHeaders.w3cTraceparentHeader?.let {
-              requestBuilder.addHeader(it.name, it.value)
-            }
+            tracingHeaders.w3cTraceparentHeader?.let { requestBuilder.addHeader(it.name, it.value) }
           }
       }
 

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

@@ -648,10 +648,11 @@ class SentryOkHttpInterceptorTest {
 
   @Test
   fun `adds W3C traceparent header when propagateTraceparent is enabled`() {
-    val client = fixture.getSut(
-      optionsConfiguration = Sentry.OptionsConfiguration { it.isPropagateTraceparent = true }
-    )
-    
+    val client =
+      fixture.getSut(
+        optionsConfiguration = Sentry.OptionsConfiguration { it.isPropagateTraceparent = true }
+      )
+
     fixture.server.enqueue(MockResponse().setResponseCode(200))
 
     val request = getRequest("/test")
@@ -660,18 +661,19 @@ 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
   fun `does not add W3C traceparent header when propagateTraceparent is disabled`() {
-    val client = fixture.getSut(
-      optionsConfiguration = Sentry.OptionsConfiguration { it.isPropagateTraceparent = false }
-    )
-    
+    val client =
+      fixture.getSut(
+        optionsConfiguration = Sentry.OptionsConfiguration { it.isPropagateTraceparent = false }
+      )
+
     fixture.server.enqueue(MockResponse().setResponseCode(200))
 
     val request = getRequest("/test")

sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java

@@ -139,7 +139,8 @@ public Response execute(final @NotNull Request request, final @NotNull Request.O
         requestWrapper.header(baggageHeader.getName(), baggageHeader.getValue());
       }
 
-      final @Nullable W3CTraceparentHeader w3cTraceparentHeader = tracingHeaders.getW3cTraceparentHeader();
+      final @Nullable W3CTraceparentHeader w3cTraceparentHeader =
+          tracingHeaders.getW3cTraceparentHeader();
       if (w3cTraceparentHeader != null) {
         requestWrapper.header(w3cTraceparentHeader.getName(), w3cTraceparentHeader.getValue());
       }

sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -6,14 +6,14 @@
 
 import com.jakewharton.nopen.annotation.Open;
 import io.sentry.BaggageHeader;
-import io.sentry.W3CTraceparentHeader;
 import io.sentry.Breadcrumb;
 import io.sentry.Hint;
 import io.sentry.IScopes;
 import io.sentry.ISpan;
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanOptions;
 import io.sentry.SpanStatus;
+import io.sentry.W3CTraceparentHeader;
 import io.sentry.util.Objects;
 import io.sentry.util.SpanUtils;
 import io.sentry.util.TracingUtils;
@@ -115,7 +115,8 @@ private void maybeAddTracingHeaders(
         request.getHeaders().set(baggageHeader.getName(), baggageHeader.getValue());
       }
 
-      final @Nullable W3CTraceparentHeader w3cTraceparentHeader = tracingHeaders.getW3cTraceparentHeader();
+      final @Nullable W3CTraceparentHeader w3cTraceparentHeader =
+          tracingHeaders.getW3cTraceparentHeader();
       if (w3cTraceparentHeader != null) {
         request.getHeaders().add(w3cTraceparentHeader.getName(), w3cTraceparentHeader.getValue());
       }

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -6,14 +6,14 @@
 
 import com.jakewharton.nopen.annotation.Open;
 import io.sentry.BaggageHeader;
-import io.sentry.W3CTraceparentHeader;
 import io.sentry.Breadcrumb;
 import io.sentry.Hint;
 import io.sentry.IScopes;
 import io.sentry.ISpan;
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanOptions;
 import io.sentry.SpanStatus;
+import io.sentry.W3CTraceparentHeader;
 import io.sentry.util.Objects;
 import io.sentry.util.SpanUtils;
 import io.sentry.util.TracingUtils;
@@ -115,7 +115,8 @@ private void maybeAddTracingHeaders(
         request.getHeaders().set(baggageHeader.getName(), baggageHeader.getValue());
       }
 
-      final @Nullable W3CTraceparentHeader w3cTraceparentHeader = tracingHeaders.getW3cTraceparentHeader();
+      final @Nullable W3CTraceparentHeader w3cTraceparentHeader =
+          tracingHeaders.getW3cTraceparentHeader();
       if (w3cTraceparentHeader != null) {
         request.getHeaders().add(w3cTraceparentHeader.getName(), w3cTraceparentHeader.getValue());
       }

sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -107,7 +107,8 @@ private void maybeAddTracingHeaders(
         request.getHeaders().set(baggageHeader.getName(), baggageHeader.getValue());
       }
 
-      final @Nullable W3CTraceparentHeader w3cTraceparentHeader = tracingHeaders.getW3cTraceparentHeader();
+      final @Nullable W3CTraceparentHeader w3cTraceparentHeader =
+          tracingHeaders.getW3cTraceparentHeader();
       if (w3cTraceparentHeader != null) {
         request.getHeaders().add(w3cTraceparentHeader.getName(), w3cTraceparentHeader.getValue());
       }

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

@@ -29,5 +29,4 @@ public W3CTraceparentHeader(
     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

@@ -469,10 +469,10 @@ class TracingUtilsTest {
     assertNotNull(tracingHeaders.sentryTraceHeader)
     assertNotNull(tracingHeaders.w3cTraceparentHeader)
     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])
@@ -490,13 +490,13 @@ class TracingUtilsTest {
     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])
@@ -516,10 +516,10 @@ class TracingUtilsTest {
 
     val w3cTrace = tracingHeaders.w3cTraceparentHeader!!
     assertEquals("traceparent", w3cTrace.name)
-    
+
     val headerValue = w3cTrace.value
     assertTrue(headerValue.startsWith("00-"))
-    
+
     val parts = headerValue.split("-")
     assertEquals(4, parts.size)
   }