From c68bf8af04360f16a7cfe10b30fb28e7d6b029fe Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Thu, 18 Apr 2013 06:17:16 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20api=20=EC=A0=95=EB=A6=AC,=20=EC=9E=90=EC=B2=B4=20logger?=
 =?UTF-8?q?=EC=97=90=20beforeInterceptor=EC=99=80=20afterInterceptor?=
 =?UTF-8?q?=EB=A5=BC=20=EB=A7=8C=EB=93=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@1496 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 src/main/java/com/profiler/DefaultAgent.java  | 19 +++++++++++++++++--
 .../com/profiler/context/DefaultTrace.java    |  3 ---
 .../com/profiler/context/SpanUpdater.java     |  6 ------
 .../profiler/logging/Slf4jLoggerAdapter.java  | 10 ++++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)
 delete mode 100644 src/main/java/com/profiler/context/SpanUpdater.java

diff --git a/src/main/java/com/profiler/DefaultAgent.java b/src/main/java/com/profiler/DefaultAgent.java
index 05f4956d6..8236b2193 100644
--- a/src/main/java/com/profiler/DefaultAgent.java
+++ b/src/main/java/com/profiler/DefaultAgent.java
@@ -23,7 +23,9 @@ import com.profiler.util.NetworkUtils;
 import java.io.UnsupportedEncodingException;
 import java.lang.instrument.Instrumentation;
 import java.util.Map.Entry;
+import java.util.Properties;
 import java.util.Random;
+import java.util.Set;
 
 public class DefaultAgent implements Agent {
 
@@ -63,7 +65,10 @@ public class DefaultAgent implements Agent {
         }
 
         initializeLogger();
+
+        dumpSystemProperties();
         dumpConfig(profilerConfig);
+
         changeStatus(AgentStatus.INITIALIZING);
 
         this.profilerConfig = profilerConfig;
@@ -102,6 +107,16 @@ public class DefaultAgent implements Agent {
         SingletonHolder.INSTANCE = this;
     }
 
+    private void dumpSystemProperties() {
+        if (logger.isInfoEnabled()) {
+            Properties properties = System.getProperties();
+            Set<String> strings = properties.stringPropertyNames();
+            for (String key : strings) {
+                logger.info("SystemProperties " + key + "=" + properties.get(key));
+            }
+        }
+    }
+
     private void dumpConfig(ProfilerConfig profilerConfig) {
         if (logger.isInfoEnabled()) {
             logger.info("{}\n{}", "dumpConfig", profilerConfig);
@@ -281,7 +296,7 @@ public class DefaultAgent implements Agent {
     // TODO 필요없을것 같음 started를 start로 바꿔도 될 듯...
     @Override
     public void start() {
-        logger.info("Starting HIPPO Agent.");
+        logger.info("Starting " + ProductInfo.CAMEL_NAME + " Agent.");
     }
 
     /**
@@ -295,7 +310,7 @@ public class DefaultAgent implements Agent {
 
     @Override
     public void stop() {
-        logger.info("Stopping HIPPO Agent.");
+        logger.info("Stopping " + ProductInfo.CAMEL_NAME +" Agent.");
 
         changeStatus(AgentStatus.STOPPING);
         this.heartBitChecker.close();
diff --git a/src/main/java/com/profiler/context/DefaultTrace.java b/src/main/java/com/profiler/context/DefaultTrace.java
index 72a55d30d..1e5e32c8a 100644
--- a/src/main/java/com/profiler/context/DefaultTrace.java
+++ b/src/main/java/com/profiler/context/DefaultTrace.java
@@ -20,9 +20,6 @@ public final class DefaultTrace implements Trace {
     private static final boolean isDebug = logger.isDebugEnabled();
     private static final boolean isTrace = logger.isTraceEnabled();
 
-    public static final int NOCHECK_STACKID = -1;
-    public static final int ROOT_STACKID = 0;
-
     private short sequence;
 
     private boolean sampling = true;
diff --git a/src/main/java/com/profiler/context/SpanUpdater.java b/src/main/java/com/profiler/context/SpanUpdater.java
deleted file mode 100644
index 347a804d4..000000000
--- a/src/main/java/com/profiler/context/SpanUpdater.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.profiler.context;
-
-@Deprecated
-public interface SpanUpdater {
-    Span updateSpan(Span span);
-}
diff --git a/src/main/java/com/profiler/logging/Slf4jLoggerAdapter.java b/src/main/java/com/profiler/logging/Slf4jLoggerAdapter.java
index fb1d5f44f..1330910af 100644
--- a/src/main/java/com/profiler/logging/Slf4jLoggerAdapter.java
+++ b/src/main/java/com/profiler/logging/Slf4jLoggerAdapter.java
@@ -17,6 +17,16 @@ public class Slf4jLoggerAdapter implements Logger {
         return logger.getName();
     }
 
+    @Override
+    public void beforeInterceptor(Object target, String className, String methodName, String parameterDescription, Object[] args) {
+        LoggingUtils.logBefore(this, target, className, methodName, parameterDescription, args);
+    }
+
+    @Override
+    public void afterInterceptor(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result) {
+        LoggingUtils.logAfter(this, target, className, methodName, parameterDescription, args, result);
+    }
+
     @Override
     public boolean isTraceEnabled() {
         return logger.isTraceEnabled();