post-review changes

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsAnnotationsInstrumentation.java

@@ -22,7 +22,6 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.lang.reflect.Method;
@@ -83,7 +82,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method) {
           return;
         }
 
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         handlerData = new HandlerData(type, method);
 
         HttpServerRoute.update(
@@ -103,11 +102,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method) {
       }
 
       public void exit(@Nullable Throwable throwable) {
-        if (callDepth.decrementAndGet() > 0) {
-          return;
-        }
-
-        if (scope == null) {
+        if (callDepth.decrementAndGet() > 0 || scope == null) {
           return;
         }
         scope.close();

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

@@ -11,7 +11,6 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
-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;
@@ -51,7 +50,7 @@ private AdviceScope(Context context, Scope scope, Jaxrs2HandlerData handlerData)
       @Nullable
       public static AdviceScope enter(Class<?> filterClass, Method method) {
 
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         Jaxrs2HandlerData handlerData = new Jaxrs2HandlerData(filterClass, method);
 
         HttpServerRoute.update(

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

@@ -23,7 +23,6 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
-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;
@@ -111,7 +110,7 @@ public AdviceScope(CallDepth callDepth, Object[] args, Object target, Method met
         }
         asyncResponse = asyncResponseArg;
 
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         handlerData = new Jaxrs2HandlerData(target.getClass(), method);
 
         HttpServerRoute.update(

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

@@ -9,7 +9,7 @@
 import org.jboss.resteasy.core.ResourceLocatorInvoker;
 import org.jboss.resteasy.core.ResourceMethodInvoker;
 
-public class ResteasySingletons {
+public final class ResteasySingletons {
 
   public static final VirtualField<ResourceLocatorInvoker, String> LOCATOR_NAME =
       VirtualField.find(ResourceLocatorInvoker.class, String.class);

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming;
 import jakarta.ws.rs.container.ContainerRequestContext;
@@ -51,7 +50,7 @@ private AdviceScope(Context context, Scope scope, Jaxrs3HandlerData handlerData)
       @Nullable
       public static AdviceScope enter(
           Class<?> filterClass, Method method, ContainerRequestContext requestContext) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         Jaxrs3HandlerData handlerData = new Jaxrs3HandlerData(filterClass, method);
 
         HttpServerRoute.update(

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java

@@ -23,7 +23,6 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
-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;
@@ -111,7 +110,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method, Object[] a
         }
         asyncResponse = asyncResponseArg;
 
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         handlerData = new Jaxrs3HandlerData(type, method);
 
         HttpServerRoute.update(