refactor：update package name & remove useless dependency and code

Author: pepeshore

instrumentation/jfinal-3.6/javaagent/build.gradle.kts

@@ -7,6 +7,7 @@ muzzle {
     group.set("com.jfinal")
     module.set("jfinal")
     versions.set("[3.6,)")
+    assertInverse.set(true)
   }
 }
 
@@ -18,7 +19,6 @@ otelJava {
 dependencies {
   library("com.jfinal:jfinal:3.6")
   testLibrary("com.jfinal:jetty-server:2019.3")
-  testLibrary("com.jfinal:jfinal:3.6")
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-common:javaagent"))

instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/ActionHandlerInstrumentation.java renamed to instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/ActionHandlerInstrumentation.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jfinal;
+package io.opentelemetry.javaagent.instrumentation.jfinal.v3_6;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
-import static io.opentelemetry.javaagent.instrumentation.jfinal.JFinalSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.jfinal.v3_6.JFinalSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -74,17 +74,16 @@ public void end(@Nullable Throwable throwable) {
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static HandleAdvice.AdviceScope onEnter() {
-      return HandleAdvice.AdviceScope.start(currentContext());
+    public static AdviceScope onEnter() {
+      return AdviceScope.start(currentContext());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopTraceOnResponse(
-        @Advice.Thrown Throwable throwable, @Advice.Enter @Nullable AdviceScope actionScope) {
-      if (actionScope == null) {
-        return;
+        @Advice.Thrown  @Nullable Throwable throwable, @Advice.Enter @Nullable AdviceScope actionScope) {
+      if (actionScope != null) {
+        actionScope.end(throwable);
       }
-      actionScope.end(throwable);
     }
   }
 }

instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/ActionMappingInstrumentation.java renamed to instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/ActionMappingInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jfinal;
+package io.opentelemetry.javaagent.instrumentation.jfinal.v3_6;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -36,7 +36,7 @@ public void transform(TypeTransformer transformer) {
   public static class GetActionAdvice {
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void existGetAction(@Advice.Return(readOnly = false) Action action) {
+    public static void exitGetAction(@Advice.Return(readOnly = false) Action action) {
       JFinalSingletons.updateSpan(action);
     }
   }

instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/JFinalInstrumentationModule.java renamed to instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/JFinalInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jfinal;
+package io.opentelemetry.javaagent.instrumentation.jfinal.v3_6;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class JFinalInstrumentationModule extends InstrumentationModule {
   public JFinalInstrumentationModule() {
-    super("jfinal");
+    super("jfinal", "jfinal-3.6");
   }
 
   @Override

instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/JFinalSingletons.java renamed to instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/JFinalSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jfinal;
+package io.opentelemetry.javaagent.instrumentation.jfinal.v3_6;
 
 import com.jfinal.core.Action;
 import com.jfinal.render.JsonRender;

instrumentation/jfinal-3.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jfinal/TestController.java

@@ -35,7 +35,6 @@ public void exception() throws Throwable {
       GlobalTraceUtil.runWithSpan(
           "controller",
           () -> {
-            //        renderError(500, new TextRender(ServerEndpoint.EXCEPTION.getBody()));
             throw new IllegalStateException(EXCEPTION.getBody());
           });
     } catch (Throwable t) {

settings.gradle.kts

@@ -383,6 +383,7 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-12.0:javaagent")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-12.0:library")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-12.0:testing")
+include(":instrumentation:jfinal-3.6:javaagent")
 include(":instrumentation:jms:jms-1.1:javaagent")
 include(":instrumentation:jms:jms-3.0:javaagent")
 include(":instrumentation:jms:jms-common:bootstrap")
@@ -691,7 +692,7 @@ include(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent")
 include(":instrumentation:xxl-job:xxl-job-common:javaagent")
 include(":instrumentation:xxl-job:xxl-job-common:testing")
 include(":instrumentation:zio:zio-2.0:javaagent")
-include(":instrumentation:jfinal-3.6:javaagent")
+
 
 // benchmark
 include(":benchmark-overhead-jmh")