diff --git a/skywalking-application-toolkit/pom.xml b/skywalking-application-toolkit/pom.xml
index 55de4c7033cbad74e3d96e40e1819d0e3650112c..0542dc0549d4ef09c44b65ad54d23f3eafd2d745 100644
--- a/skywalking-application-toolkit/pom.xml
+++ b/skywalking-application-toolkit/pom.xml
@@ -17,5 +17,6 @@
         <module>skywalking-toolkit-log4j-1.x</module>
         <module>skywalking-toolkit-log4j-2.x</module>
         <module>skywalking-toolkit-logback-1.x</module>
+        <module>skywalking-toolkit-trace-context</module>
     </modules>
 </project>
diff --git a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..848b947445f399cc14db56887d38c7ab1398048a
--- /dev/null
+++ b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>skywalking-application-toolkit</artifactId>
+        <groupId>com.a.eye</groupId>
+        <version>2.0-2016</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>skywalking-toolkit-trace-context</artifactId>
+    <packaging>jar</packaging>
+
+    <name>skywalking-toolkit-trace-context</name>
+    <url>http://maven.apache.org</url>
+</project>
diff --git a/skywalking-application-toolkit/skywalking-toolkit-trace-context/src/main/java/com/a/eye/skywalking/toolkit/trace/TraceContext.java b/skywalking-application-toolkit/skywalking-toolkit-trace-context/src/main/java/com/a/eye/skywalking/toolkit/trace/TraceContext.java
new file mode 100644
index 0000000000000000000000000000000000000000..dd1b6e2c9098256c75a806066a5cf24e096bfba2
--- /dev/null
+++ b/skywalking-application-toolkit/skywalking-toolkit-trace-context/src/main/java/com/a/eye/skywalking/toolkit/trace/TraceContext.java
@@ -0,0 +1,11 @@
+package com.a.eye.skywalking.toolkit.trace;
+
+/**
+ * Created by xin on 2016/12/15.
+ */
+public class TraceContext {
+
+    public static String traceId() {
+        return "";
+    }
+}
diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml
index e7b35b517463ff3c2353cbc3f028d9031ea566bc..dd5f87559950532eb7d19d6950f8a8117cf5f1db 100644
--- a/skywalking-sniffer/skywalking-agent/pom.xml
+++ b/skywalking-sniffer/skywalking-agent/pom.xml
@@ -75,6 +75,12 @@
             <artifactId>skywalking-toolkit-logback-1.x-activation</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.a.eye</groupId>
+            <artifactId>skywalking-toolkit-trace-context-activation</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${artifactId}</finalName>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml
index da93085a92a7954399baacd062cacbbf79dc41fd..be0690c5da9016b93ce145ded1baee5ba95d9033 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml
+++ b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml
@@ -13,6 +13,7 @@
         <module>skywalking-toolkit-log4j-1.x-activation</module>
         <module>skywalking-toolkit-log4j-2.x-activation</module>
         <module>skywalking-toolkit-logback-1.x-activation</module>
+        <module>skywalking-toolkit-trace-context-activation</module>
     </modules>
 
     <artifactId>skywalking-toolkit-activation</artifactId>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
