From 77b011313de948c2b7a100213c96d704b502a5d6 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 30 Jul 2024 16:57:53 +0300 Subject: [PATCH] spotless --- .../route/PathConcatenationInstrumentation.java | 3 +-- .../route/RouteConcatenationInstrumentation.java | 3 +-- .../v1_0/PekkoHttpServerJavaRouteTest.java | 2 +- .../pekkohttp/v1_0/PekkoHttpServerRouteTest.scala | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PathConcatenationInstrumentation.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PathConcatenationInstrumentation.java index ad2ffe95176f..d11310208bb6 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PathConcatenationInstrumentation.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PathConcatenationInstrumentation.java @@ -16,8 +16,7 @@ public class PathConcatenationInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named( - "org.apache.pekko.http.scaladsl.server.PathMatcher"); + return named("org.apache.pekko.http.scaladsl.server.PathMatcher"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/RouteConcatenationInstrumentation.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/RouteConcatenationInstrumentation.java index 7b60adee3a92..9a00975e6b8f 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/RouteConcatenationInstrumentation.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/RouteConcatenationInstrumentation.java @@ -16,8 +16,7 @@ public class RouteConcatenationInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named( - "org.apache.pekko.http.scaladsl.server.RouteConcatenation$RouteWithConcatenation"); + return named("org.apache.pekko.http.scaladsl.server.RouteConcatenation$RouteWithConcatenation"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerJavaRouteTest.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerJavaRouteTest.java index d6880fefd9aa..bb239e4058c3 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerJavaRouteTest.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerJavaRouteTest.java @@ -15,12 +15,12 @@ import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpMethod; +import java.util.concurrent.CompletionStage; import org.apache.pekko.actor.ActorSystem; import org.apache.pekko.http.javadsl.Http; import org.apache.pekko.http.javadsl.ServerBinding; import org.apache.pekko.http.javadsl.server.AllDirectives; import org.apache.pekko.http.javadsl.server.Route; -import java.util.concurrent.CompletionStage; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala index fa51e24b3562..e01f6eee0460 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala @@ -9,11 +9,22 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert} import io.opentelemetry.testing.internal.armeria.client.WebClient -import io.opentelemetry.testing.internal.armeria.common.{AggregatedHttpRequest, HttpMethod} +import io.opentelemetry.testing.internal.armeria.common.{ + AggregatedHttpRequest, + HttpMethod +} import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.Http import org.apache.pekko.http.scaladsl.server.Route -import org.apache.pekko.http.scaladsl.server.Directives.{IntNumber, complete, concat, path, pathEndOrSingleSlash, pathPrefix, pathSingleSlash} +import org.apache.pekko.http.scaladsl.server.Directives.{ + IntNumber, + complete, + concat, + path, + pathEndOrSingleSlash, + pathPrefix, + pathSingleSlash +} import org.apache.pekko.stream.ActorMaterializer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.extension.RegisterExtension