[ISSUE #9377]fix 'send trace data can fail if shutdown producer immediately'

Author: kingkh1995

client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java

@@ -31,6 +31,7 @@
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.topic.TopicValidator;
+import org.apache.rocketmq.common.utils.ThreadUtils;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
 import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
 import org.apache.rocketmq.remoting.RPCHook;
@@ -55,6 +56,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher {
     private static final Logger log = LoggerFactory.getLogger(AsyncTraceDispatcher.class);
     private static final AtomicInteger COUNTER = new AtomicInteger();
     private static final AtomicInteger INSTANCE_NUM = new AtomicInteger(0);
+    private static final long WAIT_FOR_SHUTDOWN = 5000L;
     private volatile boolean stopped = false;
     private final int traceInstanceId = INSTANCE_NUM.getAndIncrement();
     private final int batchNum;
@@ -191,23 +193,19 @@ public boolean append(final Object ctx) {
 
     @Override
     public void flush() {
-        long end = System.currentTimeMillis() + 500;
-        while (traceContextQueue.size() > 0 || appenderQueue.size() > 0 && System.currentTimeMillis() <= end) {
+        while (traceContextQueue.size() > 0) {
             try {
                 flushTraceContext(true);
             } catch (Throwable throwable) {
                 log.error("flushTraceContext error", throwable);
             }
         }
-        if (appenderQueue.size() > 0) {
-            log.error("There are still some traces that haven't been sent " + traceContextQueue.size() + "   " + appenderQueue.size());
-        }
     }
 
     @Override
     public void shutdown() {
         flush();
-        this.traceExecutor.shutdown();
+        ThreadUtils.shutdownGracefully(this.traceExecutor, WAIT_FOR_SHUTDOWN, TimeUnit.MILLISECONDS);
         if (isStarted.get()) {
             traceProducer.shutdown();
         }