[pinpoint-apm#10437] Update mark error of spring tx plugin

jaehong-kim · Oct 26, 2023 · c878a9b · c878a9b
1 parent 091d898
commit c878a9b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/agent/src/main/resources/profiles/local/pinpoint.config b/agent/src/main/resources/profiles/local/pinpoint.config
@@ -1093,6 +1093,7 @@ profiler.spring.webmvc.enable=true
 # Spring Transaction Management
 ###########################################################
 profiler.spring.tx.enable=true
+profiler.spring.tx.mark.error=false
 
 ###########################################################
 # Reactor

diff --git a/agent/src/main/resources/profiles/release/pinpoint.config b/agent/src/main/resources/profiles/release/pinpoint.config
@@ -1091,6 +1091,7 @@ profiler.spring.webmvc.enable=true
 # Spring Transaction Management
 ###########################################################
 profiler.spring.tx.enable=true
+profiler.spring.tx.mark.error=false
 
 ###########################################################
 # Reactor

diff --git a/plugins/spring-tx/src/main/java/com/navercorp/pinpoint/plugin/spring/tx/SpringTxConfig.java b/plugins/spring-tx/src/main/java/com/navercorp/pinpoint/plugin/spring/tx/SpringTxConfig.java
@@ -20,12 +20,26 @@
 
 public class SpringTxConfig {
     private final boolean enabled;
+    private final boolean markError;
 
     public SpringTxConfig(ProfilerConfig config) {
         this.enabled = config.readBoolean("profiler.spring.tx.enable", true);
+        this.markError = config.readBoolean("profiler.spring.tx.mark.error", false);
     }
 
     public boolean isEnabled() {
         return enabled;
     }
+
+    public boolean isMarkError() {
+        return markError;
+    }
+
+    @Override
+    public String toString() {
+        return "SpringTxConfig{" +
+                "enabled=" + enabled +
+                ", markError=" + markError +
+                '}';
+    }
 }
diff --git a/...avercorp/pinpoint/plugin/spring/tx/interceptor/ReactiveTransactionSupportInterceptor.java b/...avercorp/pinpoint/plugin/spring/tx/interceptor/ReactiveTransactionSupportInterceptor.java
@@ -22,12 +22,17 @@
 import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
 import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.SpanEventSimpleAroundInterceptorForPlugin;
+import com.navercorp.pinpoint.plugin.spring.tx.SpringTxConfig;
 import com.navercorp.pinpoint.plugin.spring.tx.SpringTxConstants;
 
 public class ReactiveTransactionSupportInterceptor extends SpanEventSimpleAroundInterceptorForPlugin {
 
+    private final boolean markError;
+
     public ReactiveTransactionSupportInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {
         super(traceContext, methodDescriptor);
+        final SpringTxConfig config = new SpringTxConfig(traceContext.getProfilerConfig());
+        this.markError = config.isMarkError();
     }
 
     @Override
@@ -37,7 +42,7 @@ public void doInBeforeTrace(SpanEventRecorder recorder, Object target, Object[]
     @Override
     public void doInAfterTrace(SpanEventRecorder recorder, Object target, Object[] args, Object result, Throwable throwable) throws Exception {
         recorder.recordServiceType(SpringTxConstants.SPRING_TX);
-        recorder.recordException(throwable);
+        recorder.recordException(markError, throwable);
         recorder.recordApi(methodDescriptor);
 
         if (throwable != null) {

diff --git a/.../navercorp/pinpoint/plugin/spring/tx/interceptor/TransactionAspectSupportInterceptor.java b/.../navercorp/pinpoint/plugin/spring/tx/interceptor/TransactionAspectSupportInterceptor.java
@@ -20,22 +20,27 @@
 import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
 import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.SpanEventSimpleAroundInterceptorForPlugin;
+import com.navercorp.pinpoint.plugin.spring.tx.SpringTxConfig;
 import com.navercorp.pinpoint.plugin.spring.tx.SpringTxConstants;
 
 public class TransactionAspectSupportInterceptor extends SpanEventSimpleAroundInterceptorForPlugin {
+
+    private final boolean markError;
+
     public TransactionAspectSupportInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {
         super(traceContext, methodDescriptor);
+        final SpringTxConfig config = new SpringTxConfig(traceContext.getProfilerConfig());
+        this.markError = config.isMarkError();
     }
 
     @Override
     public void doInBeforeTrace(SpanEventRecorder recorder, Object target, Object[] args) throws Exception {
-
     }
 
     @Override
     public void doInAfterTrace(SpanEventRecorder recorder, Object target, Object[] args, Object result, Throwable throwable) throws Exception {
         recorder.recordServiceType(SpringTxConstants.SPRING_TX);
-        recorder.recordException(throwable);
+        recorder.recordException(markError, throwable);
         recorder.recordApi(methodDescriptor);
     }
 }