[pinpoint-apm#9693] Cleanup

Author: emeroad

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/AsyncChildTrace.java

@@ -36,8 +36,9 @@ public class AsyncChildTrace implements Trace {
 
     private static final int ASYNC_BEGIN_STACK_ID = 1001;
 
-    private static final Logger logger = LogManager.getLogger(AsyncChildTrace.class);
-    private static final boolean isDebug = logger.isDebugEnabled();
+    protected final Logger logger = LogManager.getLogger(getClass());
+    protected final boolean isDebug = logger.isDebugEnabled();
+
     private final CallStack<SpanEvent> callStack;
 
     private final Storage storage;
@@ -103,7 +104,7 @@ private SpanEvent traceBlockBegin0(final int stackId) {
 
     private void stackDump(String caused) {
         PinpointException exception = new PinpointException(caused);
-        logger.warn("[DefaultTrace] Corrupted call stack found TraceRoot:{}, CallStack:{}", getTraceRoot(), callStack, exception);
+        logger.warn("[{}] Corrupted call stack found TraceRoot:{}, CallStack:{}", getClass().getSimpleName(), getTraceRoot(), callStack, exception);
     }
 
     @Override
@@ -165,9 +166,7 @@ public void close() {
 
     public void close0() {
         if (closed) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("Already closed {}", this);
-            }
+            logger.warn("Already closed {}", this);
             return;
         }
         closed = true;

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DefaultTrace.java

@@ -39,8 +39,8 @@
  */
 public class DefaultTrace implements Trace {
 
-    static final Logger logger = LogManager.getLogger(DefaultTrace.class);
-    static final boolean isDebug = logger.isDebugEnabled();
+    protected final Logger logger = LogManager.getLogger(getClass());
+    protected final boolean isDebug = logger.isDebugEnabled();
 
     private final CallStack<SpanEvent> callStack;
 
@@ -109,8 +109,7 @@ private SpanEvent traceBlockBegin0(final int stackId) {
             if (logger.isWarnEnabled()) {
                 stackDump("already closed trace");
             }
-            final SpanEvent dummy = dummySpanEvent();
-            return dummy;
+            return dummySpanEvent();
         }
         // Set properties for the case when stackFrame is not used as part of Span.
         final SpanEvent spanEvent = newSpanEvent(stackId);
@@ -120,9 +119,7 @@ private SpanEvent traceBlockBegin0(final int stackId) {
 
     private void stackDump(String caused) {
         PinpointException exception = new PinpointException(caused);
-        if (logger.isWarnEnabled()) {
-            logger.warn("[{}] Corrupted call stack found TraceRoot:{}, CallStack:{}", getClass().getSimpleName(), getTraceRoot(), callStack, exception);
-        }
+        logger.warn("[{}] Corrupted call stack found TraceRoot:{}, CallStack:{}", getClass().getSimpleName(), getTraceRoot(), callStack, exception);
     }
 
     @Override
@@ -160,6 +157,7 @@ public void traceBlockEnd(int stackId) {
                 stackDump("not matched stack id. expected=" + stackId + ", current=" + spanEvent.getStackId());
             }
         }
+
         if (spanEvent.isTimeRecording()) {
             spanEvent.markAfterTime();
         }
@@ -193,7 +191,7 @@ public void close() {
             if (span.isTimeRecording()) {
                 span.markAfterTime(afterTime);
             }
-            logSpan(span);
+            logSpan();
         }
 
         this.storage.close();
@@ -226,6 +224,7 @@ public long getStartTime() {
         return getTraceRoot().getTraceStartTime();
     }
 
+
     @Override
     public boolean canSampled() {
         return true;
@@ -240,8 +239,8 @@ private void logSpan(SpanEvent spanEvent) {
         this.storage.store(spanEvent);
     }
 
-    private void logSpan(Span span) {
-        this.storage.store(span);
+    private void logSpan() {
+        this.storage.store(this.span);
     }
 
     @Override
@@ -320,7 +319,7 @@ public TraceScope addScope(String name) {
     @Override
     public String toString() {
         return "DefaultTrace{" +
-                ", traceRoot=" + getTraceRoot() +
-        '}';
+                "traceRoot=" + getTraceRoot() +
+                '}';
     }
 }

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DisableTrace.java

@@ -35,8 +35,8 @@
  * @author jaehong.kim
  */
 public class DisableTrace implements Trace {
-    static final Logger logger = LogManager.getLogger(DisableTrace.class);
-    static final boolean isDebug = logger.isDebugEnabled();
+    protected final Logger logger = LogManager.getLogger(getClass());
+    protected final boolean isDebug = logger.isDebugEnabled();
 
     public static final String UNSUPPORTED_OPERATION = "disable trace";
     public static final long DISABLE_TRACE_OBJECT_ID = -1;
@@ -157,15 +157,10 @@ protected void flush() {
         this.closed = true;
     }
 
-    private boolean getStatus() {
-        return getShared().getErrorCode() == 0;
-    }
-
     private Shared getShared() {
         return traceRoot.getShared();
     }
 
-
     @Override
     public int getCallStackFrameId() {
         return DEFAULT_STACKID;