Test cases are updated to use JUnit 5

Author: kcsurapaneni

instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerTest.java

@@ -9,6 +9,8 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ID_PARAMETER_NAME;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.INDEXED_CHILD;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.QUERY_PARAM;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
@@ -31,12 +33,11 @@
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
 import io.opentelemetry.testing.internal.armeria.internal.shaded.guava.collect.ImmutableSet;
-import org.junit.ClassRule;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ActivejHttpServerTest extends AbstractHttpServerTest<HttpServer> {
 
-  @ClassRule public static final EventloopRule eventloopRule = new EventloopRule();
+  @RegisterExtension static final EventloopExtension eventloopExtension = new EventloopExtension();
 
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
@@ -58,6 +59,30 @@ protected HttpServer setupServer() throws Exception {
           controller(CAPTURE_HEADERS, () -> httpResponse);
           return httpResponse.toPromise();
         };
+    AsyncServlet indexChildAsyncServlet =
+        request -> {
+          HttpResponse httpResponse =
+              HttpResponse.builder()
+                  .withBody(INDEXED_CHILD.getBody())
+                  .withCode(INDEXED_CHILD.getStatus())
+                  .build();
+          INDEXED_CHILD.collectSpanAttributes(
+              id ->
+                  id.equals(ID_PARAMETER_NAME)
+                      ? request.getQueryParameter(ID_PARAMETER_NAME)
+                      : null);
+          controller(
+              INDEXED_CHILD,
+              () -> {
+                INDEXED_CHILD.collectSpanAttributes(
+                    id ->
+                        id.equals(ID_PARAMETER_NAME)
+                            ? request.getQueryParameter(ID_PARAMETER_NAME)
+                            : null);
+                return httpResponse;
+              });
+          return httpResponse.toPromise();
+        };
 
     RoutingServlet routingServlet =
         RoutingServlet.builder(eventloop)
@@ -68,6 +93,7 @@ protected HttpServer setupServer() throws Exception {
             .with(GET, EXCEPTION.getPath(), request -> prepareResponse(EXCEPTION))
             .with(GET, REDIRECT.getPath(), request -> prepareResponse(REDIRECT))
             .with(GET, CAPTURE_HEADERS.getPath(), captureHttpHeadersAsyncServlet)
+            .with(GET, INDEXED_CHILD.getPath(), indexChildAsyncServlet)
             .build();
 
     HttpServer server = HttpServer.builder(eventloop, routingServlet).withListenPort(port).build();
@@ -84,11 +110,6 @@ protected void stopServer(HttpServer server) throws Exception {
     thread.join();
   }
 
-  @Override
-  protected void assertHighConcurrency(int count) {
-    //
-  }
-
   @Override
   protected void configure(HttpServerTestOptions options) {
     options.setTestHttpPipelining(false);

instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejRoutingServletTest.java

@@ -26,13 +26,12 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import org.junit.ClassRule;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class ActivejRoutingServletTest {
+class ActivejRoutingServletTest {
 
-  @ClassRule public static final EventloopRule eventloopRule = new EventloopRule();
+  @RegisterExtension static final EventloopExtension eventloopExtension = new EventloopExtension();
 
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/EventloopRule.java instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/EventloopExtension.java

@@ -9,11 +9,11 @@
 
 import io.activej.eventloop.Eventloop;
 import io.activej.reactor.Reactor;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
-public final class EventloopRule implements TestRule {
+public class EventloopExtension implements BeforeEachCallback, AfterAllCallback {
 
   static {
     createEventloop();
@@ -24,11 +24,15 @@ private static void createEventloop() {
   }
 
   @Override
-  public Statement apply(Statement base, Description description) {
+  public void beforeEach(ExtensionContext context) {
     Reactor currentReactor = Reactor.getCurrentReactor();
     if (!(currentReactor instanceof Eventloop) || !currentReactor.inReactorThread()) {
       createEventloop();
     }
-    return base;
+  }
+
+  @Override
+  public void afterAll(ExtensionContext context) {
+    //
   }
 }