Fix thrift plugin generate duplicate traceid (#467)

zhaoxiaojie0415 · web-flow · commit f04866cf240a · 2023-03-05T18:10:42.000+08:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -19,6 +19,7 @@ Release Notes.
 * Fix servicecomb plugin trace break.
 * Adapt Armeria's plugins to the latest version 1.22.x
 * Fix tomcat-10x-plugin and add test case to support tomcat7.x-8.x-9.x.
+* Fix thrift plugin generate duplicate traceid when `sendBase` error occurs
 
 #### Documentation
 * Update docs of Tracing APIs, reorganize the API docs into six parts.
diff --git a/apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/client/TServiceClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/client/TServiceClientInterceptor.java
@@ -92,6 +92,7 @@ public void handleMethodException(EnhancedInstance objInst,
                                       Class<?>[] argumentsTypes,
                                       Throwable t) {
         ContextManager.activeSpan().log(t);
+        ContextManager.stopSpan();
     }
 
     private String getArguments(String method, TBase base) {

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public void handleMethodException(EnhancedInstance objInst,`
`92`	`92`	`Class<?>[] argumentsTypes,`
`93`	`93`	`Throwable t) {`
`94`	`94`	`ContextManager.activeSpan().log(t);`
	`95`	`+ ContextManager.stopSpan();`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`private String getArguments(String method, TBase base) {`