Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
66e3eb07
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
66e3eb07
编写于
2月 27, 2018
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Agent] fix some intercept package name about toolkit's class is incorrect
上级
7f83f427
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
39 addition
and
15 deletion
+39
-15
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
...ion/log/log4j/v1/x/TraceIdPatternConverterActivation.java
+8
-3
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
...vation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
+8
-3
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
...n/log/logback/v1/x/LogbackPatternConverterActivation.java
+8
-3
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
...tivation/log/logback/v1/x/mdc/MDCConverterActivation.java
+7
-3
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
.../apm/toolkit/activation/trace/TraceContextActivation.java
+8
-3
未找到文件。
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
浏览文件 @
66e3eb07
...
...
@@ -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
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"convert"
);
return
named
(
ENHANCE_METHOD
);
}
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
...
...
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
浏览文件 @
66e3eb07
...
...
@@ -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
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"append"
);
return
named
(
ENHANCE_METHOD
);
}
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
...
...
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
浏览文件 @
66e3eb07
...
...
@@ -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
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"convert"
);
return
named
(
ENHANCE_METHOD
);
}
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
...
...
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
浏览文件 @
66e3eb07
...
...
@@ -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
<
MethodDescription
>
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
);
}
}
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
浏览文件 @
66e3eb07
...
...
@@ -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
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"traceId"
);
return
named
(
ENHANCE_METHOD
);
}
@Override
public
String
getMethodsInterceptor
()
{
return
"TraceContextInterceptor"
;
return
INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录