merger master to master

This commit is contained in:
ascrutae 2016-08-01 07:22:20 +08:00
commit 0149955444
2 changed files with 3 additions and 4 deletions

View File

@ -7,6 +7,8 @@ skywalking.auth_system_env_name=SKYWALKING_RUN
#skywalking数据编码
skywalking.charset=UTF-8
skywalking.auth_override=true
#是否使用STD替换日志输出
skywalking.logger_std_out_override=false;
#是否打印数据
buriedpoint.printf=true

View File

@ -28,7 +28,7 @@ public class SkywalkingAgent {
if (AuthDesc.isAuth()) {
startBootPluginDefines(pluginDefineCategory.getBootPluginsDefines());
new AgentBuilder.Default().type(exclusivePackageClass()).transform(new AgentBuilder.Transformer() {
new AgentBuilder.Default().type(enhanceClassMatcher()).transform(new AgentBuilder.Transformer() {
public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader) {
AbstractClassEnhancePluginDefine pluginDefine = pluginDefineCategory.findPluginDefine(typeDescription.getTypeName());
try {
@ -43,9 +43,6 @@ public class SkywalkingAgent {
}
}
private static ElementMatcher.Junction<NamedElement> exclusivePackageClass() {
return enhanceClassMatcher();
}
private static <T extends NamedElement> ElementMatcher.Junction<T> enhanceClassMatcher() {
return new SkyWalkingEnhanceMatcher<T>(pluginDefineCategory);