Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
c5f4f82b
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,发现更多精彩内容 >>
提交
c5f4f82b
编写于
4月 28, 2017
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix functional issues after update new package name
上级
e3524d85
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
31 addition
and
31 deletion
+31
-31
apm-collector/apm-collector-commons/src/main/resources/application.conf
...apm-collector-commons/src/main/resources/application.conf
+1
-1
apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
...org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
...lugin/httpClient/v4/define/HttpClientInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
...m/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
...m/plugin/jedis/v2/define/JedisClusterInstrumentation.java
+3
-3
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
...king/apm/plugin/jedis/v2/define/JedisInstrumentation.java
+4
-4
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
.../apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
+3
-3
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
...apm/plugin/motan/define/MotanConsumerInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
...apm/plugin/motan/define/MotanProviderInstrumentation.java
+2
-2
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
...ng/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
...ion/log/log4j/v1/x/TraceIdPatternConverterActivation.java
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
...j-1.x-activation/src/main/resources/skywalking-plugin.def
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
...vation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def
...j-2.x-activation/src/main/resources/skywalking-plugin.def
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
...n/log/logback/v1/x/LogbackPatternConverterActivation.java
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def
...k-1.x-activation/src/main/resources/skywalking-plugin.def
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
...activation/opentracing/span/SkyWalkingSpanActivation.java
+3
-3
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def
...acing-activation/src/main/resources/skywalking-plugin.def
+2
-2
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
.../apm/toolkit/activation/trace/TraceContextActivation.java
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
...ntext-activation/src/main/resources/skywalking-plugin.def
+1
-1
未找到文件。
apm-collector/apm-collector-commons/src/main/resources/application.conf
浏览文件 @
c5f4f82b
...
...
@@ -6,7 +6,7 @@ akka {
java
=
"akka.serialization.JavaSerializer"
proto
=
"akka.remote.serialization.ProtobufSerializer"
//
TraceSegment
=
"org.skywalking.apm.collector.worker.TraceSegmentSerializer"
json
=
"JsonSerializer"
json
=
"
org.skywalking.apm.collector.commons.serializer.
JsonSerializer"
}
serialization
-
bindings
{
...
...
apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -17,7 +17,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
public
class
DubboInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
private
static
final
String
ENHANCE_CLASS
=
"com.alibaba.dubbo.monitor.support.MonitorFilter"
;
private
static
final
String
INTERCEPT_CLASS
=
"DubboInterceptor"
;
private
static
final
String
INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.dubbo.
DubboInterceptor"
;
@Override
protected
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -12,7 +12,7 @@ import org.skywalking.apm.plugin.httpClient.v4.HttpClientExecuteInterceptor;
*/
public
abstract
class
HttpClientInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
private
static
final
String
INTERCEPT_CLASS
=
"HttpClientExecuteInterceptor"
;
private
static
final
String
INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.httpClient.v4.
HttpClientExecuteInterceptor"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
...
...
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -19,7 +19,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
*/
public
abstract
class
AbstractDatabaseInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
private
static
final
String
INTERCEPT_CLASS
=
"JDBCDriverInterceptor"
;
private
static
final
String
INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jdbc.define.
JDBCDriverInterceptor"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
...
...
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -28,9 +28,9 @@ public class JedisClusterInstrumentation extends ClassInstanceMethodsEnhancePlug
private
static
final
String
ARGUMENT_TYPE_NAME
=
"redis.clients.jedis.HostAndPort"
;
private
static
final
String
ENHANCE_CLASS
=
"redis.clients.jedis.JedisCluster"
;
private
static
final
String
CONSTRUCTOR_WITH_LIST_HOSTANDPORT_ARG_INTERCEPT_CLASS
=
"JedisClusterConstructorWithListHostAndPortArgInterceptor"
;
private
static
final
String
METHOD_INTERCEPT_CLASS
=
"JedisMethodInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_HOSTANDPORT_ARG_INTERCEPT_CLASS
=
"JedisClusterConstructorWithHostAndPortArgInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_LIST_HOSTANDPORT_ARG_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisClusterConstructorWithListHostAndPortArgInterceptor"
;
private
static
final
String
METHOD_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisMethodInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_HOSTANDPORT_ARG_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisClusterConstructorWithHostAndPortArgInterceptor"
;
@Override
public
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -30,10 +30,10 @@ public class JedisInstrumentation extends ClassInstanceMethodsEnhancePluginDefin
private
static
final
String
HOST_AND_PORT_ARG_TYPE_NAME
=
"redis.clients.jedis.HostAndPort"
;
private
static
final
String
ENHANCE_CLASS
=
"redis.clients.jedis.Jedis"
;
private
static
final
String
CONSTRUCTOR_WITH_STRING_ARG_INTERCEPT_CLASS
=
"JedisConstructorWithStringArgInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_SHARD_INFO_ARG_INTERCEPT_CLASS
=
"JedisConstructorWithShardInfoArgInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_URI_ARG_INTERCEPT_CLASS
=
"JedisConstructorWithUriArgInterceptor"
;
private
static
final
String
JEDIS_METHOD_INTERCET_CLASS
=
"JedisMethodInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_STRING_ARG_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisConstructorWithStringArgInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_SHARD_INFO_ARG_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisConstructorWithShardInfoArgInterceptor"
;
private
static
final
String
CONSTRUCTOR_WITH_URI_ARG_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisConstructorWithUriArgInterceptor"
;
private
static
final
String
JEDIS_METHOD_INTERCET_CLASS
=
"
org.skywalking.apm.plugin.jedis.v2.
JedisMethodInterceptor"
;
@Override
public
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -19,11 +19,11 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef
private
static
final
String
ENHANCE_CLASS
=
"com.mongodb.Mongo"
;
private
static
final
String
MONGDB_READ_BINDING_CLASS
=
"MongoDBReadBindingInterceptor"
;
private
static
final
String
MONGDB_READ_BINDING_CLASS
=
"
org.skywalking.apm.plugin.mongodb.v3.
MongoDBReadBindingInterceptor"
;
private
static
final
String
MONGDB_WRITE_BINDING_CLASS
=
"MongoDBWriteBindingInterceptor"
;
private
static
final
String
MONGDB_WRITE_BINDING_CLASS
=
"
org.skywalking.apm.plugin.mongodb.v3.
MongoDBWriteBindingInterceptor"
;
private
static
final
String
MONGDB_METHOD_INTERCET_CLASS
=
"MongoDBMethodInterceptor"
;
private
static
final
String
MONGDB_METHOD_INTERCET_CLASS
=
"
org.skywalking.apm.plugin.mongodb.v3.
MongoDBMethodInterceptor"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
...
...
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -19,7 +19,7 @@ public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePlu
private
static
final
String
ENHANCE_CLASS
=
"com.weibo.api.motan.transport.ProviderMessageRouter"
;
private
static
final
String
INVOKE_INTERCEPT_CLASS
=
"MotanProviderInterceptor"
;
private
static
final
String
INVOKE_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.motan.
MotanProviderInterceptor"
;
@Override
protected
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -28,11 +28,11 @@ public class MotanProviderInstrumentation extends ClassInstanceMethodsEnhancePlu
/**
* Class that intercept all constructor of ${@link com.weibo.api.motan.rpc.AbstractProvider}.
*/
private
static
final
String
CONSTRUCTOR_INTERCEPT_CLASS
=
"MotanConsumerInterceptor"
;
private
static
final
String
CONSTRUCTOR_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.motan.
MotanConsumerInterceptor"
;
/**
* Class that intercept {@link com.weibo.api.motan.rpc.AbstractProvider#call(Request)}.
*/
private
static
final
String
PROVIDER_INVOKE_INTERCEPT_CLASS
=
"MotanConsumerInterceptor"
;
private
static
final
String
PROVIDER_INVOKE_INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.motan.
MotanConsumerInterceptor"
;
@Override
protected
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
浏览文件 @
c5f4f82b
...
...
@@ -27,7 +27,7 @@ public class TomcatInstrumentation extends ClassInstanceMethodsEnhancePluginDefi
/**
* Intercept class.
*/
private
static
final
String
INTERCEPT_CLASS
=
"TomcatInterceptor"
;
private
static
final
String
INTERCEPT_CLASS
=
"
org.skywalking.apm.plugin.tomcat78x.
TomcatInterceptor"
;
@Override
protected
String
enhanceClassName
()
{
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
浏览文件 @
c5f4f82b
...
...
@@ -48,7 +48,7 @@ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhan
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.log.log4j.v1.x.
PrintTraceIdInterceptor"
;
}
}
};
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
浏览文件 @
c5f4f82b
TraceIdPatternConverterActivation
org.skywalking.apm.toolkit.activation.log.log4j.v1.x.
TraceIdPatternConverterActivation
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
浏览文件 @
c5f4f82b
...
...
@@ -39,7 +39,7 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.log.log4j.v2.x.
PrintTraceIdInterceptor"
;
}
}
};
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def
浏览文件 @
c5f4f82b
Log4j2OutputAppenderActivation
org.skywalking.apm.toolkit.activation.log.log4j.v2.x.
Log4j2OutputAppenderActivation
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
浏览文件 @
c5f4f82b
...
...
@@ -49,7 +49,7 @@ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhan
@Override
public
String
getMethodsInterceptor
()
{
return
"PrintTraceIdInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.log.logback.v1.x.
PrintTraceIdInterceptor"
;
}
}
};
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def
浏览文件 @
c5f4f82b
LogbackPatternConverterActivation
org.skywalking.apm.toolkit.activation.log.logback.v1.x.
LogbackPatternConverterActivation
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
浏览文件 @
c5f4f82b
...
...
@@ -48,7 +48,7 @@ public class SkyWalkingSpanActivation extends ClassInstanceMethodsEnhancePluginD
@Override
public
String
getMethodsInterceptor
()
{
return
"SpanSetTagInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.opentracing.span.interceptor.
SpanSetTagInterceptor"
;
}
},
new
InstanceMethodsInterceptPoint
()
{
...
...
@@ -59,7 +59,7 @@ public class SkyWalkingSpanActivation extends ClassInstanceMethodsEnhancePluginD
@Override
public
String
getMethodsInterceptor
()
{
return
"SpanSetOperationNameInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.opentracing.span.interceptor.
SpanSetOperationNameInterceptor"
;
}
},
new
InstanceMethodsInterceptPoint
()
{
...
...
@@ -70,7 +70,7 @@ public class SkyWalkingSpanActivation extends ClassInstanceMethodsEnhancePluginD
@Override
public
String
getMethodsInterceptor
()
{
return
"SpanFinishInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.opentracing.span.interceptor.
SpanFinishInterceptor"
;
}
}
};
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def
浏览文件 @
c5f4f82b
SkyWalkingSpanActivation
SkyWalkingTracerActivation
org.skywalking.apm.toolkit.activation.opentracing.span.
SkyWalkingSpanActivation
org.skywalking.apm.toolkit.activation.opentracing.tracer.
SkyWalkingTracerActivation
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
浏览文件 @
c5f4f82b
...
...
@@ -39,7 +39,7 @@ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefin
@Override
public
String
getMethodsInterceptor
()
{
return
"TraceContextInterceptor"
;
return
"
org.skywalking.apm.toolkit.activation.trace.
TraceContextInterceptor"
;
}
}
};
...
...
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
浏览文件 @
c5f4f82b
TraceContextActivation
\ No newline at end of file
org.skywalking.apm.toolkit.activation.trace.TraceContextActivation
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录