From bf0dc31134b4e0fca9063c7d07ed7fcdf1868dc1 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Mon, 13 Oct 2014 18:58:07 +0900 Subject: [PATCH] [#26] fix testcase, findbugs warnings --- .../cluster/zookeeper/ZookeeperWebClusterManager.java | 2 +- .../com/navercorp/pinpoint/profiler/DefaultAgent.java | 8 ++++---- .../{HeartBitChecker.java => HeartBeatChecker.java} | 6 +++--- .../modifier/tomcat/StandardServiceModifier.java | 6 ++++-- .../profiler/modifier/tomcat/WebappLoaderModifier.java | 6 ++++-- ...rtBitCheckerTest.java => HeartBeatCheckerTest.java} | 10 +++++----- .../pinpoint/profiler/HeartBitCheckerStressTest.java | 4 ++-- .../db/mysql/MySQLConnectionImplModifierTest.java | 4 +++- 8 files changed, 26 insertions(+), 20 deletions(-) rename profiler/src/main/java/com/navercorp/pinpoint/profiler/{HeartBitChecker.java => HeartBeatChecker.java} (96%) rename profiler/src/test/java/com/navercorp/pinpoint/profiler/{HeartBitCheckerTest.java => HeartBeatCheckerTest.java} (94%) diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperWebClusterManager.java b/collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperWebClusterManager.java index cb53b6c57..e8261115e 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperWebClusterManager.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperWebClusterManager.java @@ -216,7 +216,7 @@ public class ZookeeperWebClusterManager implements Runnable { } } - class StopTask implements Task { + static class StopTask implements Task { } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java index 25ca7afca..471c6d614 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java @@ -87,7 +87,7 @@ public class DefaultAgent implements Agent { // agent의 상태, private volatile AgentStatus agentStatus; - private HeartBitChecker heartBitChecker; + private HeartBeatChecker heartBeatChecker; static { // rpc쪽 preload @@ -145,7 +145,7 @@ public class DefaultAgent implements Agent { this.traceContext = createTraceContext(agentInformation.getServerType()); - this.heartBitChecker = new HeartBitChecker(tcpDataSender, profilerConfig.getHeartbeatInterval(), tAgentInfo); + this.heartBeatChecker = new HeartBeatChecker(tcpDataSender, profilerConfig.getHeartbeatInterval(), tAgentInfo); // JVM 통계 등을 주기적으로 수집하여 collector에 전송하는 monitor를 초기화한다. this.agentStatMonitor = new AgentStatMonitor(this.statDataSender, this.agentInformation.getAgentId(), this.agentInformation.getStartTime()); @@ -369,7 +369,7 @@ public class DefaultAgent implements Agent { logger.info("Starting {} Agent.", ProductInfo.CAMEL_NAME); ServerMetaData serverMetaData = this.traceContext.getServerMetaDataHolder().getServerMetaData(); logger.debug(serverMetaData.toString()); - this.heartBitChecker.start(); + this.heartBeatChecker.start(); this.agentStatMonitor.start(); } @@ -385,7 +385,7 @@ public class DefaultAgent implements Agent { } logger.info("Stopping {} Agent.", ProductInfo.CAMEL_NAME); - this.heartBitChecker.stop(); + this.heartBeatChecker.stop(); tAgentInfo.setEndStatus(0); tAgentInfo.setEndTimestamp(System.currentTimeMillis()); diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBitChecker.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBeatChecker.java similarity index 96% rename from profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBitChecker.java rename to profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBeatChecker.java index 56079a71e..b99760273 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBitChecker.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/HeartBeatChecker.java @@ -18,8 +18,8 @@ import com.nhn.pinpoint.thrift.dto.TAgentInfo; * @author emeroad * @author koo.taejin */ -public class HeartBitChecker { - private static final Logger LOGGER = LoggerFactory.getLogger(HeartBitChecker.class); +public class HeartBeatChecker { + private static final Logger LOGGER = LoggerFactory.getLogger(HeartBeatChecker.class); private static final ThreadFactory THREAD_FACTORY = new PinpointThreadFactory("Pinpoint-Agent-Heartbeat-Thread", true); @@ -34,7 +34,7 @@ public class HeartBitChecker { private Thread ioThread; - public HeartBitChecker(EnhancedDataSender dataSender, long heartBitInterVal, TAgentInfo agentInfo) { + public HeartBeatChecker(EnhancedDataSender dataSender, long heartBitInterVal, TAgentInfo agentInfo) { if (dataSender == null) { throw new NullPointerException("dataSender must not be null"); } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/StandardServiceModifier.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/StandardServiceModifier.java index 6e44f0396..1e5eb16da 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/StandardServiceModifier.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/StandardServiceModifier.java @@ -44,14 +44,16 @@ public class StandardServiceModifier extends AbstractModifier { boolean isHooked = false; // Tomcat 6 - org.apache.catalina.core.StandardService.start(), stop() - if (isHooked = (standardService.hasDeclaredMethod("start", null) && standardService.hasDeclaredMethod("stop", null))) { + if (standardService.hasDeclaredMethod("start", null) && standardService.hasDeclaredMethod("stop", null)) { standardService.addInterceptor("start", null, standardServiceStartInterceptor); standardService.addInterceptor("stop", null, standardServiceStopInterceptor); + isHooked = true; } // Tomcat 7, 8 - org.apache.catalina.core.StandardService.startInternal(), stopInternal() - else if (isHooked = (standardService.hasDeclaredMethod("startInternal", null) && standardService.hasDeclaredMethod("stopInternal", null))) { + else if (standardService.hasDeclaredMethod("startInternal", null) && standardService.hasDeclaredMethod("stopInternal", null)) { standardService.addInterceptor("startInternal", null, standardServiceStartInterceptor); standardService.addInterceptor("stopInternal", null, standardServiceStopInterceptor); + isHooked = true; } if (isHooked) { diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/WebappLoaderModifier.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/WebappLoaderModifier.java index 62cb49459..9cc551795 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/WebappLoaderModifier.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/WebappLoaderModifier.java @@ -38,12 +38,14 @@ public class WebappLoaderModifier extends AbstractModifier { boolean isHooked = false; // Tomcat 6 - org.apache.catalina.loader.WebappLoader.start() - if (isHooked = webappLoader.hasDeclaredMethod("start", null)) { + if (webappLoader.hasDeclaredMethod("start", null)) { webappLoader.addInterceptor("start", null, webappLoaderStartInterceptor); + isHooked = true; } // Tomcat 7, 8 - org.apache.catalina.loader.WebappLoader.startInternal() - else if (isHooked = webappLoader.hasDeclaredMethod("startInternal", null)) { + else if (webappLoader.hasDeclaredMethod("startInternal", null)) { webappLoader.addInterceptor("startInternal", null, webappLoaderStartInterceptor); + isHooked = true; } if (isHooked) { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBeatCheckerTest.java similarity index 94% rename from profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerTest.java rename to profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBeatCheckerTest.java index 8fe98319c..d60c446fe 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBeatCheckerTest.java @@ -30,7 +30,7 @@ import com.nhn.pinpoint.thrift.dto.TResult; import com.nhn.pinpoint.thrift.io.HeaderTBaseSerializer; import com.nhn.pinpoint.thrift.io.HeaderTBaseSerializerFactory; -public class HeartBitCheckerTest { +public class HeartBeatCheckerTest { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -50,7 +50,7 @@ public class HeartBitCheckerTest { PinpointSocket socket = createPinpointSocket(HOST, PORT, socketFactory); TcpDataSender sender = new TcpDataSender(socket); - HeartBitChecker checker = new HeartBitChecker(sender, 1000L, getAgentInfo()); + HeartBeatChecker checker = new HeartBeatChecker(sender, 1000L, getAgentInfo()); try { checker.start(); @@ -76,7 +76,7 @@ public class HeartBitCheckerTest { PinpointSocket socket = createPinpointSocket(HOST, PORT, socketFactory); TcpDataSender sender = new TcpDataSender(socket); - HeartBitChecker checker = new HeartBitChecker(sender, 1000L, getAgentInfo()); + HeartBeatChecker checker = new HeartBeatChecker(sender, 1000L, getAgentInfo()); try { checker.start(); @@ -101,7 +101,7 @@ public class HeartBitCheckerTest { PinpointSocket socket = createPinpointSocket(HOST, PORT, socketFactory); TcpDataSender sender = new TcpDataSender(socket); - HeartBitChecker checker = new HeartBitChecker(sender, 1000L, getAgentInfo()); + HeartBeatChecker checker = new HeartBeatChecker(sender, 1000L, getAgentInfo()); try { checker.start(); @@ -140,7 +140,7 @@ public class HeartBitCheckerTest { } } - private void closeAll(PinpointServerSocket server, HeartBitChecker checker, PinpointSocket socket, PinpointSocketFactory factory) { + private void closeAll(PinpointServerSocket server, HeartBeatChecker checker, PinpointSocket socket, PinpointSocketFactory factory) { if (server != null) { server.close(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerStressTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerStressTest.java index 718bbdd50..82b663bdc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerStressTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/HeartBitCheckerStressTest.java @@ -47,7 +47,7 @@ public class HeartBitCheckerStressTest { PinpointSocket socket = createPinpointSocket(HOST, PORT, socketFactory); TcpDataSender sender = new TcpDataSender(socket); - HeartBitChecker checker = new HeartBitChecker(sender, 1000L, getAgentInfo()); + HeartBeatChecker checker = new HeartBeatChecker(sender, 1000L, getAgentInfo()); long strarTime = System.currentTimeMillis(); @@ -99,7 +99,7 @@ public class HeartBitCheckerStressTest { } } - private void closeAll(PinpointServerSocket server, HeartBitChecker checker) { + private void closeAll(PinpointServerSocket server, HeartBeatChecker checker) { if (server != null) { server.close(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java index 7c117de54..d4ad7c351 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java @@ -8,6 +8,7 @@ import com.nhn.pinpoint.common.util.PropertyUtils; import com.nhn.pinpoint.profiler.junit4.BasePinpointTest; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,9 +70,10 @@ public class MySQLConnectionImplModifierTest extends BasePinpointTest { return driver.connect(url, properties); } + @Ignore @Test public void loadBalancedUrlModify() throws Exception { - + // random fail Connection connection = connectDB(db.getProperty("mysql.url.loadbalance")); logger.info("Connection class name:{}", connection.getClass().getName());