home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 16:56:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

Simplified bootState

Browse Source
This commit is contained in:
Woonduk Kang
2014-12-29 13:59:11 +09:00
parent 4b8ff4994c
commit 38fd2cdf22
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrap.java
+18 -24
View File
@@ -25,6 +25,7 @@ import com.navercorp.pinpoint.common.util.BytesUtils;
import java.lang.instrument.Instrumentation;
import java.net.URL;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -38,11 +39,9 @@ public class PinpointBootStrap {
public static final String BOOT_CLASS = "com.navercorp.pinpoint.profiler.DefaultAgent";
public static final String BOOT_STRAP_LOAD_STATE = "com.navercorp.pinpoint.bootstrap.load.state";
public static final String BOOT_STRAP_LOAD_STATE_LOADING = "LOADING";
public static final String BOOT_STRAP_LOAD_STATE_COMPLETE = "COMPLETE";
public static final String BOOT_STRAP_LOAD_STATE_ERROR = "ERROR";
private static final boolean STATE_NONE = false;
private static final boolean STATE_STARTED = true;
private static final AtomicBoolean LOAD_STATE = new AtomicBoolean(STATE_NONE);
public static void premain(String agentArgs, Instrumentation instrumentation) {
if (agentArgs != null) {
@@ -50,36 +49,29 @@ public class PinpointBootStrap {
}
final boolean duplicated = checkDuplicateLoadState();
if (duplicated) {
// Don't handle the duplicated state. Don't use it as bellow.
//changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logPinpointAgentLoadFail();
return;
}
ClassPathResolver classPathResolver = new ClassPathResolver();
final ClassPathResolver classPathResolver = new ClassPathResolver();
boolean agentJarNotFound = classPathResolver.findAgentJar();
if (!agentJarNotFound) {
// TODO must modify this
logger.severe("pinpoint-bootstrap-x.x.x.jar not found.");
changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logger.severe("pinpoint-bootstrap-x.x.x(-SNAPSHOT).jar not found.");
logPinpointAgentLoadFail();
return;
}
if (!isValidId("pinpoint.agentId", PinpointConstants.AGENT_NAME_MAX_LEN)) {
changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logPinpointAgentLoadFail();
return;
}
if (!isValidId("pinpoint.applicationName", PinpointConstants.APPLICATION_NAME_MAX_LEN)) {
changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logPinpointAgentLoadFail();
return;
}
String configPath = getConfigPath(classPathResolver);
if (configPath == null ) {
changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logPinpointAgentLoadFail();
return;
}
@@ -87,6 +79,9 @@ public class PinpointBootStrap {
// set the path of log file as a system property
saveLogFilePath(classPathResolver);
// TODO append (InterceptorRegistry & Interceptor)
// instrumentation.appendToSystemClassLoaderSearch("interceptor.jar");
try {
// Is it right to load the configuration in the bootstrap?
ProfilerConfig profilerConfig = ProfilerConfig.load(configPath);
@@ -98,19 +93,14 @@ public class PinpointBootStrap {
logger.info("pinpoint agent starting...");
agentClassLoader.boot(classPathResolver.getAgentDirPath(), agentArgs, instrumentation, profilerConfig);
logger.info("pinpoint agent started normally.");
changeLoadState(BOOT_STRAP_LOAD_STATE_COMPLETE);
} catch (Exception e) {
// unexpected exception that did not be checked above
logger.log(Level.SEVERE, ProductInfo.CAMEL_NAME + " start failed. Error:" + e.getMessage(), e);
changeLoadState(BOOT_STRAP_LOAD_STATE_ERROR);
logPinpointAgentLoadFail();
}
}
private static void changeLoadState(String loadState) {
System.setProperty(BOOT_STRAP_LOAD_STATE, loadState);
}
private static void logPinpointAgentLoadFail() {
final String errorLog =
@@ -120,17 +110,21 @@ public class PinpointBootStrap {
System.err.println(errorLog);
}
// for test
static boolean getLoadState() {
return LOAD_STATE.get();
}
private static boolean checkDuplicateLoadState() {
final String exist = System.getProperty(BOOT_STRAP_LOAD_STATE);
if (exist == null) {
changeLoadState(BOOT_STRAP_LOAD_STATE_LOADING);
final boolean startSuccess = LOAD_STATE.compareAndSet(STATE_NONE, STATE_STARTED);
if (startSuccess) {
return false;
} else {
if (logger.isLoggable(Level.SEVERE)) {
logger.severe("pinpoint-bootstrap already started. skipping agent loading. loadState:" + exist);
logger.severe("pinpoint-bootstrap already started. skipping agent loading.");
}
return true;
}
return false;
}
private static boolean isValidId(String propertyName, int maxSize) {
bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrapTest.java
+4 -5
View File
@@ -28,14 +28,13 @@ import com.navercorp.pinpoint.bootstrap.PinpointBootStrap;
public class PinpointBootStrapTest {
@Test
public void testDuplicatedLoadCheck() throws Exception {
Assert.assertFalse(PinpointBootStrap.getLoadState());
PinpointBootStrap.premain("test", new DummyInstrumentation());
String exist = System.getProperty(PinpointBootStrap.BOOT_STRAP_LOAD_STATE);
Assert.assertTrue(exist != null);
Assert.assertTrue(PinpointBootStrap.getLoadState());
PinpointBootStrap.premain("test", new DummyInstrumentation());
// 중복 된경우를 체크 할수 있는 방법이 로그 확인 뿐이 없나??
String recheck = System.getProperty(PinpointBootStrap.BOOT_STRAP_LOAD_STATE);
Assert.assertEquals(exist, recheck);
// ? check
}
}