spotless

Author: trask

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractControllerSpringWebFluxServerTest.java

@@ -60,8 +60,7 @@ protected SpanDataAssert assertHandlerSpan(
                               EXCEPTION_TYPE,
                               "org.springframework.web.reactive.resource.NoResourceFoundException"),
                           equalTo(
-                              EXCEPTION_MESSAGE,
-                              "404 NOT_FOUND \"No static resource notFound.\""),
+                              EXCEPTION_MESSAGE, "404 NOT_FOUND \"No static resource notFound.\""),
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
         } else {
           span.hasEventsSatisfyingExactly(

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractHandlerSpringWebFluxServerTest.java

@@ -59,8 +59,7 @@ protected SpanDataAssert assertHandlerSpan(
                               EXCEPTION_TYPE,
                               "org.springframework.web.reactive.resource.NoResourceFoundException"),
                           equalTo(
-                              EXCEPTION_MESSAGE,
-                              "404 NOT_FOUND \"No static resource notFound.\""),
+                              EXCEPTION_MESSAGE, "404 NOT_FOUND \"No static resource notFound.\""),
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
         } else {
           span.hasEventsSatisfyingExactly(

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractSpringWebFluxServerTest.java

@@ -80,18 +80,17 @@ protected void configure(HttpServerTestOptions options) {
   }
 
   protected static void assertHandlerExceptionLog(
-      StringAssertConsumer exceptionTypeAssertion,
-      StringAssertConsumer exceptionMessageAssertion) {
+      StringAssertConsumer exceptionTypeAssertion, StringAssertConsumer exceptionMessageAssertion) {
     Awaitility.await()
         .untilAsserted(
             () -> {
               List<LogRecordData> logs =
                   testing.logRecords().stream()
                       .filter(log -> "exception".equals(log.getEventName()))
-                    .filter(
-                      log ->
-                        INSTRUMENTATION_NAME.equals(
-                          log.getInstrumentationScopeInfo().getName()))
+                      .filter(
+                          log ->
+                              INSTRUMENTATION_NAME.equals(
+                                  log.getInstrumentationScopeInfo().getName()))
                       .collect(toList());
 
               assertThat(logs).hasSize(1);

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractSpringWebfluxTest.java

@@ -70,7 +70,7 @@
 @SuppressWarnings("deprecation") // using deprecated semconv
 public abstract class AbstractSpringWebfluxTest {
 
-    private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-webflux-5.0";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-webflux-5.0";
 
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
@@ -411,21 +411,22 @@ void get404Test() {
                             satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)),
                             equalTo(HTTP_ROUTE, "/**")),
                 span -> {
-                    span.hasName("ResourceWebHandler.handle")
-                        .hasKind(SpanKind.INTERNAL)
-                        .hasParent(trace.getSpan(0))
-                        .hasStatus(StatusData.error());
-                    if (emitExceptionAsSpanEvents()) {
-                      span.hasEventsSatisfyingExactly(AbstractSpringWebfluxTest::resource404Exception);
-                    }
-                    span.hasAttributesSatisfyingExactly(
-                        codeFunctionAssertions(
-                            "org.springframework.web.reactive.resource.ResourceWebHandler",
-                            "handle"));
-                  }));
-        if (emitExceptionAsLogs()) {
-            assertResource404ExceptionLog();
-        }
+                  span.hasName("ResourceWebHandler.handle")
+                      .hasKind(SpanKind.INTERNAL)
+                      .hasParent(trace.getSpan(0))
+                      .hasStatus(StatusData.error());
+                  if (emitExceptionAsSpanEvents()) {
+                    span.hasEventsSatisfyingExactly(
+                        AbstractSpringWebfluxTest::resource404Exception);
+                  }
+                  span.hasAttributesSatisfyingExactly(
+                      codeFunctionAssertions(
+                          "org.springframework.web.reactive.resource.ResourceWebHandler",
+                          "handle"));
+                }));
+    if (emitExceptionAsLogs()) {
+      assertResource404ExceptionLog();
+    }
   }
 
   private static void resource404Exception(EventDataAssert event) {
@@ -454,23 +455,22 @@ private static void resource404Exception(EventDataAssert event) {
     }
   }
 
-    private static void assertResource404ExceptionLog() {
-        if (testLatestDeps()) {
-            assertHandlerExceptionLog(
-                    type ->
-                            type.isEqualTo(
-                                    "org.springframework.web.reactive.resource.NoResourceFoundException"),
-                    message -> message.isInstanceOf(String.class));
-        } else {
-            assertHandlerExceptionLog(
-                    type ->
-                            type.isIn(
-                                    "org.springframework.web.server.ResponseStatusException",
-                                    // Changed in spring 7+
-                                    "org.springframework.web.reactive.resource.NoResourceFoundException"),
-                    message -> message.contains("404"));
-    }
+  private static void assertResource404ExceptionLog() {
+    if (testLatestDeps()) {
+      assertHandlerExceptionLog(
+          type ->
+              type.isEqualTo("org.springframework.web.reactive.resource.NoResourceFoundException"),
+          message -> message.isInstanceOf(String.class));
+    } else {
+      assertHandlerExceptionLog(
+          type ->
+              type.isIn(
+                  "org.springframework.web.server.ResponseStatusException",
+                  // Changed in spring 7+
+                  "org.springframework.web.reactive.resource.NoResourceFoundException"),
+          message -> message.contains("404"));
     }
+  }
 
   @Test
   void basicPostTest() {

instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java

@@ -198,7 +198,7 @@ void shouldEndSpanOnMonoTimeout() {
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
                         .hasStatus(StatusData.error())
-                      .hasException(emitExceptionAsSpanEvents() ? thrown : null),
+                        .hasException(emitExceptionAsSpanEvents() ? thrown : null),
                 span ->
                     span.hasName("GET")
                         .hasKind(CLIENT)