index 4516ba062518a194fb95b1867ab26cd51423391c..68e113fec698002c932ae674a16b485de0724c44 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
@@ -24,7 +24,7 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu
 
             @Override
             public String getMethodsInterceptor() {
-                return "com.a.eye.skywalking.toolkit.log.log4j.v2.x.PrintTraceIdInterceptor";
+                return "com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x.PrintTraceIdInterceptor";
             }
         }};
     }
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cedea041ae6b415c70424509340dbe38563fb3a3
--- /dev/null
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>skywalking-application-toolkit</artifactId>
+        <groupId>com.a.eye</groupId>
+        <version>2.0-2016</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>skywalking-toolkit-trace-context-activation</artifactId>
+    <packaging>jar</packaging>
+
+    <name>skywalking-toolkit-trace-context-activation</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.a.eye</groupId>
+            <artifactId>skywalking-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc9aa307a28cb36f59b18b03f04797038fdb02d3
--- /dev/null
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java
@@ -0,0 +1,42 @@
+package com.a.eye.skywalking.toolkit.activation.trace;
+
+import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint;
+import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint;
+import com.a.eye.skywalking.plugin.interceptor.MethodMatcher;
+import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint;
+import com.a.eye.skywalking.plugin.interceptor.enhance.ClassStaticMethodsEnhancePluginDefine;
+import com.a.eye.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
+
+/**
+ * Created by xin on 2016/12/15.
+ */
+public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefine {
+    @Override
+    protected String enhanceClassName() {
+        return "com.a.eye.skywalking.toolkit.trace.TraceContext";
+    }
+
+    @Override
+    protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
+        return new ConstructorInterceptPoint[0];
+    }
+
+    @Override
+    protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() {
+        return new StaticMethodsInterceptPoint[]{
+                new StaticMethodsInterceptPoint() {
+                    @Override
+                    public MethodMatcher[] getMethodsMatchers() {
+                        return new MethodMatcher[]{
+                                new SimpleMethodMatcher("traceId")
+                        };
+                    }
+
+                    @Override
+                    public String getMethodsInterceptor() {
+                        return "com.a.eye.skywalking.toolkit.activation.trace.TraceContextInterceptor";
+                    }
+                }
+        };
+    }
+}
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..4abf02017629b0fde2dea6b077f5f673be7b0b4e
--- /dev/null
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java
@@ -0,0 +1,32 @@
+package com.a.eye.skywalking.toolkit.activation.trace;
+
+import com.a.eye.skywalking.api.Tracing;
+import com.a.eye.skywalking.logging.api.ILog;
+import com.a.eye.skywalking.logging.api.LogManager;
+import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult;
+import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext;
+import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodInvokeContext;
+import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodsAroundInterceptor;
+
+/**
+ * Created by xin on 2016/12/15.
+ */
+public class TraceContextInterceptor implements StaticMethodsAroundInterceptor {
+
+    private ILog logger = LogManager.getLogger(TraceContextInterceptor.class);
+
+    @Override
+    public void beforeMethod(StaticMethodInvokeContext interceptorContext, MethodInterceptResult result) {
+
+    }
+
+    @Override
+    public Object afterMethod(StaticMethodInvokeContext interceptorContext, Object ret) {
+       return Tracing.getTraceId();
+    }
+
+    @Override
+    public void handleMethodException(Throwable t, MethodInvokeContext interceptorContext) {
+        logger.error("Failed to get trace Id.", t);
+    }
+}
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
new file mode 100644
index 0000000000000000000000000000000000000000..ddeae78f132890ce666ed6b683ec77693138beb2
--- /dev/null
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
@@ -0,0 +1 @@
+com.a.eye.skywalking.toolkit.activation.trace.TraceContextActivation
\ No newline at end of file
diff --git a/skywalking-storage-center/skywalking-storage/src/test/java/com/a/eye/skywalking/storage/boot/ElasticBootstrapTest.java b/skywalking-storage-center/skywalking-storage/src/test/java/com/a/eye/skywalking/storage/boot/ElasticBootstrapTest.java
index c760c0a64596406204b2e21aab9b0be77489810c..bcfe18855b4217f4cdf9beb04c1f01c85e5bb363 100644
--- a/skywalking-storage-center/skywalking-storage/src/test/java/com/a/eye/skywalking/storage/boot/ElasticBootstrapTest.java
+++ b/skywalking-storage-center/skywalking-storage/src/test/java/com/a/eye/skywalking/storage/boot/ElasticBootstrapTest.java
@@ -15,7 +15,7 @@ public class ElasticBootstrapTest {
     @Test
     public void fetchElasticHomeWithoutProperty() {
         ElasticBootstrap booter = new ElasticBootstrap();
-        assertEquals("Elastic Home :", booter.fetchElasticHome(), bastPath + "install/data/index");
+        assertEquals("Elastic Home :", booter.fetchElasticHome(), bastPath + "skywalking-storage/data/index");
     }
 
     @Test