fixed tracing bug.

Author: ujued

txlcn-tc/src/main/java/com/codingapi/txlcn/tc/core/transaction/tcc/control/TccTransactionCleanService.java

@@ -59,14 +59,17 @@ public TccTransactionCleanService(ApplicationContext applicationContext,
     @Override
     public void clear(String groupId, int state, String unitId, String unitType) throws TransactionClearException {
         Method exeMethod;
+        boolean shouldDestroy = !TracingContext.tracing().hasGroup();
         try {
             TccTransactionInfo tccInfo = globalContext.tccTransactionInfo(unitId, null);
             Object object = applicationContext.getBean(tccInfo.getExecuteClass());
             // 将要移除。
             if (Objects.isNull(DTXLocalContext.cur())) {
                 DTXLocalContext.getOrNew().setJustNow(true);
             }
-            TracingContext.init(Maps.of(TracingConstants.GROUP_ID, groupId, TracingConstants.APP_MAP, "{}"));
+            if (shouldDestroy) {
+                TracingContext.init(Maps.of(TracingConstants.GROUP_ID, groupId, TracingConstants.APP_MAP, "{}"));
+            }
             DTXLocalContext.getOrNew().setGroupId(groupId);
             DTXLocalContext.cur().setUnitId(unitId);
             exeMethod = tccInfo.getExecuteClass().getMethod(
@@ -85,7 +88,9 @@ public void clear(String groupId, int state, String unitId, String unitType) thr
             if (DTXLocalContext.cur().isJustNow()) {
                 DTXLocalContext.makeNeverAppeared();
             }
-            TracingContext.tracing().destroy();
+            if (shouldDestroy) {
+                TracingContext.tracing().destroy();
+            }
         }
     }
 }

txlcn-tracing/src/main/java/com/codingapi/txlcn/tracing/TracingContext.java

@@ -20,11 +20,8 @@
 import com.codingapi.txlcn.common.util.Maps;
 import com.codingapi.txlcn.common.util.id.RandomUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -56,8 +53,6 @@ public static TracingContext tracing() {
 
     private Map<String, String> fields;
 
-    private boolean destroy;
-
     public void beginTransactionGroup() {
         if (hasGroup()) {
             return;
@@ -75,7 +70,6 @@ public static void init(Map<String, String> initFields) {
         TracingContext tracingContext = tracing();
         if (Objects.isNull(tracingContext.fields)) {
             tracingContext.fields = new HashMap<>();
-            tracingContext.destroy = true;
         }
         tracingContext.fields.putAll(initFields);
     }
@@ -160,9 +154,7 @@ public String appMapString() {
      */
     public void destroy() {
         if (Objects.nonNull(tracingContextThreadLocal.get())) {
-            if (tracingContextThreadLocal.get().destroy) {
-                tracingContextThreadLocal.remove();
-            }
+            tracingContextThreadLocal.remove();
         }
     }