优化traces

src/main/java/org/redkale/mq/HttpMessageClientProcessor.java

@@ -90,7 +90,7 @@ public class HttpMessageClientProcessor implements MessageClientProcessor {
     private void execute(final MessageRecord message, final Runnable callback) {
         HttpMessageRequest request = null;
         try {
-            Traces.currentTraceid(message.getTraceid());
+            Traces.computeIfAbsent(message.getTraceid());
             long now = System.currentTimeMillis();
             long cha = now - message.createTime;
             long e = now - startTime;

src/main/java/org/redkale/mq/SncpMessageClientProcessor.java

@@ -69,7 +69,7 @@ public class SncpMessageClientProcessor implements MessageClientProcessor {
     private void execute(final MessageRecord message, final Runnable callback) {
         SncpMessageResponse response = null;
         try {
-            Traces.currentTraceid(message.getTraceid());
+            Traces.computeIfAbsent(message.getTraceid());
             long now = System.currentTimeMillis();
             long cha = now - message.createTime;
             long e = now - starttime;

src/main/java/org/redkale/net/Context.java

@@ -103,7 +103,8 @@ public class Context {
         this.bsonFactory = BsonFactory.root();
     }
 
-    protected void executeDispatch(Request request, Response response) {
+    protected final void executeDispatch(Request request, Response response) {
+        request.traceid = Traces.computeIfAbsent(request.getTraceid());
         dispatcher.dispatch(request, response);
     }
 
@@ -112,7 +113,7 @@ public class Context {
             response.updateNonBlocking(false);
             workExecutor.execute(() -> {
                 try {
-                    Traces.computeCurrTraceid(request.getTraceid());
+                    request.traceid = Traces.computeIfAbsent(request.getTraceid());
                     servlet.execute(request, response);
                 } catch (Throwable t) {
                     response.context.logger.log(Level.WARNING, "Execute servlet occur exception. request = " + request, t);
@@ -121,7 +122,7 @@ public class Context {
             });
         } else {
             try {
-                Traces.computeCurrTraceid(request.getTraceid());
+                request.traceid = Traces.computeIfAbsent(request.getTraceid());
                 servlet.execute(request, response);
             } catch (Throwable t) {
                 response.context.logger.log(Level.WARNING, "Execute servlet occur exception. request = " + request, t);

src/main/java/org/redkale/net/DispatcherServlet.java

@@ -13,7 +13,7 @@ import java.util.function.*;
 import java.util.logging.Level;
 import java.util.stream.Stream;
 import org.redkale.boot.Application;
-import org.redkale.util.*;
+import org.redkale.util.AnyValue;
 
 /**
  * 根Servlet， 一个Server只能存在一个根Servlet
@@ -291,7 +291,6 @@ public abstract class DispatcherServlet<K extends Serializable, C extends Contex
 
     public final void dispatch(final R request, final P response) {
         try {
-            Traces.computeCurrTraceid(request.getTraceid());
             request.prepare();
             response.filter = this.headFilter;
             response.servlet = this;

src/main/java/org/redkale/net/client/ClientCodec.java

@@ -125,17 +125,17 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
                 if (exc != null) {
                     if (workThread.getState() == Thread.State.RUNNABLE) { //fullCache时state不是RUNNABLE
                         if (workThread.inIO()) {
-                            Traces.currentTraceid(request.traceid);
+                            Traces.computeIfAbsent(request.traceid);
                             respFuture.completeExceptionally(exc);
                         } else {
                             workThread.execute(() -> {
-                                Traces.currentTraceid(request.traceid);
+                                Traces.computeIfAbsent(request.traceid);
                                 respFuture.completeExceptionally(exc);
                             });
                         }
                     } else {
                         workThread.runWork(() -> {
-                            Traces.currentTraceid(request.traceid);
+                            Traces.computeIfAbsent(request.traceid);
                             respFuture.completeExceptionally(exc);
                         });
                     }
@@ -143,17 +143,17 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
                     final P rs = request.respTransfer == null ? message : (P) request.respTransfer.apply(message);
                     if (workThread.getState() == Thread.State.RUNNABLE) { //fullCache时state不是RUNNABLE
                         if (workThread.inIO()) {
-                            Traces.currentTraceid(request.traceid);
+                            Traces.computeIfAbsent(request.traceid);
                             respFuture.complete(rs);
                         } else {
                             workThread.execute(() -> {
-                                Traces.currentTraceid(request.traceid);
+                                Traces.computeIfAbsent(request.traceid);
                                 respFuture.complete(rs);
                             });
                         }
                     } else {
                         workThread.runWork(() -> {
-                            Traces.currentTraceid(request.traceid);
+                            Traces.computeIfAbsent(request.traceid);
                             respFuture.complete(rs);
                         });
                     }
@@ -161,17 +161,17 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
             } catch (Throwable t) {
                 if (workThread.getState() == Thread.State.RUNNABLE) { //fullCache时state不是RUNNABLE
                     if (workThread.inIO()) {
-                        Traces.currentTraceid(request.traceid);
+                        Traces.computeIfAbsent(request.traceid);
                         respFuture.completeExceptionally(t);
                     } else {
                         workThread.execute(() -> {
-                            Traces.currentTraceid(request.traceid);
+                            Traces.computeIfAbsent(request.traceid);
                             respFuture.completeExceptionally(t);
                         });
                     }
                 } else {
                     workThread.runWork(() -> {
-                        Traces.currentTraceid(request.traceid);
+                        Traces.computeIfAbsent(request.traceid);
                         respFuture.completeExceptionally(t);
                     });
                 }

src/main/java/org/redkale/util/Traces.java

@@ -30,33 +30,20 @@ public class Traces {
         return enable ? tidSupplier.get() : null;
     }
 
-    public static void computeCurrTraceid(String requestTraceid) {
-        if (enable) {
-            if (requestTraceid == null) {
-                localTrace.set(tidSupplier.get());
-            } else {
-                localTrace.set(requestTraceid);
-            }
-        }
-    }
-
-//    public static String loadTraceid() {
-//        if (!enable) return null;
-//        String traceid = localTrace.get();
-//        if (traceid == null) {
-//            traceid = tidSupplier.get();
-//            localTrace.set(traceid);
-//        }
-//        return traceid;
-//    }
-    public static void currentTraceid(String traceid) {
-        if (enable) {
-            localTrace.set(traceid);
-        }
-    }
-
     public static String currentTraceid() {
         return enable ? localTrace.get() : null;
     }
 
+    public static String computeIfAbsent(String requestTraceid) {
+        if (enable) {
+            String rs = requestTraceid;
+            if (rs == null || rs.isEmpty()) {
+                rs = tidSupplier.get();
+            }
+            localTrace.set(rs);
+            return rs;
+        }
+        return requestTraceid;
+    }
+
 }