Resolved PR comments

Author: kcsurapaneni

.fossa.yml

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

instrumentation/activej-http/javaagent/README.md instrumentation/activej-http-6.0/javaagent/README.md

@@ -7,10 +7,10 @@ muzzle {
     group.set("io.activej:activej-http")
     module.set("activej-http")
 
-    versions.set("[1.0,)")
+    versions.set("[6.0,)")
   }
 }
 
 dependencies {
-  library("io.activej:activej-http:6.0-beta2")
+  library("io.activej:activej-http:6.0-rc2")
 }

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

@@ -34,27 +34,14 @@
  * {@code serve} method of classes that extend {@code io.activej.http.AsyncServlet}. The
  * instrumentation is designed to integrate with OpenTelemetry for distributed tracing, capturing
  * and propagating trace context through HTTP requests and responses.
- *
- * @author Krishna Chaitanya Surapaneni
  */
 public class ActiveJHttpServerConnectionInstrumentation implements TypeInstrumentation {
 
-  /**
-   * Matches classes that extend {@code io.activej.http.AsyncServlet} but are not interfaces.
-   *
-   * @return An {@code ElementMatcher} that identifies target classes for instrumentation.
-   */
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return hasSuperType(named("io.activej.http.AsyncServlet")).and(not(isInterface()));
   }
 
-  /**
-   * Applies advice to the {@code serve} method of the matched classes. The advice captures trace
-   * context at the start of the method and propagates it through the response.
-   *
-   * @param transformer The {@code TypeTransformer} used to apply the advice.
-   */
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
@@ -64,28 +51,9 @@ public void transform(TypeTransformer transformer) {
         this.getClass().getName() + "$ServeAdvice");
   }
 
