working agent test

Author: SentryMan

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

@@ -5,13 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.helidon;
 
-import java.util.List;
-
 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;
+import java.util.List;
 
 public final class HelidonSingletons {
 

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

@@ -5,12 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.helidon;
 
-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 HelidonServerTest extends AbstractHelidonTest {
 
@@ -20,8 +19,8 @@ class HelidonServerTest extends AbstractHelidonTest {
   @Override
   protected void configure(HttpServerTestOptions options) {
     super.configure(options);
-
     options.setHasResponseCustomizer(serverEndpoint -> true);
-    options.setTestException(false);
+
+    options.setTestNotFound(false);
   }
 }

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

@@ -5,37 +5,39 @@
 
 package io.opentelemetry.instrumentation.helidon;
 
-import io.helidon.http.HeaderNames;
-import io.helidon.webserver.http.ServerRequest;
-import io.helidon.webserver.http.ServerResponse;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Objects;
+
 import javax.annotation.Nullable;
 
+import io.helidon.http.HeaderNames;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
+import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
+
 enum HelidonAttributesGetter implements HttpServerAttributesGetter<ServerRequest, ServerResponse> {
   INSTANCE;
 
   @Override
-  public String getHttpRequestMethod(ServerRequest exchange) {
-    return exchange.prologue().method().text();
+  public String getHttpRequestMethod(ServerRequest req) {
+    return req.prologue().method().text();
   }
 
   @Override
-  public String getUrlScheme(ServerRequest exchange) {
-    return exchange.requestedUri().scheme();
+  public String getUrlScheme(ServerRequest req) {
+    return req.requestedUri().scheme();
   }
 
   @Override
-  public String getUrlPath(ServerRequest exchange) {
-    return exchange.path().rawPath();
+  public String getUrlPath(ServerRequest req) {
+    return req.path().rawPath();
   }
 
   @Nullable
   @Override
-  public String getUrlQuery(ServerRequest exchange) {
-    return exchange.query().rawValue();
+  public String getUrlQuery(ServerRequest req) {
+    return req.query().rawValue();
   }
 
   @Override
@@ -60,7 +62,6 @@ public List<String> getHttpResponseHeader(
   @Nullable
   @Override
   public String getHttpRoute(ServerRequest req) {
-
     return null;
   }
 

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

@@ -8,22 +8,24 @@
 import static java.util.Collections.emptyIterator;
 import static java.util.Collections.emptyList;
 
+import java.util.Iterator;
+
+import javax.annotation.Nullable;
+
 import io.helidon.http.Header;
 import io.helidon.http.HeaderNames;
 import io.helidon.webserver.http.ServerRequest;
 import io.opentelemetry.context.propagation.internal.ExtendedTextMapGetter;
-import java.util.Iterator;
-import javax.annotation.Nullable;
 
 enum HelidonRequestGetter implements ExtendedTextMapGetter<ServerRequest> {
   INSTANCE;
 
   @Override
-  public Iterable<String> keys(@Nullable ServerRequest exchange) {
-    if (exchange == null) {
+  public Iterable<String> keys(@Nullable ServerRequest req) {
+    if (req == null) {
       return emptyList();
     }
-    return () -> exchange.headers().stream().map(Header::name).iterator();
+    return () -> req.headers().stream().map(Header::name).iterator();
   }
 
   @Override

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

@@ -11,7 +11,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 
-/** Entrypoint for instrumenting Java HTTP Server services. */
+/** Entrypoint for instrumenting Helidon services. */
 public final class HelidonTelemetry {
 
   /** Returns a new {@link HelidonTelemetry} configured with the given {@link OpenTelemetry}. */

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

@@ -20,7 +20,7 @@ class HelidonServerTest extends AbstractHelidonTest {
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forLibrary();
 
   @Override
-  protected void configureContexts(HttpRouting.Builder routing) {
+  protected void configureRoutes(HttpRouting.Builder routing) {
 
     var feature =
         HelidonTelemetry.builder(testing.getOpenTelemetry())

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

@@ -27,26 +27,26 @@
 
 public abstract class AbstractHelidonTest extends AbstractHttpServerTest<WebServer> {
 
-  protected void configureContexts(HttpRouting.Builder routing) {}
+  protected void configureRoutes(HttpRouting.Builder routing) {}
 
-  static void sendResponse(ServerResponse exchange, int status, String response) {
-    sendResponse(exchange, status, Collections.emptyMap(), response);
+  static void sendResponse(ServerResponse res, int status, String response) {
+    sendResponse(res, status, Collections.emptyMap(), response);
   }
 
-  static void sendResponse(ServerResponse exchange, int status, Map<String, String> headers) {
-    sendResponse(exchange, status, headers, "");
+  static void sendResponse(ServerResponse res, int status, Map<String, String> headers) {
+    sendResponse(res, status, headers, "");
   }
 
   static void sendResponse(
-      ServerResponse exchange, int status, Map<String, String> headers, String response) {
+      ServerResponse res, int status, Map<String, String> headers, String response) {
 
-    exchange.header("Content-Type", "text/plain");
-    headers.forEach(exchange::header);
-    exchange.send(response);
+    res.header("Content-Type", "text/plain");
+    headers.forEach(res::header);
+    res.status(status).send(response);
   }
 
-  private static String getUrlQuery(ServerRequest exchange) {
-    return exchange.query().rawValue();
+  private static String getUrlQuery(ServerRequest req) {
+    return req.query().rawValue();
   }
 
   @Override
@@ -132,8 +132,7 @@ protected WebServer setupServer() {
                     }));
 
     routing.get("/", (req, res) -> sendResponse(res, NOT_FOUND.getStatus(), NOT_FOUND.getBody()));
-
-    configureContexts(routing);
+    configureRoutes(routing);
 
     return server.routing(routing).build().start();
   }
@@ -147,6 +146,7 @@ protected void stopServer(WebServer server) {
   protected void configure(HttpServerTestOptions options) {
     // filter isn't called for non-standard method
     options.disableTestNonStandardHttpMethod();
+    options.setTestException(false);
     options.setTestHttpPipelining(true);
     options.setExpectedHttpRoute(
         (endpoint, method) -> {