kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix functional issues after update new package name

This commit is contained in:
ascrutae 2017-04-28 15:42:09 +08:00
parent e3524d8555
commit c5f4f82bd0
20 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-collector/apm-collector-commons/src/main/resources/application.conf
View File

@ -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 {

2
apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInstrumentation.java
View File

@ -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() {

2
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/HttpClientInstrumentation.java
View File

@ -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() {

2
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDatabaseInstrumentation.java
View File

@ -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() {

6
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java
View File

@ -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() {

8
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java
View File

@ -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() {

6
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
View File

@ -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() {

2
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
View File

@ -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() {

4
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
View File

@ -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() {

2
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java
View File

@ -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() {

2
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
View File

@ -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";
}
}
};

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
TraceIdPatternConverterActivation
org.skywalking.apm.toolkit.activation.log.log4j.v1.x.TraceIdPatternConverterActivation

2
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
View File

@ -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";
}
}
};

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
Log4j2OutputAppenderActivation
org.skywalking.apm.toolkit.activation.log.log4j.v2.x.Log4j2OutputAppenderActivation

2
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
View File

@ -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";
}
}
};

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
LogbackPatternConverterActivation
org.skywalking.apm.toolkit.activation.log.logback.v1.x.LogbackPatternConverterActivation

6
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/skywalking/apm/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java
View File

@ -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";
}
}
};

4
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def
View File

@ -1,2 +1,2 @@
SkyWalkingSpanActivation
SkyWalkingTracerActivation
org.skywalking.apm.toolkit.activation.opentracing.span.SkyWalkingSpanActivation
org.skywalking.apm.toolkit.activation.opentracing.tracer.SkyWalkingTracerActivation

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
View File

@ -39,7 +39,7 @@ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefin
@Override
public String getMethodsInterceptor() {
return "TraceContextInterceptor";
return "org.skywalking.apm.toolkit.activation.trace.TraceContextInterceptor";
}
}
};

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
TraceContextActivation
org.skywalking.apm.toolkit.activation.trace.TraceContextActivation