From 2c3e3ce33f4a75573e8c04cdf2889706fc832b09 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Fri, 16 Dec 2016 18:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skywalking-application-toolkit/pom.xml | 1 + .../skywalking-toolkit-trace-context/pom.xml | 16 +++++++ .../toolkit/trace/TraceContext.java | 11 +++++ skywalking-sniffer/skywalking-agent/pom.xml | 6 +++ .../skywalking-toolkit-activation/pom.xml | 1 + .../v2/x/Log4j2OutputAppenderActivation.java | 2 +- .../pom.xml | 28 +++++++++++++ .../trace/TraceContextActivation.java | 42 +++++++++++++++++++ .../trace/TraceContextInterceptor.java | 32 ++++++++++++++ .../src/main/resources/skywalking-plugin.def | 1 + .../storage/boot/ElasticBootstrapTest.java | 2 +- 11 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml create mode 100644 skywalking-application-toolkit/skywalking-toolkit-trace-context/src/main/java/com/a/eye/skywalking/toolkit/trace/TraceContext.java create mode 100644 skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml create mode 100644 skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java create mode 100644 skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java create mode 100644 skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def diff --git a/skywalking-application-toolkit/pom.xml b/skywalking-application-toolkit/pom.xml index 55de4c703..0542dc054 100644 --- a/skywalking-application-toolkit/pom.xml +++ b/skywalking-application-toolkit/pom.xml @@ -17,5 +17,6 @@ skywalking-toolkit-log4j-1.x skywalking-toolkit-log4j-2.x skywalking-toolkit-logback-1.x + skywalking-toolkit-trace-context 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 000000000..848b94744 --- /dev/null +++ b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml @@ -0,0 +1,16 @@ + + + skywalking-application-toolkit + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-toolkit-trace-context + jar + + skywalking-toolkit-trace-context + http://maven.apache.org + 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 000000000..dd1b6e2c9 --- /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 e7b35b517..dd5f87559 100644 --- a/skywalking-sniffer/skywalking-agent/pom.xml +++ b/skywalking-sniffer/skywalking-agent/pom.xml @@ -75,6 +75,12 @@ skywalking-toolkit-logback-1.x-activation ${project.version} + + + com.a.eye + skywalking-toolkit-trace-context-activation + ${project.version} + ${artifactId} diff --git a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml index da93085a9..be0690c5d 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml @@ -13,6 +13,7 @@ skywalking-toolkit-log4j-1.x-activation skywalking-toolkit-log4j-2.x-activation skywalking-toolkit-logback-1.x-activation + skywalking-toolkit-trace-context-activation skywalking-toolkit-activation 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 4516ba062..68e113fec 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 000000000..cedea041a --- /dev/null +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml @@ -0,0 +1,28 @@ + + + skywalking-application-toolkit + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-toolkit-trace-context-activation + jar + + skywalking-toolkit-trace-context-activation + http://maven.apache.org + + + UTF-8 + + + + + com.a.eye + skywalking-api + ${project.version} + + + 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 000000000..dc9aa307a --- /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 000000000..4abf02017 --- /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 000000000..ddeae78f1 --- /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 c760c0a64..bcfe18855 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 -- GitLab