diff --git a/CHANGES.md b/CHANGES.md index 3fbe3a897..3e7f719c0 100644 --- 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 index b9a32166f..b6b32212f 100644 --- 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 class TServiceClientInterceptor implements InstanceConstructorInterceptor Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().log(t); + ContextManager.stopSpan(); } private String getArguments(String method, TBase base) {