@laurit PR comments are addressed

Author: kcsurapaneni

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

@@ -33,10 +33,11 @@ public String get(HttpRequest carrier, String key) {
 
   @Override
   public Iterator<String> getAll(HttpRequest carrier, String key) {
+    HttpHeader httpHeader = HttpHeaders.of(key);
     List<String> values = new ArrayList<>();
     if (carrier != null) {
       for (Map.Entry<HttpHeader, HttpHeaderValue> entry : carrier.getHeaders()) {
-        if (entry.getKey().toString().equalsIgnoreCase(key)) {
+        if (httpHeader.equals(entry.getKey())) {
           values.add(entry.getValue().toString());
         }
       }

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

@@ -5,8 +5,6 @@
 
 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.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
@@ -18,7 +16,7 @@ final class ActivejHttpServerHttpAttributesGetter
 
   @Override
   public String getHttpRequestMethod(HttpRequest request) {
-    return ActivejHttpServerUtil.getHttpRequestMethod(request);
+    return request.getMethod().name();
   }
 
   @Override
@@ -40,7 +38,7 @@ public List<String> getHttpResponseHeader(
 
   @Override
   public String getUrlScheme(HttpRequest request) {
-    return toLowerCase(request.getProtocol().name());
+    return request.getProtocol().lowercase();
   }
 
   @Override

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

@@ -19,13 +19,7 @@
 
 public final class ActivejHttpServerUtil {
 
-  private ActivejHttpServerUtil() {
-    throw new UnsupportedOperationException();
-  }
-
-  static String getHttpRequestMethod(HttpRequest request) {
-    return request.getMethod().name();
-  }
+  private ActivejHttpServerUtil() {}
 
   static List<String> requestHeader(HttpRequest request, String name) {
     String headerValue = request.getHeader(HttpHeaders.of(name));

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

@@ -10,41 +10,15 @@
 import io.activej.http.HttpRequest;
 import io.activej.http.HttpResponse;
 import io.activej.promise.Promise;
-import io.activej.promise.SettablePromise;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
 
 public class PromiseWrapper {
 
   public static Promise<HttpResponse> wrap(
       Promise<HttpResponse> promise, HttpRequest httpRequest, Context context) {
-    SettablePromise<HttpResponse> settablePromise = new SettablePromise<>();
-    promise
-        .whenResult(
-            result -> {
-              Exception error = null;
-              try (Scope ignored = context.makeCurrent()) {
-                settablePromise.set(result);
-              } catch (RuntimeException exception) {
-                error = exception;
-                settablePromise.setException(
-                    new RuntimeException("Context management failed", exception));
-              } finally {
-                instrumenter().end(context, httpRequest, result, error);
-              }
-            })
-        .whenException(
-            throwable -> {
-              try (Scope ignored = context.makeCurrent()) {
-                settablePromise.setException(throwable);
-              } catch (RuntimeException exception) {
-                settablePromise.setException(
-                    new RuntimeException("Context management failed", exception));
-              } finally {
-                instrumenter().end(context, httpRequest, null, throwable);
-              }
-            });
-    return settablePromise;
+    return promise.whenComplete(
+        (httpResponse, exception) ->
+            instrumenter().end(context, httpRequest, httpResponse, exception));
   }
 
   private PromiseWrapper() {}

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.activejhttp;
 
+import static io.activej.common.exception.FatalErrorHandlers.rethrow;
 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;
@@ -25,7 +26,6 @@
 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;
@@ -37,12 +37,11 @@
 
 class ActivejHttpServerTest extends AbstractHttpServerTest<HttpServer> {
 
-  @RegisterExtension static final EventloopExtension eventloopExtension = new EventloopExtension();
-
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
-  private static final Eventloop eventloop = Reactor.getCurrentReactor();
+  private static final Eventloop eventloop =
+      Eventloop.builder().withCurrentThread().withFatalErrorHandler(rethrow()).build();
   private Thread thread;
 
   @Override