Fix jetty 12 advices

Author: amarziali

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java

@@ -48,8 +48,9 @@ public String[] helperClassNames() {
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvices(
         named("onRequest").and(takesArguments(1)),
-        packageName + ".JettyServerAdvice$ContextTrackingAdvice",
-        packageName + ".JettyServerAdvice$HandleAdvice");
+        packageName + ".JettyServerAdvice$HandleAdvice",
+        // note this is last while it should be first because this instrumentation advices on exit
+        packageName + ".JettyServerAdvice$ContextTrackingAdvice");
     transformer.applyAdvice(
         named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
   }

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java

@@ -21,24 +21,14 @@ public class JettyServerAdvice {
   @AppliesOn(CONTEXT_TRACKING)
   public static class ContextTrackingAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This final HttpChannelState channel,
-        @Advice.Local("parentScope") ContextScope parentScope) {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.This final HttpChannelState channel) {
       Request req = channel.getRequest();
       if (req.getAttribute(DD_CONTEXT_ATTRIBUTE) instanceof Context) {
         return; // re-entry: HandleAdvice will attach existing context
       }
       Context parentContext = DECORATE.extract(req);
       req.setAttribute(DD_PARENT_CONTEXT_ATTRIBUTE, parentContext);
-      parentScope = parentContext.attach();
-    }
-
-    @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
-    public static void closeScope(@Advice.Local("parentScope") ContextScope parentScope) {
-      if (parentScope != null) {
-        parentScope.close();
-      }
     }
   }