review

Author: laurit

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

@@ -11,7 +11,6 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
 import java.net.InetSocketAddress;
 import java.util.List;
-import java.util.Objects;
 import javax.annotation.Nullable;
 
 enum HelidonAttributesGetter implements HttpServerAttributesGetter<ServerRequest, ServerResponse> {
@@ -43,24 +42,15 @@ public List<String> getHttpRequestHeader(ServerRequest req, String name) {
     return req.headers().values(HeaderNames.create(name));
   }
 
-  @Nullable
   @Override
   public Integer getHttpResponseStatusCode(
-      ServerRequest req, @Nullable ServerResponse res, @Nullable Throwable error) {
-
-    return Objects.requireNonNull(res).status().code();
-  }
-
-  @Override
-  public List<String> getHttpResponseHeader(
-      ServerRequest req, @Nullable ServerResponse res, String name) {
-    return Objects.requireNonNull(res).headers().values(HeaderNames.create(name));
+      ServerRequest req, ServerResponse res, @Nullable Throwable error) {
+    return res.status().code();
   }
 
-  @Nullable
   @Override
-  public String getHttpRoute(ServerRequest req) {
-    return null;
+  public List<String> getHttpResponseHeader(ServerRequest req, ServerResponse res, String name) {
+    return res.headers().values(HeaderNames.create(name));
   }
 
   @Override

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

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.helidon.v4_3;
 
 import io.helidon.webserver.http.Filter;
+import io.helidon.webserver.http.HttpRouting;
 import io.helidon.webserver.http.ServerRequest;
 import io.helidon.webserver.http.ServerResponse;
 import io.opentelemetry.api.OpenTelemetry;
@@ -29,6 +30,10 @@ public static HelidonTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     this.instrumenter = instrumenter;
   }
 
+  /**
+   * Construct a new OpenTelemetry enabled {@link Filter}. Add it with {@link
+   * HttpRouting.Builder#addFilter(Filter)} to start capturing telemetry.
+   */
   public Filter createFilter() {
     return new OpenTelemetryFilter(instrumenter);
   }

instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java

@@ -17,7 +17,6 @@
 import io.opentelemetry.instrumentation.helidon.v4_3.internal.Experimental;
 import io.opentelemetry.instrumentation.helidon.v4_3.internal.HelidonInstrumenterBuilderUtil;
 import java.util.Collection;
-import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
 public final class HelidonTelemetryBuilder {
@@ -44,10 +43,7 @@ public final class HelidonTelemetryBuilder {
   /** Sets the status extractor for server spans. */
   @CanIgnoreReturnValue
   public HelidonTelemetryBuilder setStatusExtractor(
-      Function<
-              SpanStatusExtractor<ServerRequest, ServerResponse>,
-              SpanStatusExtractor<ServerRequest, ServerResponse>>
-          statusExtractor) {
+      UnaryOperator<SpanStatusExtractor<ServerRequest, ServerResponse>> statusExtractor) {
     builder.setStatusExtractor(statusExtractor);
     return this;
   }