use filter directly

Author: SentryMan

.fossa.yml

@@ -463,6 +463,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:graphql-java:graphql-java-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon:helidon-4.3.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon:helidon-4.3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:hibernate:hibernate-3.3:javaagent'

instrumentation/helidon/helidon-4.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/HelidonInstrumentation.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.helidon;
 
-import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
@@ -22,7 +21,7 @@ public class HelidonInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
-    return extendsClass(named("io.helidon.webserver.http.HttpRouting"));
+    return named("io.helidon.webserver.http.HttpRouting");
   }
 
   @Override
@@ -37,7 +36,7 @@ public static class BuildAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void onExit(@Advice.Return HttpRouting.Builder httpContext) {
-      HelidonSingletons.FILTERS.forEach(httpContext::addFeature);
+      HelidonSingletons.FILTERS.forEach(httpContext::addFilter);
     }
   }
 }

instrumentation/helidon/helidon-4.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/HelidonInstrumentationModule.java

@@ -7,17 +7,15 @@
 
 import static java.util.Collections.singletonList;
 
-import java.util.List;
-
 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 HelidonInstrumentationModule extends InstrumentationModule {
   public HelidonInstrumentationModule() {
-    super("helidon");
+    super("helidon", "helidon-4.3.0");
   }
 
   @Override

instrumentation/helidon/helidon-4.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/HelidonSingletons.java

@@ -5,18 +5,17 @@
 
 package io.opentelemetry.javaagent.instrumentation.helidon;
 
-import java.util.Arrays;
 import java.util.List;
 
-import io.helidon.webserver.http.HttpFeature;
+import io.helidon.webserver.http.Filter;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.helidon.HelidonTelemetry;
 import io.opentelemetry.instrumentation.helidon.internal.HelidonInstrumenterBuilderUtil;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 
 public final class HelidonSingletons {
 
-  public static final List<HttpFeature> FILTERS;
+  public static final List<Filter> FILTERS;
 
   static {
     var config = AgentCommonConfig.get();
@@ -27,7 +26,7 @@ public final class HelidonSingletons {
         .configure(config);
     var serverTelemetry = serverBuilder.build();
 
-    FILTERS = Arrays.asList(serverTelemetry, r -> r.addFilter(new ResponseCustomizingFilter()));
+    FILTERS = List.of(serverTelemetry.createFilter(), new ResponseCustomizingFilter());
   }
 
   private HelidonSingletons() {}

instrumentation/helidon/helidon-4.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/ResponseCustomizingFilter.java

@@ -19,7 +19,7 @@ final class ResponseCustomizingFilter implements Filter {
   @Override
   public void filter(FilterChain chain, RoutingRequest req, RoutingResponse res) {
 
-    Context context = Context.current();
+    var context = Context.current();
     HttpServerResponseCustomizerHolder.getCustomizer()
         .customize(context, res, HelidonServerResponseMutator.INSTANCE);
     chain.proceed();

…entation/helidon/JavaHttpServerTest.java …mentation/helidon/HelidonServerTest.javainstrumentation/helidon/helidon-4.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/helidon/JavaHttpServerTest.java renamed to instrumentation/helidon/helidon-4.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/helidon/HelidonServerTest.java instrumentation/helidon/helidon-4.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/helidon/JavaHttpServerTest.java renamed to instrumentation/helidon/helidon-4.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/helidon/HelidonServerTest.java

@@ -5,13 +5,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.helidon;
 
-import io.opentelemetry.instrumentation.javahttpserver.AbstractJavaHttpServerTest;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.opentelemetry.instrumentation.helidon.AbstractHelidonTest;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
-class JavaHttpServerTest extends AbstractJavaHttpServerTest {
+class HelidonServerTest extends AbstractHelidonTest {
 
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
@@ -21,5 +22,6 @@ protected void configure(HttpServerTestOptions options) {
     super.configure(options);
 
     options.setHasResponseCustomizer(serverEndpoint -> true);
+    options.setTestException(false);
   }
 }

instrumentation/helidon/helidon-4.3.0/library/src/main/java/io/opentelemetry/instrumentation/helidon/HelidonTelemetry.java

@@ -5,15 +5,14 @@
 
 package io.opentelemetry.instrumentation.helidon;
 
-import io.helidon.webserver.http.HttpFeature;
-import io.helidon.webserver.http.HttpRouting;
+import io.helidon.webserver.http.Filter;
 import io.helidon.webserver.http.ServerRequest;
 import io.helidon.webserver.http.ServerResponse;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 
 /** Entrypoint for instrumenting Java HTTP Server services. */
-public final class HelidonTelemetry implements HttpFeature {
+public final class HelidonTelemetry {
 
   /** Returns a new {@link HelidonTelemetry} configured with the given {@link OpenTelemetry}. */
   public static HelidonTelemetry create(OpenTelemetry openTelemetry) {
@@ -30,8 +29,7 @@ public static HelidonTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     this.instrumenter = instrumenter;
   }
 
-  @Override
-  public void setup(HttpRouting.Builder routing) {
-    routing.addFilter(new OpenTelemetryFilter(instrumenter));
+  public Filter createFilter() {
+    return new OpenTelemetryFilter(instrumenter);
   }
 }

instrumentation/helidon/helidon-4.3.0/library/src/test/java/io/opentelemetry/instrumentation/helidon/HelidonServerTest.java

@@ -5,12 +5,14 @@
 
 package io.opentelemetry.instrumentation.helidon;
 
+import java.util.Collections;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
 import io.helidon.webserver.http.HttpRouting;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
-import java.util.Collections;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 class HelidonServerTest extends AbstractHelidonTest {
 
@@ -27,6 +29,6 @@ protected void configureContexts(HttpRouting.Builder routing) {
             .setCapturedResponseHeaders(
                 Collections.singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER))
             .build();
-    routing.addFeature(feature);
+    routing.addFilter(feature.createFilter());
   }
 }