integration test case has been added which extends AbstractHttpServerTest

Author: kcsurapaneni

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHttpAttributesGetter.java

@@ -5,9 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.activejhttp;
 
+import static io.opentelemetry.testing.internal.armeria.internal.shaded.guava.base.Ascii.toLowerCase;
+
 import io.activej.http.HttpRequest;
 import io.activej.http.HttpResponse;
-import io.activej.http.UrlParser;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -39,7 +40,7 @@ public List<String> getHttpResponseHeader(
 
   @Override
   public String getUrlScheme(HttpRequest request) {
-    return UrlParser.of(request.getFullUrl()).getProtocol().name();
+    return toLowerCase(request.getProtocol().name());
   }
 
   @Override

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

@@ -0,0 +1,114 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import static io.activej.http.HttpMethod.GET;
+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.NOT_FOUND;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.QUERY_PARAM;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
+import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
+import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
+
+import io.activej.eventloop.Eventloop;
+import io.activej.http.AsyncServlet;
+import io.activej.http.HttpHeaderValue;
+import io.activej.http.HttpHeaders;
+import io.activej.http.HttpResponse;
+import io.activej.http.HttpServer;
+import io.activej.http.RoutingServlet;
+import io.activej.promise.Promise;
+import io.activej.reactor.Reactor;
+import io.opentelemetry.instrumentation.api.internal.HttpConstants;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
+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 InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
+
+  private static final Eventloop eventloop = Reactor.getCurrentReactor();
+  private Thread thread;
+
+  @Override
+  protected HttpServer setupServer() throws Exception {
+
+    AsyncServlet captureHttpHeadersAsyncServlet =
+        request -> {
+          HttpResponse httpResponse =
+              HttpResponse.builder()
+                  .withBody(CAPTURE_HEADERS.getBody())
+                  .withCode(CAPTURE_HEADERS.getStatus())
+                  .withHeader(HttpHeaders.of(TEST_RESPONSE_HEADER), HttpHeaderValue.of("test"))
+                  .build();
+          controller(CAPTURE_HEADERS, () -> httpResponse);
+          return httpResponse.toPromise();
+        };
+
+    RoutingServlet routingServlet =
+        RoutingServlet.builder(eventloop)
+            .with(GET, SUCCESS.getPath(), request -> prepareResponse(SUCCESS))
+            .with(GET, QUERY_PARAM.getPath(), request -> prepareResponse(QUERY_PARAM))
+            .with(GET, ERROR.getPath(), request -> prepareResponse(ERROR))
+            .with(GET, NOT_FOUND.getPath(), request -> prepareResponse(NOT_FOUND))
+            .with(GET, EXCEPTION.getPath(), request -> prepareResponse(EXCEPTION))
+            .with(GET, REDIRECT.getPath(), request -> prepareResponse(REDIRECT))
+            .with(GET, CAPTURE_HEADERS.getPath(), captureHttpHeadersAsyncServlet)
+            .build();
+
+    HttpServer server = HttpServer.builder(eventloop, routingServlet).withListenPort(port).build();
+
+    server.listen();
+    thread = new Thread(eventloop);
+    thread.start();
+    return server;
+  }
+
+  @Override
+  protected void stopServer(HttpServer server) throws Exception {
+    server.closeFuture().get();
+    thread.join();
+  }
+
+  @Override
+  protected void assertHighConcurrency(int count) {
+    //
+  }
+
+  @Override
+  protected void configure(HttpServerTestOptions options) {
+    options.setTestHttpPipelining(false);
+    options.setTestRedirect(false);
+    options.setTestException(false);
+    options.disableTestNonStandardHttpMethod();
+    options.setExpectedServerSpanNameMapper(
+        (uri, method, route) -> {
+          if (HttpConstants._OTHER.equals(method)) {
+            method = "HTTP";
+          }
+          return method;
+        });
+    options.setHttpAttributes(endpoint -> ImmutableSet.of(NETWORK_PEER_PORT));
+  }
+
+  Promise<HttpResponse> prepareResponse(ServerEndpoint endpoint) {
+    HttpResponse httpResponse =
+        HttpResponse.builder().withBody(endpoint.getBody()).withCode(endpoint.getStatus()).build();
+    controller(endpoint, () -> httpResponse);
+    return httpResponse.toPromise();
+  }
+}