From 4229fe57ea6fd5ceee5d7224b5bc48183d568e7a Mon Sep 17 00:00:00 2001
From: gongdewei <kylixs@qq.com>
Date: Thu, 12 Aug 2021 15:14:38 +0800
Subject: [PATCH] add request/response debug log

---
 .../src/main/resources/application.properties |  4 ++++
 .../server/grpc/ArthasServiceGrpcImpl.java    | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/channel/channel-server-app/src/main/resources/application.properties b/channel/channel-server-app/src/main/resources/application.properties
index a02d6d6f9..96d0eef03 100755
--- a/channel/channel-server-app/src/main/resources/application.properties
+++ b/channel/channel-server-app/src/main/resources/application.properties
@@ -45,3 +45,7 @@ spring.jackson.default-property-inclusion = NON_NULL
 spring.profiles.active=memory
 #spring.profiles.active=redis
 
+
+# logger
+# open request/response debug log
+#logging.level.com.alibaba.arthas.channel.server.grpc=DEBUG
diff --git a/channel/channel-server/src/main/java/com/alibaba/arthas/channel/server/grpc/ArthasServiceGrpcImpl.java b/channel/channel-server/src/main/java/com/alibaba/arthas/channel/server/grpc/ArthasServiceGrpcImpl.java
index fac93f0a4..2c1bf1f41 100644
--- a/channel/channel-server/src/main/java/com/alibaba/arthas/channel/server/grpc/ArthasServiceGrpcImpl.java
+++ b/channel/channel-server/src/main/java/com/alibaba/arthas/channel/server/grpc/ArthasServiceGrpcImpl.java
@@ -79,15 +79,18 @@ public class ArthasServiceGrpcImpl extends ArthasServiceGrpc.ArthasServiceImplBa
                     try {
                         actionRequest = ActionRequest.parseFrom(messageBytes);
                     } catch (Throwable e) {
-                        logger.error("parse action request message failure", e);
+                        logger.error("parse request message failure", e);
                         return true;
                     }
 
                     try {
                         responseObserver.onNext(actionRequest);
+                        if (logger.isDebugEnabled()) {
+                            logger.debug("sent request to agent, agentId: {}, request: {}", agentId, actionRequest);
+                        }
                         return true;
                     } catch (Throwable e) {
-                        logger.error("send action request message to arthas agent failure", e);
+                        logger.error("send request message to arthas agent failure", e);
                         //TODO 如何通知请求来源方发送请求失败？通知打开的WebConsole
                         agentBizSerivce.compareAndUpdateAgentStatus(agentId, AgentStatus.IN_SERVICE, AgentStatus.OUT_OF_SERVICE);
                         //responseObserver.onError(e);
@@ -123,20 +126,24 @@ public class ArthasServiceGrpcImpl extends ArthasServiceGrpc.ArthasServiceImplBa
                 GeneralResult.Builder resultBuilder = GeneralResult.newBuilder();
                 ActionResponseTopic responseTopic = new ActionResponseTopic(agentId, actionResponse.getRequestId());
 
+                if (logger.isDebugEnabled()) {
+                    logger.debug("receive response from agent, agentId:{}, response: {}", agentId, actionResponse);
+                }
+
                 try {
                     messageExchangeService.pushMessage(responseTopic, messageBytes);
                     resultBuilder.setStatus(0);
                 } catch (Throwable e) {
                     resultBuilder
                             .setStatus(1000)
-                            .setMessage("push message failure");
-                    logger.error("push action response message failure: "+responseTopic, e);
+                            .setMessage("push response message failure");
+                    logger.error("push response message failure: "+responseTopic, e);
                 }
 
                 try {
                     responseObserver.onNext(resultBuilder.build());
                 } catch (Throwable e) {
-                    logger.error("send response result failure", e);
+                    logger.error("send response ack result failure", e);
                     responseObserver.onError(e);
                     //TODO 通知网络链路异常
                 }
@@ -145,11 +152,13 @@ public class ArthasServiceGrpcImpl extends ArthasServiceGrpc.ArthasServiceImplBa
             @Override
             public void onError(Throwable t) {
                 //TODO 通知网络链路异常
+                logger.error("An error occurred in submit response stream", t);
             }
 
             @Override
             public void onCompleted() {
                 //TODO 通知网络链路异常
+                logger.error("submit response stream has completed");
             }
         };
     }