extend test

Author: pjfanning

instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/ExecutionContextWrapper.java

@@ -5,9 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.pekkoactor.v1_0;
 
-import scala.concurrent.ExecutionContext;
-
 import io.opentelemetry.context.Context;
+import scala.concurrent.ExecutionContext;
 
 public class ExecutionContextWrapper implements ExecutionContext {
   private final ExecutionContext executionContext;

instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoScheduleInstrumentation.java

@@ -15,7 +15,6 @@
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-
 import scala.concurrent.ExecutionContext;
 
 public class PekkoScheduleInstrumentation implements TypeInstrumentation {

instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoScheduleOnceInstrumentation.java

@@ -15,7 +15,6 @@
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-
 import scala.concurrent.ExecutionContext;
 
 public class PekkoScheduleOnceInstrumentation implements TypeInstrumentation {

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerInstrumentationTestAsync.scala

@@ -7,14 +7,20 @@ package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0
 
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS
-import io.opentelemetry.instrumentation.testing.junit.http.{HttpServerInstrumentationExtension, HttpServerTestOptions}
-import io.opentelemetry.testing.internal.armeria.common.{AggregatedHttpRequest, AggregatedHttpResponse}
+import io.opentelemetry.instrumentation.testing.junit.http.{
+  HttpServerInstrumentationExtension,
+  HttpServerTestOptions
+}
+import io.opentelemetry.testing.internal.armeria.common.{
+  AggregatedHttpRequest,
+  AggregatedHttpResponse
+}
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 
 class PekkoHttpServerInstrumentationTestAsync
-  extends AbstractHttpServerInstrumentationTest {
+    extends AbstractHttpServerInstrumentationTest {
 
   @RegisterExtension val extension: InstrumentationExtension =
     HttpServerInstrumentationExtension.forAgent()
@@ -28,8 +34,8 @@ class PekkoHttpServerInstrumentationTestAsync
     PekkoHttpTestAsyncWebServer.stop()
 
   override protected def configure(
-                                    options: HttpServerTestOptions
-                                  ): Unit = {
+      options: HttpServerTestOptions
+  ): Unit = {
     super.configure(options)
     options.setTestHttpPipelining(false)
   }
@@ -39,9 +45,13 @@ class PekkoHttpServerInstrumentationTestAsync
     val method = "POST"
     val traceId = "00000000000000000000000000000123"
     val parentId = "0000000000000456"
-    val aggregatedHttpRequest = AggregatedHttpRequest.of( // intentionally sending mixed-case "tracePARENT" to make sure that TextMapGetters are
-      // not case-sensitive
-      request(SUCCESS, method).headers.toBuilder.set("tracePARENT", "00-" + traceId + "-" + parentId + "-01").build)
+    val aggregatedHttpRequest = AggregatedHttpRequest
+      .of( // intentionally sending mixed-case "tracePARENT" to make sure that TextMapGetters are
+        // not case-sensitive
+        request(SUCCESS, method).headers.toBuilder
+          .set("tracePARENT", "00-" + traceId + "-" + parentId + "-01")
+          .build
+      )
     val response = client.execute(aggregatedHttpRequest).aggregate.join
     assertThat(response.status.code).isEqualTo(SUCCESS.getStatus)
     assertThat(response.contentUtf8).isEqualTo(SUCCESS.getBody)

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala

@@ -7,7 +7,10 @@ package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0
 
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint._
-import io.opentelemetry.instrumentation.testing.junit.http.{AbstractHttpServerTest, ServerEndpoint}
+import io.opentelemetry.instrumentation.testing.junit.http.{
+  AbstractHttpServerTest,
+  ServerEndpoint
+}
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.Http
 import org.apache.pekko.http.scaladsl.Http.ServerBinding
@@ -60,14 +63,23 @@ object PekkoHttpTestAsyncWebServer {
       }
     case HttpRequest(POST, uri: Uri, _, _, _) =>
       val endpoint = ServerEndpoint.forPath(uri.path.toString())
-      AbstractHttpServerTest.controller(endpoint, () =>
-        for {
-          _ <- Future.successful(2)
-          firstTraceId = Span.current().getSpanContext().getTraceId()
-          _ <- after(1.second, system.scheduler)(Future.successful(1))
-          secondTraceId = Span.current().getSpanContext().getTraceId()
-          _ = require(firstTraceId eq secondTraceId, s"TraceId $firstTraceId did not match $secondTraceId")
-        } yield HttpResponse(status = OK, entity = endpoint.getBody)
+      AbstractHttpServerTest.controller(
+        endpoint,
+        () =>
+          for {
+            _ <- Future.successful(2)
+            firstSpanContext = Span.current().getSpanContext()
+            _ <- after(1.second, system.scheduler)(Future.successful(1))
+            secondSpanContext = Span.current().getSpanContext()
+            _ = require(
+              firstSpanContext.getTraceId() == secondSpanContext.getTraceId(),
+              s"TraceId ${firstSpanContext.getTraceId()} did not match ${secondSpanContext.getTraceId()}"
+            )
+            _ = require(
+              firstSpanContext.getSpanId() == secondSpanContext.getSpanId(),
+              s"SpanId ${firstSpanContext.getSpanId()} did not match ${secondSpanContext.getSpanId()}"
+            )
+          } yield HttpResponse(status = OK, entity = endpoint.getBody)
       )
   }