From 8574f3c916367f8c3d03e1a0e397b2ca771831b1 Mon Sep 17 00:00:00 2001
From: Jaehong-Kim <jaehong.kim@navercorp.com>
Date: Tue, 5 Dec 2023 17:45:13 +0900
Subject: [PATCH] [#noissue] Update agentInfo error log format

---
 .../pinpoint/profiler/AgentInfoSender.java    | 31 +++++++++++++------
 .../profiler/DefaultAgentInformation.java     |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/AgentInfoSender.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/AgentInfoSender.java
index a826a129a618..74e232cb1693 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/AgentInfoSender.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/AgentInfoSender.java
@@ -174,35 +174,48 @@ public void run() {
         }
 
         private boolean sendAgentInfo() {
+            AgentInfo agentInfo = null;
             try {
-                AgentInfo agentInfo = agentInfoFactory.createAgentInfo();
+                agentInfo = agentInfoFactory.createAgentInfo();
 
-                logger.info("Sending AgentInfo {}", agentInfo);
+                logger.info("Sending AgentInfo={}", agentInfo);
                 ResponseFutureListener<ResponseMessage, Throwable> listener = new ResponseFutureListener<>();
                 dataSender.request(agentInfo, listener);
                 ResponseMessage responseMessage = listener.getResponseFuture().get(3000, TimeUnit.MILLISECONDS);
                 if (responseMessage == null) {
-                    logger.warn("result not set");
+                    if (agentInfo != null && agentInfo.getAgentInformation() != null) {
+                        logger.warn("Failed to send agentInfo={}. result not set", agentInfo.getAgentInformation());
+                    } else {
+                        logger.warn("Failed to send agentInfo. result not set");
+                    }
                     return false;
                 }
                 final ResultResponse result = messageConverter.toMessage(responseMessage);
                 if (!result.isSuccess()) {
-                    logger.warn("request unsuccessful. Cause : {}", result.getMessage());
+                    if (agentInfo != null && agentInfo.getAgentInformation() != null) {
+                        logger.warn("Failed to send agentInfo={}. request unsuccessful, response={}", agentInfo.getAgentInformation(), result.getMessage());
+                    } else {
+                        logger.warn("Failed to send agentInfo. request unsuccessful, response={}", result.getMessage());
+                    }
                 }
                 return result.isSuccess();
             } catch (ExecutionException ex) {
-                logError(ex.getCause());
+                logError(agentInfo, ex.getCause());
             } catch (InterruptedException ex) {
                 Thread.currentThread().interrupt();
-                logError(ex);
+                logError(agentInfo, ex);
             } catch (TimeoutException ex) {
-                logError(ex);
+                logError(agentInfo, ex);
             }
             return false;
         }
 
-        private void logError(Throwable cause) {
-            logger.warn("failed to send agent info", cause);
+        private void logError(AgentInfo agentInfo, Throwable cause) {
+            if (agentInfo != null && agentInfo.getAgentInformation() != null) {
+                logger.warn("Failed to send agentInfo={}", agentInfo.getAgentInformation(), cause);
+            } else {
+                logger.warn("Failed to send agentInfo", cause);
+            }
         }
     }
 
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgentInformation.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgentInformation.java
index 17ef79d6adc1..bb200c5b8a22 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgentInformation.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgentInformation.java
@@ -119,7 +119,7 @@ public String getAgentVersion() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("DefaultAgentInformation{");
+        final StringBuilder sb = new StringBuilder("{");
         sb.append("agentId='").append(agentId).append('\'');
         sb.append(", agentName='").append(agentName).append('\'');
         sb.append(", applicationName='").append(applicationName).append('\'');