feat: Add OpenTelemetry instrumentation for ActiveJ HTTP server

.fossa.yml

@@ -49,6 +49,9 @@ targets:
     - type: gradle
       path: ./
       target: ':testing:agent-for-testing'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:activej-http-6.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:alibaba-druid-1.0:javaagent'

dependencyManagement/build.gradle.kts

@@ -109,7 +109,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
   "org.assertj:assertj-core:3.27.3",
-  "org.awaitility:awaitility:4.2.2",
+  "org.awaitility:awaitility:4.3.0",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
   "org.apache.groovy:groovy:${groovyVersion}",

docs/supported-libraries.md

@@ -19,6 +19,7 @@ These are the supported libraries and frameworks:
 
 | Library/Framework                                                                                                                           | Auto-instrumented versions         | Standalone Library Instrumentation [1]                                                                                                                                                                                                                                                                                                                                                  | Semantic Conventions                                                                                                                    |
 |---------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| [ActiveJ](https://activej.io/)                                                                                                                 | 6.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Server Spans]                                                                                                                     |
 | [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html)                                                                       | 2.3+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Context propagation                                                                                                                     |
 | [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html)                                                                          | 10.0+                              | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2]                       |
 | [Alibaba Druid](https://github.com/alibaba/druid)                                                                                           | 1.0+                               | [opentelemetry-alibaba-druid-1.0](../instrumentation/alibaba-druid-1.0/library)                                                                                                                                                                                                                                                                                                         | [Database Pool Metrics]                                                                                                                 |

instrumentation/activej-http-6.0/javaagent/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+muzzle {
+  pass {
+    group.set("io.activej:activej-http")
+    module.set("activej-http")
+    versions.set("[6.0,)")
+    assertInverse.set(true)
+  }
+}
+
+dependencies {
+  library("io.activej:activej-http:6.0-rc2")
+  latestDepTestLibrary("io.activej:activej-http:6.0-rc2") // documented limitation
+}
+
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+}

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
+import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerConnectionSingletons.instrumenter;
+import static net.bytebuddy.matcher.ElementMatchers.isInterface;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import io.activej.http.AsyncServlet;
+import io.activej.http.HttpRequest;
+import io.activej.http.HttpResponse;
+import io.activej.promise.Promise;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class ActivejHttpServerConnectionInstrumentation implements TypeInstrumentation {
+
+  @Override
+  public ElementMatcher<TypeDescription> typeMatcher() {
+    return hasSuperType(named("io.activej.http.AsyncServlet")).and(not(isInterface()));
+  }
+
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
+    return hasClassesNamed("io.activej.http.AsyncServlet");
+  }
+
+  @Override
+  public void transform(TypeTransformer transformer) {
+    transformer.applyAdviceToMethod(
+        isMethod()
+            .and(named("serve"))
+            .and(takesArguments(1).and(takesArgument(0, named("io.activej.http.HttpRequest")))),
+        this.getClass().getName() + "$ServeAdvice");
+  }
+
+  @SuppressWarnings("unused")
+  public static class ServeAdvice {
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void methodEnter(
+        @Advice.This AsyncServlet asyncServlet,
+        @Advice.Argument(0) HttpRequest request,
+        @Advice.Local("otelContext") Context context,
+        @Advice.Local("otelScope") Scope scope,
+        @Advice.Local("httpRequest") HttpRequest httpRequest) {
+      Context parentContext = currentContext();
+      httpRequest = request;
+      if (!instrumenter().shouldStart(parentContext, request)) {
+        return;
+      }
+      context = instrumenter().start(parentContext, request);
+      scope = context.makeCurrent();
+    }
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+    public static void methodExit(
+        @Advice.This AsyncServlet asyncServlet,
+        @Advice.Return(readOnly = false) Promise<HttpResponse> responsePromise,
+        @Advice.Thrown Throwable throwable,
+        @Advice.Local("otelContext") Context context,
+        @Advice.Local("otelScope") Scope scope,
+        @Advice.Local("httpRequest") HttpRequest httpRequest) {
+      if (scope == null) {
+        return;
+      }
+      scope.close();
+      if (throwable != null) {
+        instrumenter().end(context, httpRequest, null, throwable);
+      } else {
+        responsePromise = PromiseWrapper.wrap(responsePromise, httpRequest, context);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import static java.util.Collections.singletonList;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import java.util.List;
+
+@AutoService(InstrumentationModule.class)
+public class ActivejHttpServerConnectionInstrumentationModule extends InstrumentationModule {
+
+  public ActivejHttpServerConnectionInstrumentationModule() {
+    super("activej-http", "activej-http-6.0");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new ActivejHttpServerConnectionInstrumentation());
+  }
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import io.activej.http.HttpRequest;
+import io.activej.http.HttpResponse;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
+
+public final class ActivejHttpServerConnectionSingletons {
+
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.activej-http-6.0";
+
+  private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;
+
+  static {
+    INSTRUMENTER =
+        JavaagentHttpServerInstrumenters.create(
+            INSTRUMENTATION_NAME,
+            new ActivejHttpServerHttpAttributesGetter(),
+            ActivejHttpServerHeaders.INSTANCE);
+  }
+
+  public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
+    return INSTRUMENTER;
+  }
+
+  private ActivejHttpServerConnectionSingletons() {}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import io.activej.http.HttpHeader;
+import io.activej.http.HttpHeaderValue;
+import io.activej.http.HttpHeaders;
+import io.activej.http.HttpRequest;
+import io.opentelemetry.context.propagation.internal.ExtendedTextMapGetter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+enum ActivejHttpServerHeaders implements ExtendedTextMapGetter<HttpRequest> {
+  INSTANCE;
+
+  @Override
+  public Iterable<String> keys(HttpRequest httpRequest) {
+    return httpRequest.getHeaders().stream().map(h -> h.getKey().toString()).toList();
+  }
+
+  @Override
+  public String get(HttpRequest carrier, String key) {
+    if (carrier == null) {
+      return null;
+    }
+    return carrier.getHeader(HttpHeaders.of(key));
+  }
+
+  @Override
+  public Iterator<String> getAll(HttpRequest carrier, String key) {
+    List<String> values = new ArrayList<>();
+    if (carrier != null) {
+      for (Map.Entry<HttpHeader, HttpHeaderValue> entry : carrier.getHeaders()) {
+        if (entry.getKey().toString().equalsIgnoreCase(key)) {
+          values.add(entry.getValue().toString());
+        }
+      }
+    }
+    return values.iterator();
+  }
+}

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

@@ -0,0 +1,66 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+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;
+import java.util.List;
+import javax.annotation.Nullable;
+
+final class ActivejHttpServerHttpAttributesGetter
+    implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
+
+  @Override
+  public String getHttpRequestMethod(HttpRequest request) {
+    return ActivejHttpServerUtil.getHttpRequestMethod(request);
+  }
+
+  @Override
+  public List<String> getHttpRequestHeader(HttpRequest request, String name) {
+    return ActivejHttpServerUtil.requestHeader(request, name);
+  }
+
+  @Override
+  public Integer getHttpResponseStatusCode(
+      HttpRequest request, HttpResponse httpResponse, @Nullable Throwable error) {
+    return ActivejHttpServerUtil.getHttpResponseStatusCode(request, httpResponse, error);
+  }
+
+  @Override
+  public List<String> getHttpResponseHeader(
+      HttpRequest request, HttpResponse httpResponse, String name) {
+    return ActivejHttpServerUtil.getHttpResponseHeader(request, httpResponse, name);
+  }
+
+  @Override
+  public String getUrlScheme(HttpRequest request) {
+    return toLowerCase(request.getProtocol().name());
+  }
+
+  @Override
+  public String getUrlPath(HttpRequest request) {
+    return request.getPath();
+  }
+
+  @Override
+  public String getUrlQuery(HttpRequest request) {
+    return request.getQuery();
+  }
+
+  @Override
+  public String getNetworkProtocolName(HttpRequest request, @Nullable HttpResponse httpResponse) {
+    return ActivejHttpServerUtil.getNetworkProtocolName(request);
+  }
+
+  @Override
+  public String getNetworkProtocolVersion(
+      HttpRequest request, @Nullable HttpResponse httpResponse) {
+    return ActivejHttpServerUtil.getNetworkProtocolVersion(request.getVersion());
+  }
+}

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import static io.activej.http.HttpError.internalServerError500;
+import static java.util.Collections.emptyList;
+
+import io.activej.http.HttpHeaders;
+import io.activej.http.HttpRequest;
+import io.activej.http.HttpResponse;
+import io.activej.http.HttpVersion;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
+public final class ActivejHttpServerUtil {
+
+  private ActivejHttpServerUtil() {
+    throw new UnsupportedOperationException();
+  }
+
+  static String getHttpRequestMethod(HttpRequest request) {
+    return request.getMethod().name();
+  }
+
+  static List<String> requestHeader(HttpRequest request, String name) {
+    String headerValue = request.getHeader(HttpHeaders.of(name));
+    if (headerValue == null) {
+      return emptyList();
+    }
+    return Arrays.stream(headerValue.split(",")).collect(Collectors.toList());
+  }
+
+  static Integer getHttpResponseStatusCode(
+      HttpRequest request, HttpResponse httpResponse, @Nullable Throwable error) {
+    if (error != null && httpResponse.getCode() <= 0) {
+      return internalServerError500().getCode();
+    }
+    return httpResponse.getCode();
+  }
+
+  static List<String> getHttpResponseHeader(
+      HttpRequest request, HttpResponse httpResponse, String name) {
+    String headerValue = httpResponse.getHeader(HttpHeaders.of(name));
+    if (headerValue == null) {
+      return emptyList();
+    }
+    return Arrays.stream(headerValue.split(",")).toList();
+  }
+
+  static String getNetworkProtocolVersion(HttpVersion version) {
+    switch (version) {
+      case HTTP_0_9:
+        return "0.9";
+      case HTTP_1_0:
+        return "1.0";
+      case HTTP_1_1:
+        return "1.1";
+      case HTTP_2_0:
+        return "2.0";
+    }
+    return "unknown";
+  }
+
+  static String getNetworkProtocolName(HttpRequest request) {
+    if (request.getVersion() == HttpVersion.HTTP_0_9
+        || request.getVersion() == HttpVersion.HTTP_1_0
+        || request.getVersion() == HttpVersion.HTTP_1_1
+        || request.getVersion() == HttpVersion.HTTP_2_0) {
+      return "http";
+    }
+    return null;
+  }
+}