You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/07/28 01:48:28 UTC
[skywalking] 02/03: Merge branch 'master' into remove-javassist
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch remove-javassist
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit db857c724408dadb55a9618b007683d1c6b142ee
Merge: b9dcf31 76d9163
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Jul 28 09:44:46 2019 +0800
Merge branch 'master' into remove-javassist
apm-dist/release-docs/LICENSE | 1 +
.../plugin/bootstrap/BootstrapInstrumentBoost.java | 1 +
oap-server/pom.xml | 68 +++++++++
.../cluster-etcd-plugin/pom.xml | 46 ++----
.../configuration-etcd}/pom.xml | 86 ++++++-----
.../configuration/etcd/EtcdConfigException.java | 33 +++++
.../etcd/EtcdConfigWatcherRegister.java | 162 +++++++++++++++++++++
.../etcd/EtcdConfigurationProvider.java | 67 +++++++++
.../configuration/etcd/EtcdServerSettings.java | 52 +++++++
.../oap/server/configuration/etcd/EtcdUtils.java | 72 +++++++++
...alking.oap.server.library.module.ModuleProvider | 19 +++
.../etcd/EtcdConfigWatcherRegisterTest.java | 132 +++++++++++++++++
.../etcd/EtcdConfigurationTestModule.java | 37 +++++
.../etcd/EtcdConfigurationTestProvider.java | 89 +++++++++++
.../etcd/ITEtcdConfigurationTest.java | 153 +++++++++++++++++++
.../server/configuration/etcd/TestEtcdUtils.java | 64 ++++++++
...ywalking.oap.server.library.module.ModuleDefine | 20 +++
...alking.oap.server.library.module.ModuleProvider | 19 +++
.../src/test/resources/application.yml | 33 +++++
.../src/test/resources/log4j2.xml} | 31 ++--
oap-server/server-configuration/pom.xml | 1 +
oap-server/server-starter/pom.xml | 5 +
.../src/main/assembly/application.yml | 5 +
.../src/main/resources/application.yml | 5 +
24 files changed, 1102 insertions(+), 99 deletions(-)
diff --cc apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java
index e9f4d7b,c1dda6d..6f70460
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java
@@@ -62,16 -56,10 +62,17 @@@ public class BootstrapInstrumentBoost
"org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.BootstrapInterRuntimeAssist",
"org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor",
"org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor",
+ "org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor",
"org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult",
"org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.OverrideCallable",
- "org.apache.skywalking.apm.agent.core.plugin.bootstrap.IBootstrapLog"
+ "org.apache.skywalking.apm.agent.core.plugin.bootstrap.IBootstrapLog",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.RuntimeType",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.This",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.AllArguments",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.AllArguments$Assignment",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.SuperCall",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.Origin",
+ SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.Morph"
};
private static String INSTANCE_METHOD_DELEGATE_TEMPLATE = "org.apache.skywalking.apm.agent.core.plugin.bootstrap.template.InstanceMethodInterTemplate";
private static String INSTANCE_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE = "org.apache.skywalking.apm.agent.core.plugin.bootstrap.template.InstanceMethodInterWithOverrideArgsTemplate";