diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java
new file mode 100644
index 000000000..890df092d
--- /dev/null
+++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java
@@ -0,0 +1,10 @@
+package com.a.eye.skywalking.toolkit.log4j.v2.x;
+
+/**
+ * Created by wusheng on 2016/12/11.
+ */
+public class Log4j2OutputAppender {
+ public static void append(StringBuilder toAppendTo){
+ toAppendTo.append("TID: N/A");
+ }
+}
diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java
index f01726bc0..046081eef 100644
--- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java
+++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java
@@ -29,6 +29,6 @@ public class TraceIdConverter extends LogEventPatternConverter {
@Override
public void format(LogEvent event, StringBuilder toAppendTo) {
- toAppendTo.append("TID: N/A");
+ Log4j2OutputAppender.append(toAppendTo);
}
}
diff --git a/skywalking-network/src/main/proto/Spans.proto b/skywalking-network/src/main/proto/Spans.proto
index 23d3373e7..df535d40b 100644
--- a/skywalking-network/src/main/proto/Spans.proto
+++ b/skywalking-network/src/main/proto/Spans.proto
@@ -42,7 +42,7 @@ message TraceId {
message Span {
TraceId traceId = 1;
string parentLevelId=2;
- int32 levelId = 3; // parentLevelId + "." + levelId
+ int32 levelId = 3;
string viewpoint = 4;
int64 startTime = 5;
int64 cost = 6;
diff --git a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
index 02f4f3db5..a597e2a39 100644
--- a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
+++ b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
@@ -67,13 +67,35 @@
org.mockito
- mockito-core
+ mockito-all
1.10.19
test
+
+
+ org.powermock
+ powermock-module-junit4
+ 1.6.4
+ test
- objenesis
- org.objenesis
+ powermock-module-junit4-common
+ org.powermock
+
+
+
+
+ org.powermock
+ powermock-api-mockito
+ 1.6.4
+ test
+
+
+ mockito-core
+ org.mockito
+
+
+ powermock-api-support
+ org.powermock
hamcrest-core
diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java
index b6702d74e..718ba814e 100644
--- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java
+++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java
@@ -10,8 +10,6 @@ import java.util.concurrent.ConcurrentHashMap;
*
*/
public class EnhancedClassInstanceContext {
- public static final String FIELD_NAME = "_$EnhancedClassInstanceContext";
-
private Map