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

1. When batch replace the package of plugin def class was lost. 

2. Some class check style error.
This commit is contained in:
pengys5 2017-04-28 02:46:11 +08:00
parent b2b36fee00
commit e3524d8555
13 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
View File

@ -14,7 +14,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
* Created by wusheng on 2016/12/7.
*/
@Plugin(name = "TraceIdConverter", category = "Converter")
@ConverterKeys( {"traceId"})
@ConverterKeys({"traceId"})
public class TraceIdConverter extends LogEventPatternConverter {
/**

4
apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/AbstractClassEnhancePluginDefineTest.java
View File

@ -21,8 +21,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
@RunWith(PowerMockRunner.class)
public class AbstractClassEnhancePluginDefineTest {
static final String WEAVE_CLASS = "TargetObject";
static final String INTERCEPTOR_CLASS = "MockPluginInterceptor";
static final String WEAVE_CLASS = "org.skywalking.apm.api.plugin.TargetObject";
static final String INTERCEPTOR_CLASS = "org.skywalking.apm.api.plugin.MockPluginInterceptor";
static final String WEAVE_INSTANCE_METHOD_NAME = "instanceMethod";
static final String WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME = "instanceMethodWithException";
static final String WEAVE_STATIC_METHOD_NAME = "staticMethod";

8
apm-sniffer/apm-api/src/test/java/org/skywalking/apm/api/plugin/loader/InterceptorInstanceLoaderTest.java
View File

@ -18,17 +18,17 @@ public class InterceptorInstanceLoaderTest {
return super.loadClass(name);
}
};
Object obj = InterceptorInstanceLoader.load("NeverUsedTestClass", mockClassLoader);
Object obj = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", mockClassLoader);
Assert.assertTrue(obj != null);
Object obj2 = InterceptorInstanceLoader.load("NeverUsedTestClass", mockClassLoader);
Object obj2 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", mockClassLoader);
Assert.assertTrue(obj != null);
Assert.assertEquals(obj, obj2);
Object obj3 = InterceptorInstanceLoader.load("NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Object obj3 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Assert.assertTrue(obj3 != null);
Object obj4 = InterceptorInstanceLoader.load("NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Object obj4 = InterceptorInstanceLoader.load("org.skywalking.apm.api.plugin.loader.NeverUsedTestClass", InterceptorInstanceLoaderTest.class.getClassLoader());
Assert.assertTrue(obj4 != null);
Assert.assertEquals(obj3, obj4);
}

2
apm-sniffer/apm-api/src/test/resources/skywalking-plugin.def
View File

@ -1 +1 @@
MockAbstractClassEnhancePluginDefine
org.skywalking.apm.api.plugin.MockAbstractClassEnhancePluginDefine

4
apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbox/BugFixActive.java
View File

@ -1,12 +1,10 @@
package org.skywalking.apm.plugin.dubbox;
import org.skywalking.apm.plugin.dubbo.DubboInterceptor;
/**
* {@link BugFixActive#active} is an flag that present the dubbox version is below 2.8.3, The version 2.8.3 of dubbox
* don't support attachment. so skywalking provided another way to support the function that transport the serialized
* context data. The way is that all parameters of dubbo service need to extend {@link SWBaseBean}, {@link
* DubboInterceptor} fetch the serialized context data by using {@link
* org.skywalking.apm.plugin.dubbo.DubboInterceptor} fetch the serialized context data by using {@link
* SWBaseBean#getTraceContext()}.
*
* @author zhangxin

2
apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
DubboInstrumentation
org.skywalking.apm.plugin.dubbo.DubboInstrumentation

8
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1,4 +1,4 @@
AbstractHttpClientInstrumentation
InternalHttpClientInstrumentation
MinimalHttpClientInstrumentation
DefaultRequestDirectorInstrumentation
org.skywalking.apm.plugin.httpClient.v4.define.AbstractHttpClientInstrumentation
org.skywalking.apm.plugin.httpClient.v4.define.InternalHttpClientInstrumentation
org.skywalking.apm.plugin.httpClient.v4.define.MinimalHttpClientInstrumentation
org.skywalking.apm.plugin.httpClient.v4.define.DefaultRequestDirectorInstrumentation

6
apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1,3 +1,3 @@
H2Instrumentation
MysqlInstrumentation
OracleInstrumentation
org.skywalking.apm.plugin.jdbc.define.H2Instrumentation
org.skywalking.apm.plugin.jdbc.define.MysqlInstrumentation
org.skywalking.apm.plugin.jdbc.define.OracleInstrumentation

4
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1,2 +1,2 @@
JedisClusterInstrumentation
JedisInstrumentation
org.skywalking.apm.plugin.jedis.v2.define.JedisClusterInstrumentation
org.skywalking.apm.plugin.jedis.v2.define.JedisInstrumentation

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

@ -10,8 +10,8 @@ import org.skywalking.apm.plugin.mongodb.v3.MongoDBMethodInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
/**
* {@link MongoDBInstrumentation} presents that skywalking intercepts {@link com.mongodb.Mongo#execute(ReadOperation,
* ReadPreference)},{@link com.mongodb.Mongo#execute(WriteOperation)} by using {@link MongoDBMethodInterceptor}.
* {@link MongoDBInstrumentation} presents that skywalking intercepts {@link com.mongodb.Mongo#execute(com.mongodb.operation.ReadOperation,
* com.mongodb.ReadPreference)},{@link com.mongodb.Mongo#execute(com.mongodb.operation.WriteOperation)} by using {@link MongoDBMethodInterceptor}.
*
* @author baiyang
*/
@ -44,27 +44,27 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef
return MONGDB_METHOD_INTERCET_CLASS;
}
}, new InstanceMethodsInterceptPoint() {
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return named("getReadBinding");
}
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return named("getReadBinding");
}
@Override
public String getMethodsInterceptor() {
return MONGDB_READ_BINDING_CLASS;
}
}, new InstanceMethodsInterceptPoint() {
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return named("getWriteBinding");
}
@Override
public String getMethodsInterceptor() {
return MONGDB_READ_BINDING_CLASS;
}
}, new InstanceMethodsInterceptPoint() {
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return named("getWriteBinding");
}
@Override
public String getMethodsInterceptor() {
return MONGDB_WRITE_BINDING_CLASS;
}
}
};
@Override
public String getMethodsInterceptor() {
return MONGDB_WRITE_BINDING_CLASS;
}
}
};
}
@Override

2
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
MongoDBInstrumentation
org.skywalking.apm.plugin.mongodb.v3.define.MongoDBInstrumentation

4
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1,2 +1,2 @@
MotanConsumerInstrumentation
MotanProviderInstrumentation
org.skywalking.apm.plugin.motan.define.MotanConsumerInstrumentation
org.skywalking.apm.plugin.motan.define.MotanProviderInstrumentation

2
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
TomcatInstrumentation
org.skywalking.apm.plugin.tomcat78x.define.TomcatInstrumentation