You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/03/05 10:10:49 UTC
[skywalking-java] branch main updated: Fix thrift plugin generate duplicate traceid (#467)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new f04866cf24 Fix thrift plugin generate duplicate traceid (#467)
f04866cf24 is described below
commit f04866cf240ace47fa039fd5b0f548f68fb7bee6
Author: DarkerEcho <zh...@126.com>
AuthorDate: Sun Mar 5 18:10:42 2023 +0800
Fix thrift plugin generate duplicate traceid (#467)
---
CHANGES.md | 1 +
.../skywalking/apm/plugin/thrift/client/TServiceClientInterceptor.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 3fbe3a8971..3e7f719c0e 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 b9a32166fc..b6b32212f2 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) {