refactor test

Author: pjfanning

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSetup.java

@@ -7,33 +7,45 @@ package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0
 
 import java.net.URI
 
+import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest
+import io.opentelemetry.instrumentation.test.utils.PortUtils
+import io.opentelemetry.testing.internal.armeria.client.{ClientFactory, WebClient}
+import io.opentelemetry.testing.internal.armeria.client.logging.LoggingClient
 import io.opentelemetry.testing.internal.armeria.common.{
   AggregatedHttpRequest,
+  HttpHeaderNames,
   HttpMethod
 }
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.{AfterAll, BeforeAll, Test, TestInstance}
+import org.junit.jupiter.api.{AfterAll, Test, TestInstance}
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class PekkoHttpServerWithActorTest {
 
-  val setup = new PekkoHttpTestSetup()
-
-  @BeforeAll def setupOptions(): Unit = {
-    PekkoHttpTestWebServerWithActor.start(setup.getPort())
-  }
+  private val port = PortUtils.findOpenPort()
+  val server = new PekkoHttpTestWebServerWithActor(port)
 
   @AfterAll def cleanup(): Unit = {
-    PekkoHttpTestWebServerWithActor.stop()
+    server.stop()
   }
 
+  private val minute = java.time.Duration.ofMinutes(1)
+  private val client = WebClient.builder()
+    .responseTimeout(minute)
+    .writeTimeout(minute)
+    .factory(ClientFactory.builder().connectTimeout(minute).build())
+    .setHeader(HttpHeaderNames.USER_AGENT, AbstractHttpServerUsingTest.TEST_USER_AGENT)
+    .setHeader(HttpHeaderNames.X_FORWARDED_FOR, AbstractHttpServerUsingTest.TEST_CLIENT_IP)
+    .decorator(LoggingClient.newDecorator())
+    .build()
+
   @Test def testSpan(): Unit = {
-    val address = new URI(s"http://localhost:${setup.getPort()}/")
+    val address = new URI(s"http://localhost:$port")
     val request = AggregatedHttpRequest.of(
       HttpMethod.GET,
       address.resolve("/test").toString
     )
-    val response = setup.getClient().execute(request).aggregate.join
+    val response = client.execute(request).aggregate.join
     assertThat(response.status.code).isEqualTo(200)
     val responseText = response.contentUtf8
     val splits = responseText.split("\n")

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

@@ -16,7 +16,7 @@ import org.apache.pekko.util.Timeout
 import scala.concurrent.{Await, ExecutionContext}
 import scala.concurrent.duration.DurationInt
 
-object PekkoHttpTestWebServerWithActor {
+class PekkoHttpTestWebServerWithActor(port: Int) {
   implicit val system: ActorSystem = ActorSystem("http-server-with-actor")
   // needed for the future flatMap/onComplete in the end
   implicit val executionContext: ExecutionContext = system.dispatcher
@@ -28,9 +28,9 @@ object PekkoHttpTestWebServerWithActor {
     }
   }
 
-  val spanTestActor = system.actorOf(Props[SpanTestActor]())
+  val spanTestActor = system.actorOf(Props(new SpanTestActor))
 
-  var route = get {
+  val route = get {
     path("test") {
       complete {
         val otelSummary = spanSummary(Span.current())
@@ -42,17 +42,11 @@ object PekkoHttpTestWebServerWithActor {
     }
   }
 
-  private var binding: ServerBinding = null
-
-  def start(port: Int): Unit = synchronized {
-    if (null == binding) {
-      binding =
-        Await.result(Http().bindAndHandle(route, "localhost", port), 10.seconds)
-    }
-  }
+  var binding: ServerBinding =
+    Await.result(Http().bindAndHandle(route, "localhost", port), 10.seconds)
 
   def stop(): Unit = synchronized {
-    if (null != binding) {
+    if (binding != null) {
       binding.unbind()
       system.terminate()
       binding = null