Add instrumentation for JAX-RS 3.0

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/ContainerRequestFilterInstrumentation.java

@@ -14,6 +14,7 @@
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import net.bytebuddy.asm.Advice;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java

@@ -12,6 +12,8 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteHolder;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSource;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming;
 import java.lang.reflect.Method;
 import javax.ws.rs.container.ContainerRequestContext;
 import net.bytebuddy.asm.Advice;
@@ -38,7 +40,7 @@ public static class ContainerRequestContextAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void createGenericSpan(
         @Advice.This ContainerRequestContext requestContext,
-        @Local("otelHandlerData") HandlerData handlerData,
+        @Local("otelHandlerData") Jaxrs2HandlerData handlerData,
         @Local("otelContext") Context context,
         @Local("otelScope") Scope scope) {
       if (requestContext.getProperty(JaxrsConstants.ABORT_HANDLED) != null) {
@@ -60,7 +62,7 @@ public static void createGenericSpan(
       }
 
       Context parentContext = Java8BytecodeBridge.currentContext();
-      handlerData = new HandlerData(filterClass, method);
+      handlerData = new Jaxrs2HandlerData(filterClass, method);
 
       HttpRouteHolder.updateHttpRoute(
           parentContext,
@@ -78,7 +80,7 @@ public static void createGenericSpan(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Local("otelHandlerData") HandlerData handlerData,
+        @Local("otelHandlerData") Jaxrs2HandlerData handlerData,
         @Local("otelContext") Context context,
         @Local("otelScope") Scope scope,
         @Advice.Thrown Throwable throwable) {

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java

@@ -24,6 +24,9 @@
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.CompletionStageFinishCallback;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming;
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletionStage;
 import javax.ws.rs.Path;
@@ -74,7 +77,7 @@ public static void nameSpan(
         @Advice.Origin Method method,
         @Advice.AllArguments Object[] args,
         @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelHandlerData") HandlerData handlerData,
+        @Advice.Local("otelHandlerData") Jaxrs2HandlerData handlerData,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope,
         @Advice.Local("otelAsyncResponse") AsyncResponse asyncResponse) {
@@ -102,7 +105,7 @@ public static void nameSpan(
       }
 
       Context parentContext = Java8BytecodeBridge.currentContext();
-      handlerData = new HandlerData(target.getClass(), method);
+      handlerData = new Jaxrs2HandlerData(target.getClass(), method);
 
       HttpRouteHolder.updateHttpRoute(
           parentContext,
@@ -127,7 +130,7 @@ public static void stopSpan(
         @Advice.Return(readOnly = false, typing = Typing.DYNAMIC) Object returnValue,
         @Advice.Thrown Throwable throwable,
         @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelHandlerData") HandlerData handlerData,
+        @Advice.Local("otelHandlerData") Jaxrs2HandlerData handlerData,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope,
         @Advice.Local("otelAsyncResponse") AsyncResponse asyncResponse) {

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsSingletons.java

@@ -6,6 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsInstrumenterFactory;
 
 public final class JaxrsAnnotationsSingletons {
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAsyncResponseInstrumentation.java

@@ -17,6 +17,8 @@
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConfig;
 import javax.ws.rs.container.AsyncResponse;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 
 dependencies {
   bootstrap(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
+  api(project(":instrumentation:jaxrs:jaxrs-common:javaagent"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
-
-  compileOnly("com.google.auto.value:auto-value-annotations")
-  annotationProcessor("com.google.auto.value:auto-value")
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Jaxrs2HandlerData.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
+
+import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.Path;
+
+public class Jaxrs2HandlerData extends HandlerData {
+
+  private static final ClassValue<Map<Method, String>> serverSpanNames =
+      new ClassValue<Map<Method, String>>() {
+        @Override
+        protected Map<Method, String> computeValue(Class<?> type) {
+          return new ConcurrentHashMap<>();
+        }
+      };
+
+  public Jaxrs2HandlerData(Class<?> target, Method method) {
+    super(target, method);
+  }
+
+  /**
+   * Returns the span name given a JaxRS annotated method. Results are cached so this method can be
+   * called multiple times without significantly impacting performance.
+   *
+   * @return The result can be an empty string but will never be {@code null}.
+   */
+  @Override
+  public String getServerSpanName() {
+    Map<Method, String> classMap = serverSpanNames.get(target);
+    String spanName = classMap.get(method);
+    if (spanName == null) {
+      spanName = super.getServerSpanName();
+      classMap.put(method, spanName);
+    }
+
+    return spanName;
+  }
+
+  @Override
+  protected Class<? extends Annotation> getHttpMethodAnnotation() {
+    return HttpMethod.class;
+  }
+
+  @Override
+  protected Supplier<String> getPathAnnotation(AnnotatedElement annotatedElement) {
+    Path path = annotatedElement.getAnnotation(Path.class);
+    return path != null ? path::value : null;
+  }
+}

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Jaxrs2RequestContextHelper.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.RequestContextHelper;
+import javax.ws.rs.container.ContainerRequestContext;
+
+public final class Jaxrs2RequestContextHelper {
+  public static Context createOrUpdateAbortSpan(
+      Instrumenter<HandlerData, Void> instrumenter,
+      ContainerRequestContext requestContext,
+      HandlerData handlerData) {
+
+    if (handlerData == null) {
+      return null;
+    }
+
+    requestContext.setProperty(JaxrsConstants.ABORT_HANDLED, true);
+    return RequestContextHelper.createOrUpdateAbortSpan(instrumenter, handlerData);
+  }
+
+  private Jaxrs2RequestContextHelper() {}
+}