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

[강운덕] [LUCYSUS-1744] Span 데이터 구조를 api 호출 방식으로 변경하기 위해서 start end time위주로 변경함.

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@874 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Woonduk Kang
2012-11-19 08:09:14 +00:00
parent b8c73bfdef
commit 6ca5154931
11 changed files with 116 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/profiler/context/Trace.java
+27 -26
View File
@@ -34,6 +34,7 @@ public final class Trace {
// traceObject에서 spanid의 유효성을 히스토리를 관리한다면 같은 thread에서는 span랜덤생성아이디의 충돌을 방지할수 있기는 함.
this.root = TraceID.newTraceId();
this.callStack = new CallStack();
this.callStack.push();
StackFrame stackFrame = createStackFrame(root, ROOT_STACKID);
this.callStack.setStackFrame(stackFrame);
}
@@ -41,6 +42,7 @@ public final class Trace {
public Trace(TraceID continueRoot) {
this.root = continueRoot;
this.callStack = new CallStack();
this.callStack.push();
StackFrame stackFrame = createStackFrame(continueRoot, ROOT_STACKID);
this.callStack.setStackFrame(stackFrame);
}
@@ -76,12 +78,9 @@ public final class Trace {
}
private StackFrame createStackFrame(TraceID nextId, int stackId) {
StackFrame stackFrame = new StackFrame();
stackFrame.setStackFrameId(stackId);
stackFrame.setTraceID(nextId);
Span span = new Span(nextId, null, null);
stackFrame.setSpan(span);
StackFrame stackFrame = new StackFrame(span);
stackFrame.setStackFrameId(stackId);
return stackFrame;
}
@@ -115,12 +114,22 @@ public final class Trace {
traceBlockEnd(NOCHECK_STACKID);
}
// public void traceBlockFinalEnd() {
// StackFrame currentStackFrame = callStack.getCurrentStackFrame();
// if (currentStackFrame.getStackFrameId() != ROOT_STACKID) {
// // 자체 stack dump를 하면 오류발견이 쉬울것으로 생각됨.
// logger.warning("Corrupted RootCallStack found. StackId not matched");
// }
// logSpan(currentStackFrame);
// }
public void traceBlockEnd(int stackId) {
StackFrame currentStackFrame = callStack.getCurrentStackFrame();
if (currentStackFrame.getStackFrameId() != stackId) {
// 자체 stack dump를 하면 오류발견이 쉬울것으로 생각됨.
logger.warning("Corrupted CallStack found. StackId not matched");
}
logSpan(currentStackFrame);
callStack.pop();
}
@@ -128,16 +137,16 @@ public final class Trace {
return callStack.getCurrentStackFrame();
}
public boolean removeCurrentTraceIdFromStack() {
StackFrame currentStackFrame = callStack.getCurrentStackFrame();
if (currentStackFrame != null) {
TraceID traceId = currentStackFrame.getTraceID();
callStack.currentStackFrameClear();
// spanMap.remove(traceId);
return true;
}
return false;
}
// public boolean removeCurrentTraceIdFromStack() {
// StackFrame currentStackFrame = callStack.getCurrentStackFrame();
// if (currentStackFrame != null) {
// TraceID traceId = currentStackFrame.getTraceID();
// callStack.currentStackFrameClear();
//// spanMap.remove(traceId);
// return true;
// }
// return false;
// }
/**
* Get current TraceID. If it was not set this will return null.
@@ -162,16 +171,8 @@ public final class Trace {
}
private void logSpan(String key, Span span) {
if (key == null) {
return;
}
if (key.equals(Annotation.ClientRecv.getCode()) || key.equals(Annotation.ServerSend.getCode())) {
logSpan(span);
}
}
void logSpan(Span span) {
void logSpan(StackFrame stackFrame) {
Span span = stackFrame.getSpan();
try {
if (logger.isLoggable(Level.INFO)) {
logger.info("[WRITE SPAN]" + span + " CurrentThreadID=" + Thread.currentThread().getId() + ",\n\t CurrentThreadName=" + Thread.currentThread().getName() + "\n\n");
@@ -272,7 +273,7 @@ public final class Trace {
try {
Span span = getCurrentStackFrame().getSpan();
span.addAnnotation(new HippoAnnotation(System.currentTimeMillis(), key, duration));
logSpan(key, span);
} catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
}