refactor: run spotless apply to fix violations

open-telemetry · Oct 6, 2023 · 239978f · 239978f
1 parent bbd5d11
commit 239978f
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 37 deletions.
diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewaySingletons.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewaySingletons.java
@@ -10,9 +10,7 @@
 
 public final class GatewaySingletons {
 
-  private GatewaySingletons() {
-
-  }
+  private GatewaySingletons() {}
 
   public static HttpServerRouteGetter<ServerWebExchange> httpRouteGetter() {
     return (context, exchange) -> ServerWebExchangeHelper.extractServerRoute(exchange);

diff --git a/...opentelemetry/javaagent/instrumentation/spring/gateway/HandlerAdapterInstrumentation.java b/...opentelemetry/javaagent/instrumentation/spring/gateway/HandlerAdapterInstrumentation.java
@@ -53,16 +53,16 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class HandleAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(0) ServerWebExchange exchange) {
+    public static void methodEnter(@Advice.Argument(0) ServerWebExchange exchange) {
       Context context = Context.current();
       // Update route info for server span.
       HttpServerRoute.update(
-          context, HttpServerRouteSource.NESTED_CONTROLLER, GatewaySingletons.httpRouteGetter(),
+          context,
+          HttpServerRouteSource.NESTED_CONTROLLER,
+          GatewaySingletons.httpRouteGetter(),
           exchange);
       // Record route info in current span, should be webflux's span.
       ServerWebExchangeHelper.extractAttributes(exchange, context);
-
     }
   }
 }
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/spring/gateway/ServerWebExchangeHelper.java b/...va/io/opentelemetry/javaagent/instrumentation/spring/gateway/ServerWebExchangeHelper.java
@@ -14,15 +14,10 @@
 
 public final class ServerWebExchangeHelper {
 
-  /**
-   * Route info key.
-   */
+  /** Route info key. */
   public static final String ROUTE_INFO_ATTRIBUTES = "ROUTE_INFO";
 
-
-  private ServerWebExchangeHelper() {
-
-  }
+  private ServerWebExchangeHelper() {}
 
   public static void extractAttributes(ServerWebExchange exchange, Context context) {
     // Record route info
@@ -34,13 +29,11 @@ public static void extractAttributes(ServerWebExchange exchange, Context context
     }
   }
 
-
   public static String extractServerRoute(ServerWebExchange exchange) {
     Route route = exchange.getAttribute(GATEWAY_ROUTE_ATTR);
     if (route != null) {
       return "Route@" + route.getId();
     }
     return null;
   }
-
 }
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewayRouteMappingTest.java b/...va/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewayRouteMappingTest.java
@@ -1,8 +1,17 @@
-package io.opentelemetry.javaagent.instrumentation.spring.gateway;/*
+/*
  * Copyright The OpenTelemetry Authors
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.gateway; /*
+                                                                    * Copyright The OpenTelemetry Authors
+                                                                    * SPDX-License-Identifier: Apache-2.0
+                                                                    */
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -20,16 +29,12 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static org.assertj.core.api.Assertions.assertThat;
-
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes = {
-        GatewayTestApplication.class,
-        GatewayRouteMappingTest.ForceNettyAutoConfiguration.class
+      GatewayTestApplication.class,
+      GatewayRouteMappingTest.ForceNettyAutoConfiguration.class
     })
 public class GatewayRouteMappingTest {
 
@@ -61,16 +66,17 @@ void gatewayRouteMappingTest() {
     AggregatedHttpResponse response = client.post("/gateway/echo", requestBody).aggregate().join();
     assertThat(response.status().code()).isEqualTo(200);
     assertThat(response.contentUtf8()).isEqualTo(requestBody);
-    testing.waitAndAssertTraces(trace ->
-        trace.hasSpansSatisfyingExactly(
-            span -> span.hasAttribute(
-                equalTo(SemanticAttributes.HTTP_ROUTE, expectRoute)),
-            span -> span.hasAttributesSatisfying(
-                satisfies(AttributeKey.stringKey(ServerWebExchangeHelper.ROUTE_INFO_ATTRIBUTES),
-                    s -> s.contains("id='path_route'")),
-                satisfies(AttributeKey.stringKey(ServerWebExchangeHelper.ROUTE_INFO_ATTRIBUTES),
-                    s -> s.contains("uri=h1c://mock.response")
-                )
-            )));
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasAttribute(equalTo(SemanticAttributes.HTTP_ROUTE, expectRoute)),
+                span ->
+                    span.hasAttributesSatisfying(
+                        satisfies(
+                            AttributeKey.stringKey(ServerWebExchangeHelper.ROUTE_INFO_ATTRIBUTES),
+                            s -> s.contains("id='path_route'")),
+                        satisfies(
+                            AttributeKey.stringKey(ServerWebExchangeHelper.ROUTE_INFO_ATTRIBUTES),
+                            s -> s.contains("uri=h1c://mock.response")))));
   }
 }
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewayTestApplication.java b/...ava/io/opentelemetry/javaagent/instrumentation/spring/gateway/GatewayTestApplication.java
@@ -16,9 +16,20 @@ public class GatewayTestApplication {
   @Bean
   public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
     // A simple echo gateway.
-    return builder.routes()
-        .route("path_route", r -> r.path("/gateway/**").filters(f -> f.filter(
-            (exchange, chain) -> exchange.getResponse().writeWith(exchange.getRequest().getBody()))).uri("h1c://mock.response"))
+    return builder
+        .routes()
+        .route(
+            "path_route",
+            r ->
+                r.path("/gateway/**")
+                    .filters(
+                        f ->
+                            f.filter(
+                                (exchange, chain) ->
+                                    exchange
+                                        .getResponse()
+                                        .writeWith(exchange.getRequest().getBody())))
+                    .uri("h1c://mock.response"))
         .build();
   }
 }