-  /**
-   * Inner class containing the advice logic for the {@code serve} method. This class defines two
-   * methods:
-   *
-   * <ul>
-   *   <li>{@code methodEnter}: Captures the trace context at the start of the method.
-   *   <li>{@code methodExit}: Propagates the trace context to the response and ends the span.
-   * </ul>
-   */
   @SuppressWarnings("unused")
   public static class ServeAdvice {
 
-    /**
-     * Advice executed at the start of the {@code serve} method. Captures the current trace context
-     * and starts a new span if tracing is enabled for the request.
-     *
-     * @param asyncServlet The {@code AsyncServlet} instance handling the request.
-     * @param request The incoming HTTP request.
-     * @param context Local variable to store the OpenTelemetry context.
-     * @param scope Local variable to store the OpenTelemetry scope.
-     * @param httpRequest Local variable to store the HTTP request.
-     */
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void methodEnter(
         @Advice.This AsyncServlet asyncServlet,
@@ -102,17 +70,6 @@ public static void methodEnter(
       scope = context.makeCurrent();
     }
 
-    /**
-     * Advice executed at the end of the {@code serve} method. Propagates the trace context to the
-     * response, handles exceptions, and ends the span.
-     *
-     * @param asyncServlet The {@code AsyncServlet} instance handling the request.
-     * @param responsePromise The promise representing the HTTP response.
-     * @param throwable Any exception thrown during the execution of the method.
-     * @param context Local variable storing the OpenTelemetry context.
-     * @param scope Local variable storing the OpenTelemetry scope.
-     * @param httpRequest Local variable storing the HTTP request.
-     */
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
         @Advice.This AsyncServlet asyncServlet,

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

@@ -0,0 +1,32 @@
+/*
+ * 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.HelperResourceBuilder;
+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-server");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new ActiveJHttpServerConnectionInstrumentation());
+  }
+
+  @Override
+  public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) {
+    helperResourceBuilder.register(ActiveJHttpServerHelper.class.getName());
+  }
+}

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

@@ -10,18 +10,8 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 
-/**
- * This class provides singleton instances and utilities for ActiveJ HTTP server instrumentation. It
- * is designed to centralize the creation and access of OpenTelemetry-related components, such as
- * the {@code Instrumenter} used for tracing HTTP requests and responses.
- *
- * @author Krishna Chaitanya Surapaneni
- */
 public class ActiveJHttpServerConnectionSingletons {
 
-  /**
-   * The name of the instrumentation, used to identify this module in the OpenTelemetry framework.
-   */
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.activej-http";
 
   private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;

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

@@ -16,13 +16,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * This enum implements the {@code ExtendedTextMapGetter<HttpRequest>} interface and provides
- * methods for extracting HTTP headers from an ActiveJ {@code HttpRequest}. It is used in the
- * context of OpenTelemetry instrumentation to propagate trace context across service boundaries.
- *
- * @author Krishna Chaitanya Surapaneni
- */
 enum ActiveJHttpServerHeaders implements ExtendedTextMapGetter<HttpRequest> {
   INSTANCE;
 

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.activejhttp;
+
+import io.activej.http.HttpError;
+import io.activej.http.HttpHeader;
+import io.activej.http.HttpHeaderValue;
+import io.activej.http.HttpHeaders;
+import io.activej.http.HttpResponse;
+import java.util.Map;
+
+public final class ActiveJHttpServerHelper {
+
+  private ActiveJHttpServerHelper() {
+    throw new UnsupportedOperationException();
+  }
+
+  public static HttpResponse createResponse(
+      Throwable throwable, String traceparent, HttpResponse httpResponse) {
+    int code = 500;
+    if (httpResponse != null) {
+      code = httpResponse.getCode();
+    } else if (throwable instanceof HttpError) {
+      HttpError error = (HttpError) throwable;
+      code = error.getCode();
+    }
+    HttpResponse.Builder responseBuilder = HttpResponse.ofCode(code);
+    if (httpResponse != null) {
+      if (httpResponse.hasBody()) {
+        responseBuilder.withBody(httpResponse.getBody());
+      }
+      for (Map.Entry<HttpHeader, HttpHeaderValue> entry : httpResponse.getHeaders()) {
+        responseBuilder.withHeader(entry.getKey(), entry.getValue());
+      }
+    }
+    if (throwable != null) {
+      responseBuilder.withPlainText(throwable.getMessage());
+    }
+    return responseBuilder.withHeader(HttpHeaders.of("traceparent"), traceparent).build();
+  }
+}

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

@@ -12,14 +12,6 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-/**
- * This class implements the {@code HttpServerAttributesGetter<HttpRequest, HttpResponse>} interface
- * and provides methods for extracting HTTP-related attributes from ActiveJ {@code HttpRequest} and
- * {@code HttpResponse} objects. These attributes are used by OpenTelemetry to enrich telemetry
- * data, such as spans, with detailed information about HTTP requests and responses.
- *
- * @author Krishna Chaitanya Surapaneni
- */
 final class ActiveJHttpServerHttpAttributesGetter
     implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
 

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

@@ -15,14 +15,6 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
-/**
- * This utility class provides helper methods for extracting and manipulating HTTP-related
- * attributes from ActiveJ {@code HttpRequest} and {@code HttpResponse} objects. It is designed to
- * simplify the process of retrieving information such as HTTP methods, headers, status codes, and
- * other metadata, which are essential for OpenTelemetry instrumentation and distributed tracing.
- *
- * @author Krishna Chaitanya Surapaneni
- */
 public final class ActiveJHttpServerUtil {
 
   private ActiveJHttpServerUtil() {

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

@@ -128,7 +128,7 @@ include(":smoke-tests-otel-starter:spring-boot-reactive-2")
 include(":smoke-tests-otel-starter:spring-boot-reactive-3")
 include(":smoke-tests-otel-starter:spring-boot-reactive-common")
 
-include(":instrumentation:activej-http:javaagent")
+include(":instrumentation:activej-http-6.0:javaagent")
 include(":instrumentation:akka:akka-actor-2.3:javaagent")
 include(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent")
 include(":instrumentation:akka:akka-http-10.0:javaagent")