From 66e3eb0765913be0c918686c6472fc50cc52e739 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 27 Feb 2018 14:37:22 +0800 Subject: [PATCH] [Agent] fix some intercept package name about toolkit's class is incorrect --- .../log4j/v1/x/TraceIdPatternConverterActivation.java | 11 ++++++++--- .../log4j/v2/x/Log4j2OutputAppenderActivation.java | 11 ++++++++--- .../v1/x/LogbackPatternConverterActivation.java | 11 ++++++++--- .../log/logback/v1/x/mdc/MDCConverterActivation.java | 10 +++++++--- .../activation/trace/TraceContextActivation.java | 11 ++++++++--- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java index 4e13bd648..37a7246db 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java @@ -38,12 +38,17 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName * @author wusheng */ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.log4j.v1.x.TraceIdPatternConverter"; + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v1.x.PrintTraceIdInterceptor"; + public static final String ENHANCE_METHOD = "convert"; + /** * @return the target class, which needs active. */ @Override protected ClassMatch enhanceClass() { - return byName("TraceIdPatternConverter"); + return byName(ENHANCE_CLASS); } /** @@ -64,12 +69,12 @@ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhan new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("convert"); + return named(ENHANCE_METHOD); } @Override public String getMethodsInterceptor() { - return "PrintTraceIdInterceptor"; + return INTERCEPT_CLASS; } @Override public boolean isOverrideArgs() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java index fc337bdf0..fcc98f638 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java @@ -37,12 +37,17 @@ import static net.bytebuddy.matcher.ElementMatchers.named; * @author wusheng */ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePluginDefine { + + public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.log4j.v2.x.Log4j2OutputAppender"; + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.PrintTraceIdInterceptor"; + public static final String ENHANCE_METHOD = "append"; + /** * @return the target class, which needs active. */ @Override protected ClassMatch enhanceClass() { - return NameMatch.byName("org.apache.skywalking.apm.toolkit.log.log4j.v2.x.Log4j2OutputAppender"); + return NameMatch.byName(ENHANCE_CLASS); } /** @@ -55,12 +60,12 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu new StaticMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("append"); + return named(ENHANCE_METHOD); } @Override public String getMethodsInterceptor() { - return "PrintTraceIdInterceptor"; + return INTERCEPT_CLASS; } @Override public boolean isOverrideArgs() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java index d3c599266..57c567369 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java @@ -39,12 +39,17 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName * Created by wusheng on 2016/12/7. */ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.PrintTraceIdInterceptor"; + public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter"; + public static final String ENHANCE_METHOD = "convert"; + /** * @return the target class, which needs active. */ @Override protected ClassMatch enhanceClass() { - return byName("org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter"); + return byName(ENHANCE_CLASS); } /** @@ -65,12 +70,12 @@ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhan new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("convert"); + return named(ENHANCE_METHOD); } @Override public String getMethodsInterceptor() { - return "PrintTraceIdInterceptor"; + return INTERCEPT_CLASS; } @Override public boolean isOverrideArgs() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java index 202486bc9..dea164bab 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java @@ -34,6 +34,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named; */ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.mdc.PrintMDCTraceIdInterceptor"; + public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.LogbackMDCPatternConverter"; + public static final String ENHANCE_METHOD = "convertTID"; + @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return null; @@ -45,12 +49,12 @@ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDef new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("convertTID"); + return named(ENHANCE_METHOD); } @Override public String getMethodsInterceptor() { - return "PrintMDCTraceIdInterceptor"; + return INTERCEPT_CLASS; } @Override public boolean isOverrideArgs() { @@ -62,6 +66,6 @@ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDef @Override protected ClassMatch enhanceClass() { - return NameMatch.byName("org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.LogbackMDCPatternConverter"); + return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java index 301424893..3d04f0914 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java @@ -37,12 +37,17 @@ import static net.bytebuddy.matcher.ElementMatchers.named; * Created by xin on 2016/12/15. */ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefine { + + public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.trace.TraceContextInterceptor"; + public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.trace.TraceContext"; + public static final String ENHANCE_METHOD = "traceId"; + /** * @return the target class, which needs active. */ @Override protected ClassMatch enhanceClass() { - return NameMatch.byName("TraceContext"); + return NameMatch.byName(ENHANCE_CLASS); } /** @@ -55,12 +60,12 @@ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefin new StaticMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("traceId"); + return named(ENHANCE_METHOD); } @Override public String getMethodsInterceptor() { - return "TraceContextInterceptor"; + return INTERCEPT_CLASS; } @Override public boolean isOverrideArgs() { -- GitLab