post-review changes

Author: SylvainJuge

instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HandlerAdvice.java

@@ -9,7 +9,6 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 import jakarta.servlet.http.HttpServletRequest;
@@ -40,7 +39,7 @@ public static AdviceScope start(
         // We are inside nested handler, don't create new span
         return null;
       }
-      Context parentContext = Java8BytecodeBridge.currentContext();
+      Context parentContext = Context.current();
       ServletRequestContext<HttpServletRequest> requestContext =
           new ServletRequestContext<>(request);
       if (!helper().shouldStart(parentContext, requestContext)) {

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

@@ -9,7 +9,6 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 import javax.annotation.Nullable;
@@ -40,7 +39,7 @@ public static AdviceScope start(
         // We are inside nested handler, don't create new span
         return null;
       }
-      Context parentContext = Java8BytecodeBridge.currentContext();
+      Context parentContext = Context.current();
       ServletRequestContext<HttpServletRequest> requestContext =
           new ServletRequestContext<>(request);
       if (!helper().shouldStart(parentContext, requestContext)) {

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

@@ -11,7 +11,6 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.bootstrap.executors.ExecutorAdviceHelper;
 import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
@@ -39,7 +38,7 @@ public static class DispatchAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static PropagatedContext enterJobSubmit(@Advice.Argument(0) Runnable task) {
-      Context context = Java8BytecodeBridge.currentContext();
+      Context context = Context.current();
       if (ExecutorAdviceHelper.shouldPropagateContext(context, task)) {
         return ExecutorAdviceHelper.attachContextToTask(context, PROPAGATED_CONTEXT, task);
       }