fix jetty 12

Author: SylvainJuge

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

@@ -79,7 +79,5 @@ public static void stopSpan(
     if (adviceScope != null) {
       adviceScope.end(throwable, request, response);
     }
-
   }
-
 }

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12ServerInstrumentation.java

@@ -12,7 +12,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.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -55,7 +54,7 @@ private AdviceScope(Context context, Scope scope) {
 
       @Nullable
       public static AdviceScope start(Object source, Request request, Response response) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         if (!helper().shouldStart(parentContext, request)) {
           return null;
         }
@@ -67,15 +66,15 @@ public static AdviceScope start(Object source, Request request, Response respons
       }
 
       public void end(Request request, Response response, @Nullable Throwable throwable) {
-        if (scope != null) {
-          scope.close();
+        scope.close();
+        if (throwable != null) {
           helper().end(context, request, response, throwable);
         }
       }
     }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
     @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AdviceScope onEnter(
         @Advice.This Object source,
         @Advice.Argument(0) Request request,