From 815a47769cfe5aeae0fcbf1c74fd2b48c1a772d9 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Wed, 6 Sep 2017 21:38:43 +0800
Subject: [PATCH] Adjust log of SegmentServiceClient, close #396

---
 .../core/remote/GRPCStreamServiceStatus.java  |  3 +-
 .../remote/TraceSegmentServiceClient.java     | 31 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java
index 03150151c8..4801837db2 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java
@@ -21,7 +21,7 @@ public class GRPCStreamServiceStatus {
     /**
      * @param maxTimeout max wait time, milliseconds.
      */
-    public void wait4Finish(long maxTimeout) {
+    public boolean wait4Finish(long maxTimeout) {
         long time = 0;
         while (!status) {
             if (time > maxTimeout) {
@@ -30,6 +30,7 @@ public class GRPCStreamServiceStatus {
             try2Sleep(5);
             time += 5;
         }
+        return status;
     }
 
     /**
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
index 288fa7e4f7..724b440a3a 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
@@ -28,6 +28,9 @@ public class TraceSegmentServiceClient implements BootService, IConsumer<TraceSe
     private static final ILog logger = LogManager.getLogger(TraceSegmentServiceClient.class);
     private static final int TIMEOUT = 30 * 1000;
 
+    private long lastLogTime;
+    private long segmentUplinkedCounter;
+    private long segmentAbandonedCounter;
     private volatile DataCarrier<TraceSegment> carrier;
     private volatile TraceSegmentServiceGrpc.TraceSegmentServiceStub serviceStub;
     private volatile GRPCChannelStatus status = GRPCChannelStatus.DISCONNECT;
@@ -39,6 +42,9 @@ public class TraceSegmentServiceClient implements BootService, IConsumer<TraceSe
 
     @Override
     public void boot() throws Throwable {
+        lastLogTime = System.currentTimeMillis();
+        segmentUplinkedCounter = 0;
+        segmentAbandonedCounter = 0;
         carrier = new DataCarrier<TraceSegment>(CHANNEL_SIZE, BUFFER_SIZE);
         carrier.setBufferStrategy(BufferStrategy.IF_POSSIBLE);
         carrier.consume(this, 1);
@@ -94,14 +100,27 @@ public class TraceSegmentServiceClient implements BootService, IConsumer<TraceSe
             }
             upstreamSegmentStreamObserver.onCompleted();
 
-            status.wait4Finish(TIMEOUT);
-
-            if (logger.isDebugEnable()) {
-                logger.debug("{} trace segments have been sent to collector.", data.size());
+            if (status.wait4Finish(TIMEOUT)) {
+                segmentUplinkedCounter += data.size();
             }
         } else {
-            if (logger.isDebugEnable()) {
-                logger.debug("{} trace segments have been abandoned, cause by no available channel.", data.size());
+            segmentAbandonedCounter += data.size();
+        }
+
+        printUplinkStatus();
+    }
+
+    private void printUplinkStatus() {
+        long currentTimeMillis = System.currentTimeMillis();
+        if (lastLogTime - currentTimeMillis > 30 * 1000) {
+            lastLogTime = currentTimeMillis;
+            if (segmentUplinkedCounter > 0) {
+                logger.debug("{} trace segments have been sent to collector.", segmentUplinkedCounter);
+                segmentUplinkedCounter = 0;
+            }
+            if (segmentAbandonedCounter > 0) {
+                logger.debug("{} trace segments have been abandoned, cause by no available channel.", segmentAbandonedCounter);
+                segmentAbandonedCounter = 0;
             }
         }
     }
-- 
GitLab