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

[강운덕] [LUCYSUS-1744] hippo->pinpoint관련 변경작업

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@1744 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Woonduk Kang
2013-06-03 05:46:25 +00:00
parent 9afd3df549
commit e670da201d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/nhn/pinpoint/DefaultAgent.java
+2 -2
View File
@@ -83,8 +83,8 @@ public class DefaultAgent implements Agent {
// TODO 일단 임시로 호환성을 위해 agentid에 machinename을 넣도록 하자
// TODO 박스 하나에 서버 인스턴스를 여러개 실행할 때에 문제가 될 수 있음.
this.machineName = NetworkUtils.getHostName();
this.agentId = getId("hippo.agentId", machineName, HBaseTables.AGENT_NAME_MAX_LEN);
this.applicationName = getId("hippo.applicationName", "UnknownApplicationName", HBaseTables.APPLICATION_NAME_MAX_LEN);
this.agentId = getId("pinpoint.agentId", machineName, HBaseTables.AGENT_NAME_MAX_LEN);
this.applicationName = getId("pinpoint.applicationName", "UnknownApplicationName", HBaseTables.APPLICATION_NAME_MAX_LEN);
this.priorityDataSender = createDataSender();
this.dataSender = createDataSender();
src/main/java/com/nhn/pinpoint/HeartBitChecker.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class HeartBitChecker {
public void start() {
if (logger.isInfoEnabled()) {
logger.info("Send startup information to HIPPO server via {}. agentInfo={}", dataSender.getClass().getSimpleName() + agentInfo);
logger.info("Send startup information to Pinpoint server via {}. agentInfo={}", dataSender.getClass().getSimpleName() + agentInfo);
}
dataSender.send(agentInfo);
dataSender.send(agentInfo);
src/main/java/com/nhn/pinpoint/modifier/tomcat/CatalinaModifier.java
+2 -2
View File
@@ -11,7 +11,7 @@ import com.nhn.pinpoint.modifier.AbstractModifier;
import com.nhn.pinpoint.modifier.tomcat.interceptors.CatalinaAwaitInterceptor;
/**
* Tomcat startup정보를 HIPPO서버로 전송하는 코드를 호출하기위한 modifier
* Tomcat startup정보를 Pinpoint서버로 전송하는 코드를 호출하기위한 modifier
*
* @author netspider
*/
@@ -38,7 +38,7 @@ public class CatalinaModifier extends AbstractModifier {
try {
/**
* Tomcat startup완료되면 Catalina.await()을 호출하고 stop되기를 기다린다. 이 때
* await하기 전에 서버가 시작되면서 수집된 WAS정보를 HIPPO 서버로 전송한다.
* await하기 전에 서버가 시작되면서 수집된 WAS정보를 Pinpoint 서버로 전송한다.
*/
CatalinaAwaitInterceptor catalinaAwaitInterceptor = new CatalinaAwaitInterceptor(agent);
InstrumentClass aClass = this.byteCodeInstrumentor.getClass(javassistClassName);
src/test/java/com/nhn/pinpoint/AgentClassLoaderTest.java
+2 -2
View File
@@ -32,7 +32,7 @@ public class AgentClassLoaderTest {
logger.info("lib:" + projectDir);
URL[] lib = getLib(projectDir);
logger.info("lib list:" + Arrays.toString(lib));
// String testJar = "hippoClassLoaderTest-1.0.jar";
// String testJar = "pinpointClassLoaderTest-1.0.jar";
// logger.info("load lib:" + testJar);
//
// String testJarPath = projectDir + File.separator + testJar;
@@ -76,7 +76,7 @@ public class AgentClassLoaderTest {
logger.info("lib location:" + location);
String path = location.getPath();
// file:/D:/nhn_source/hippo_project/hippo-tomcat-profiler/target/classes/
// file:/D:/nhn_source/pinpoint_project/pinpoint-tomcat-profiler/target/classes/
int dirPath = path.lastIndexOf("target/classes/");
if (dirPath == -1) {
throw new RuntimeException("target/classes/ not found");