Review fixes for jetty-8.0:javaagent (open-telemetry#18093)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HandlerAdvice.java

@@ -6,13 +6,22 @@
 package io.opentelemetry.javaagent.instrumentation.jetty.v8_0;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.instrumentation.jetty.v8_0.Jetty8Singletons.helper;
 import static java.util.Arrays.asList;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
+import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.jetty.common.JettyHandlerInstrumentation;
 import java.util.List;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.bytebuddy.asm.Advice;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
@@ -32,8 +41,70 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new JettyHandlerInstrumentation(
-            "javax.servlet",
-            Jetty8InstrumentationModule.class.getPackage().getName() + ".Jetty8HandlerAdvice"),
+            "javax.servlet", getClass().getName() + "$Jetty8HandlerAdvice"),
         new JettyQueuedThreadPoolInstrumentation());
   }
+
+  @SuppressWarnings("unused")
+  public static class Jetty8HandlerAdvice {
+
+    public static class AdviceScope {
+      private final ServletRequestContext<HttpServletRequest> requestContext;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(
+          ServletRequestContext<HttpServletRequest> requestContext, Context context, Scope scope) {
+        this.requestContext = requestContext;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(HttpServletRequest request, HttpServletResponse response) {
+        Context attachedContext = helper().getServerContext(request);
+        if (attachedContext != null) {
+          // We are inside nested handler, don't create new span
+          return null;
+        }
+        Context parentContext = Context.current();
+        ServletRequestContext<HttpServletRequest> requestContext =
+            new ServletRequestContext<>(request);
+        if (!helper().shouldStart(parentContext, requestContext)) {
+          return null;
+        }
+        Context context = helper().start(parentContext, requestContext);
+        Scope scope = context.makeCurrent();
+        // Must be set here since Jetty handlers can use startAsync outside of servlet scope.
+        helper().setAsyncListenerResponse(context, response);
+        HttpServerResponseCustomizerHolder.getCustomizer()
+            .customize(context, response, new Jetty8ResponseMutator());
+        return new AdviceScope(requestContext, context, scope);
+      }
+
+      public void end(
+          @Nullable Throwable throwable, HttpServletRequest request, HttpServletResponse response) {
+        helper().end(requestContext, request, response, throwable, context, scope);
+      }
+    }
+
+    @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
+    public static AdviceScope onEnter(
+        @Advice.Argument(2) HttpServletRequest request,
+        @Advice.Argument(3) HttpServletResponse response) {
+      return AdviceScope.start(request, response);
+    }
+
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
+    public static void stopSpan(
+        @Advice.Argument(2) HttpServletRequest request,
+        @Advice.Argument(3) HttpServletResponse response,
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end(throwable, request, response);
+      }
+    }
+  }
 }

instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -50,7 +51,7 @@ public static PropagatedContext enterJobSubmit(@Advice.Argument(0) Runnable task
     public static void exitJobSubmit(
         @Advice.Argument(0) Runnable task,
         @Advice.Enter PropagatedContext propagatedContext,
-        @Advice.Thrown Throwable throwable) {
+        @Advice.Thrown @Nullable Throwable throwable) {
       ExecutorAdviceHelper.cleanUpAfterSubmit(
           propagatedContext, throwable, PROPAGATED_CONTEXT, task);
     }

instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyQueuedThreadPoolInstrumentation.java

@@ -86,7 +86,7 @@ void dispatchPropagatesLambda() throws Exception {
 
     testing.waitAndAssertTraces(
         trace ->
-            trace.hasSpansSatisfyingExactlyInAnyOrder(
+            trace.hasSpansSatisfyingExactly(
                 span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
                 span ->
                     span.hasName("asyncChild")

instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/QueuedThreadPoolTest.java

@@ -8,20 +8,24 @@ features:
 library_link: https://eclipse.dev/jetty/
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.server.capture-request-headers
+    declarative_name: general.http.server.request_captured_headers
     description: List of HTTP request headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.capture-response-headers
+    declarative_name: general.http.server.response_captured_headers
     description: List of HTTP response headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.emit-experimental-telemetry
+    declarative_name: java.common.http.server.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.server.request.size` and