[#noissue] Cleanup

collector/src/main/java/com/navercorp/pinpoint/collector/controller/ClusterPointController.java

@@ -16,8 +16,6 @@
 
 package com.navercorp.pinpoint.collector.controller;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
 import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
 import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
@@ -66,12 +64,8 @@
 
     private final ClusterPointLocator<ClusterPoint<?>> clusterPointLocator;
 
-    private final ObjectMapper mapper;
-
-
-    public ClusterPointController(ClusterPointLocator clusterPointLocator, ObjectMapper mapper) {
+    public ClusterPointController(ClusterPointLocator clusterPointLocator) {
         this.clusterPointLocator = Objects.requireNonNull(clusterPointLocator, "clusterPointLocator");
-        this.mapper = Objects.requireNonNull(mapper, "mapper");
     }
 
     @GetMapping(value = "/html/getClusterPoint")
@@ -85,21 +79,20 @@
     }
 
     @GetMapping(value = "/getClusterPoint")
-    public String getClusterPoint(
+    public List<GrpcAgentConnectionStats> getClusterPoint(
             @RequestParam("applicationName") String applicationName,
             @RequestParam(value = "agentId", defaultValue = "") String agentId,
-            @RequestParam(value = "startTimestamp", defaultValue = "-1") long startTimestamp) throws JsonProcessingException {
+            @RequestParam(value = "startTimestamp", defaultValue = "-1") long startTimestamp) {
 
-        List<GrpcAgentConnectionStats> result = getClusterPoint0(applicationName, agentId, startTimestamp);
-        return mapper.writeValueAsString(result);
+        return getClusterPoint0(applicationName, agentId, startTimestamp);
     }
 
     @GetMapping(value = "/checkConnectionStatus")
-    public String checkConnectionStatus(
+    public List<GrpcAgentConnectionStats> checkConnectionStatus(
             @RequestParam("applicationName") String applicationName,
             @RequestParam("agentId") String agentId,
             @RequestParam("startTimestamp") long startTimestamp,
-            @RequestParam(value = "checkCount", defaultValue = "3") int checkCount) throws JsonProcessingException {
+            @RequestParam(value = "checkCount", defaultValue = "3") int checkCount) {
         Assert.isTrue(checkCount > 0, "checkCount must be ' > 0'");
 
         List<GrpcAgentConnection> grpcAgentConnectionList = getGrpcAgentConnectionList(applicationName, agentId, startTimestamp);
@@ -115,7 +108,7 @@
             result.add(new GrpcAgentConnectionStats(grpcAgentConnection, connectionStatusResult));
         }
 
-        return mapper.writeValueAsString(result);
+        return result;
     }
 
     private List<GrpcAgentConnectionStats> getClusterPoint0(final String applicationName, final String agentId, final long startTimestamp) {

commons-server/src/main/java/com/navercorp/pinpoint/common/server/config/RestTemplateConfiguration.java

@@ -17,15 +17,18 @@
 
 package com.navercorp.pinpoint.common.server.config;
 
+import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateBuilderConfigurer;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.Duration;
 
 @Configuration
+@Import(RestTemplateAutoConfiguration.class)
 public class RestTemplateConfiguration {
 
     @Bean

commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/json/JsonRuntimeException.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.navercorp.pinpoint.common.server.util.json;
+
+import org.springframework.core.NestedRuntimeException;
+
+public class JsonRuntimeException extends NestedRuntimeException {
+    public JsonRuntimeException(String msg) {
+        super(msg);
+    }
+
+    public JsonRuntimeException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/common/model/mybatis/TagListTypeHandler.java

@@ -16,8 +16,10 @@
 
 package com.navercorp.pinpoint.metric.common.model.mybatis;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.navercorp.pinpoint.common.server.util.json.Jackson;
+import com.navercorp.pinpoint.common.server.util.json.JsonRuntimeException;
 import com.navercorp.pinpoint.metric.common.model.Tag;
 import com.navercorp.pinpoint.metric.common.model.json.Tags;
 import org.apache.ibatis.type.JdbcType;
@@ -26,7 +28,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -76,19 +77,19 @@
     public String serialize(List<Tag> tagList) {
         try {
             return OBJECT_MAPPER.writeValueAsString(tagList);
-        } catch (IOException e) {
+        } catch (JsonProcessingException e) {
             logger.error("Error serializing List<Tag> : {}", tagList, e);
-            throw new RuntimeException("Error serializing tagList", e);
+            throw new JsonRuntimeException("Error serializing tagList", e);
         }
     }
 
     public List<Tag> deserialize(String tagListJson) {
         try {
             Tags tags = OBJECT_MAPPER.readValue(tagListJson, Tags.class);
             return tags.getTags();
-        } catch (IOException e) {
+        } catch (JsonProcessingException e) {
             logger.error("Error deserializing tagList json : {}", tagListJson, e);
-            throw new RuntimeException("Error deserializing tagListJson", e);
+            throw new JsonRuntimeException("Error deserializing tagListJson", e);
         }
     }
 }

realtime/realtime-web/src/main/java/com/navercorp/pinpoint/web/realtime/activethread/count/websocket/ActiveThreadCountHandlerImpl.java

@@ -21,6 +21,7 @@
 import com.navercorp.pinpoint.web.realtime.activethread.count.service.ActiveThreadCountSession;
 import com.navercorp.pinpoint.web.websocket.ActiveThreadCountHandler;
 import com.navercorp.pinpoint.web.websocket.PinpointWebSocketHandler;
+import com.navercorp.pinpoint.web.websocket.message.PinpointWebSocketMessageConverter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.lang.NonNull;
@@ -42,8 +43,8 @@ class ActiveThreadCountHandlerImpl extends ActiveThreadCountHandler implements P
 
     private final ActiveThreadCountService atcService;
 
-    ActiveThreadCountHandlerImpl(ActiveThreadCountService atcSessionFactory) {
-        super(null);
+    ActiveThreadCountHandlerImpl(PinpointWebSocketMessageConverter converter, ActiveThreadCountService atcSessionFactory) {
+        super(converter, null);
         this.atcService = Objects.requireNonNull(atcSessionFactory, "atcSessionFactory");
     }
 

realtime/realtime-web/src/main/java/com/navercorp/pinpoint/web/realtime/activethread/count/websocket/ActiveThreadCountWebSocketConfig.java

@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.web.realtime.activethread.count.service.ActiveThreadCountWebServiceConfig;
 import com.navercorp.pinpoint.web.realtime.service.RealtimeWebServiceConfig;
 import com.navercorp.pinpoint.web.websocket.PinpointWebSocketHandler;
+import com.navercorp.pinpoint.web.websocket.message.PinpointWebSocketMessageConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -31,8 +32,8 @@
 public class ActiveThreadCountWebSocketConfig {
 
     @Bean
-    PinpointWebSocketHandler redisActiveThreadCountHandler(ActiveThreadCountService atcSessionFactory) {
-        return new ActiveThreadCountHandlerImpl(atcSessionFactory);
+    public PinpointWebSocketHandler redisActiveThreadCountHandler(PinpointWebSocketMessageConverter converter, ActiveThreadCountService atcSessionFactory) {
+        return new ActiveThreadCountHandlerImpl(converter, atcSessionFactory);
     }
 
 }

web/src/main/java/com/navercorp/pinpoint/web/WebSocketConfig.java

@@ -15,6 +15,7 @@
  */
 package com.navercorp.pinpoint.web;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.navercorp.pinpoint.thrift.io.DeserializerFactory;
 import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializer;
 import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializer;
@@ -29,6 +30,7 @@
 import com.navercorp.pinpoint.web.websocket.PinpointWebSocketConfigurer;
 import com.navercorp.pinpoint.web.websocket.PinpointWebSocketHandler;
 import com.navercorp.pinpoint.web.websocket.PinpointWebSocketHandlerManager;
+import com.navercorp.pinpoint.web.websocket.message.PinpointWebSocketMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -47,7 +49,7 @@
 public class WebSocketConfig {
 
     @Bean
-    WebSocketConfigurer webSocketConfigurer(
+    public WebSocketConfigurer webSocketConfigurer(
             PinpointWebSocketHandlerManager handlerRepository,
             ConfigProperties configProperties,
             @Autowired(required = false) WebSocketHandlerDecoratorFactory webSocketHandlerDecoratorFactory,
@@ -62,7 +64,7 @@
     }
 
     @Bean
-    AgentService agentService(
+    public AgentService agentService(
             AgentInfoService agentInfoService,
             ClusterManager clusterManager,
             @Qualifier("commandHeaderTBaseSerializerFactory") SerializerFactory<HeaderTBaseSerializer> commandSerializerFactory,
@@ -77,13 +79,18 @@
     }
 
     @Bean
-    PinpointWebSocketHandler activeThreadHandler(AgentService agentService) {
-        return new ActiveThreadCountHandler("/agent/activeThread", agentService);
+    public PinpointWebSocketHandler activeThreadHandler(PinpointWebSocketMessageConverter converter, AgentService agentService) {
+        return new ActiveThreadCountHandler(converter, "/agent/activeThread", agentService);
     }
 
     @Bean
-    PinpointWebSocketHandlerManager handlerRegister(List<PinpointWebSocketHandler> handlers) {
+    public PinpointWebSocketHandlerManager handlerRegister(List<PinpointWebSocketHandler> handlers) {
         return new PinpointWebSocketHandlerManager(handlers);
     }
 
+    @Bean
+    public PinpointWebSocketMessageConverter pinpointWebSocketMessageConverter(ObjectMapper mapper) {
+        return new PinpointWebSocketMessageConverter(mapper);
+    }
+
 }

web/src/main/java/com/navercorp/pinpoint/web/websocket/ActiveThreadCountHandler.java

@@ -44,6 +44,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -64,7 +65,7 @@
     private final AgentService agentService;
     private final List<WebSocketSession> sessionRepository = new CopyOnWriteArrayList<>();
     private final Map<String, PinpointWebSocketResponseAggregator> aggregatorRepository = new ConcurrentHashMap<>();
-    private final PinpointWebSocketMessageConverter messageConverter = new PinpointWebSocketMessageConverter();
+    private final PinpointWebSocketMessageConverter messageConverter;
 
     private static final String DEFAULT_REQUEST_MAPPING = "/agent/activeThread";
     private final String requestMapping;
@@ -90,19 +91,20 @@
     @Autowired(required = false)
     private TimerTaskDecoratorFactory timerTaskDecoratorFactory = new PinpointWebSocketTimerTaskDecoratorFactory();
 
-    public ActiveThreadCountHandler(AgentService agentService) {
-        this(DEFAULT_REQUEST_MAPPING, agentService);
+    public ActiveThreadCountHandler(PinpointWebSocketMessageConverter converter, AgentService agentService) {
+        this(converter, DEFAULT_REQUEST_MAPPING, agentService);
     }
 
-    public ActiveThreadCountHandler(String requestMapping, AgentService agentService) {
-        this(requestMapping, agentService, DEFAULT_FLUSH_DELAY);
+    public ActiveThreadCountHandler(PinpointWebSocketMessageConverter converter, String requestMapping, AgentService agentService) {
+        this(converter, requestMapping, agentService, DEFAULT_FLUSH_DELAY);
     }
 
-    public ActiveThreadCountHandler(String requestMapping, AgentService agentService, long flushDelay) {
-        this(requestMapping, agentService, flushDelay, DEFAULT_HEALTH_CHECk_DELAY);
+    public ActiveThreadCountHandler(PinpointWebSocketMessageConverter converter, String requestMapping, AgentService agentService, long flushDelay) {
+        this(converter, requestMapping, agentService, flushDelay, DEFAULT_HEALTH_CHECk_DELAY);
     }
 
-    public ActiveThreadCountHandler(String requestMapping, AgentService agentService, long flushDelay, long healthCheckDelay) {
+    public ActiveThreadCountHandler(PinpointWebSocketMessageConverter converter, String requestMapping, AgentService agentService, long flushDelay, long healthCheckDelay) {
+        this.messageConverter = Objects.requireNonNull(converter, "converter");
         this.requestMapping = requestMapping;
         this.agentService = agentService;
         this.flushDelay = flushDelay;
@@ -290,7 +292,7 @@
         PinpointWebSocketResponseAggregator responseAggregator = aggregatorRepository.get(applicationName);
         if (responseAggregator == null) {
             TimerTaskDecorator timerTaskDecorator = timerTaskDecoratorFactory.createTimerTaskDecorator();
-            responseAggregator = new ActiveThreadCountResponseAggregator(applicationName, agentService, reactiveTimer, timerTaskDecorator);
+            responseAggregator = new ActiveThreadCountResponseAggregator(applicationName, agentService, reactiveTimer, timerTaskDecorator, messageConverter);
             responseAggregator.start();
             aggregatorRepository.put(applicationName, responseAggregator);
         }

web/src/main/java/com/navercorp/pinpoint/web/websocket/ActiveThreadCountResponseAggregator.java

@@ -79,14 +79,17 @@ public class ActiveThreadCountResponseAggregator implements PinpointWebSocketRes
 
     private Map<String, AgentActiveThreadCount> activeThreadCountMap = new HashMap<>();
 
-    public ActiveThreadCountResponseAggregator(String applicationName, AgentService agentService, Timer timer, TimerTaskDecorator timerTaskDecorator) {
+    public ActiveThreadCountResponseAggregator(String applicationName,
+                                               AgentService agentService,
+                                               Timer timer,
+                                               TimerTaskDecorator timerTaskDecorator,
+                                               PinpointWebSocketMessageConverter messageConverter) {
         this.applicationName = Objects.requireNonNull(applicationName, "applicationName");
         this.agentService = Objects.requireNonNull(agentService, "agentService");
 
         this.timer = Objects.requireNonNull(timer, "timer");
         this.timerTaskDecorator = Objects.requireNonNull(timerTaskDecorator, "timerTaskDecorator");
-
-        this.messageConverter = new PinpointWebSocketMessageConverter();
+        this.messageConverter = Objects.requireNonNull(messageConverter, "messageConverter");
     }
 
     public int countWebSocketSession() {

web/src/main/java/com/navercorp/pinpoint/web/websocket/message/PingPongMessage.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.navercorp.pinpoint.web.websocket.message;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.navercorp.pinpoint.common.server.util.json.JsonRuntimeException;
+
+import java.util.Objects;
+
+
+public class PingPongMessage {
+
+    private final String ping;
+    private final String pong;
+
+    public static PingPongMessage newMessage(ObjectMapper mapper) {
+        String ping = toJson(mapper, new PingMessage());
+        String pong = toJson(mapper, new PongMessage());
+        return new PingPongMessage(ping, pong);
+    }
+
+    public PingPongMessage(String ping, String pong) {
+        this.ping = Objects.requireNonNull(ping, "ping");
+        this.pong = Objects.requireNonNull(pong, "pong");
+    }
+
+    private static String toJson(ObjectMapper mapper, Object object) {
+        try {
+            return mapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            throw new JsonRuntimeException(object + " message create fail.", e);
+        }
+    }
+
+    public String ping() {
+        return ping;
+    }
+
+    public String pong() {
+        return pong;
+    }
+}