Merge remote-tracking branch 'origin/feat/support-jfinal' into feat/support-jfinal

pepeshore · pepeshore · commit f61ac7029aa2 · 2025-11-05T19:35:41.000+08:00
Change-Id: I49595e0b48a44439e05262aaccd9b340ae4f414a
diff --git a/instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/ActionHandlerInstrumentation.java b/instrumentation/jfinal-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_6/ActionHandlerInstrumentation.java
@@ -80,7 +80,8 @@ public static AdviceScope onEnter() {
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopTraceOnResponse(
-        @Advice.Thrown  @Nullable Throwable throwable, @Advice.Enter @Nullable AdviceScope actionScope) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope actionScope) {
       if (actionScope != null) {
         actionScope.end(throwable);
       }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -693,7 +693,6 @@ include(":instrumentation:xxl-job:xxl-job-common:javaagent")
 include(":instrumentation:xxl-job:xxl-job-common:testing")
 include(":instrumentation:zio:zio-2.0:javaagent")
 
-
 // benchmark
 include(":benchmark-overhead-jmh")
 include(":benchmark-jfr-analyzer")

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ public static AdviceScope onEnter() {`
`80`	`80`
`81`	`81`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`82`	`82`	`public static void stopTraceOnResponse(`
`83`		`- @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter @Nullable AdviceScope actionScope) {`
	`83`	`+ @Advice.Thrown @Nullable Throwable throwable,`
	`84`	`+ @Advice.Enter @Nullable AdviceScope actionScope) {`
`84`	`85`	`if (actionScope != null) {`
`85`	`86`	`actionScope.end(throwable);`
`86`	`87`	`}`