This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch rt-oal in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 09666c75083024608382013ec1129cb87e415556 Merge: 3532ed6 c7916d9 Author: Wu Sheng <[email protected]> AuthorDate: Thu Jul 18 09:41:01 2019 +0800 Merge commit 'c7916d9f2715ff9d3c415f86418d8f81c97a21e7' into rt-oal # Conflicts: # oap-server/pom.xml .../apm/commons/datacarrier/buffer/Buffer.java | 14 +- .../datacarrier/consumer/ConsumerThread.java | 36 ++- .../consumer/MultipleChannelsConsumer.java | 27 +- .../apm/commons/datacarrier/DataCarrierTest.java | 25 +- .../commons/datacarrier/LinkedArrayBenchmark.java | 320 +++++++++++++++++++++ .../apm/agent/core/context/ContextManager.java | 19 +- docs/en/guides/README.md | 45 ++- oap-server/pom.xml | 1 + .../cluster-consul-plugin/pom.xml | 100 +++++++ .../cluster/plugin/consul/ConsulCoordinator.java | 10 +- .../plugin/consul/ConsulCoordinatorTest.java | 3 +- ...TClusterModuleConsulProviderFunctionalTest.java | 263 +++++++++++++++++ .../ITClusterModuleEtcdProviderFunctionalTest.java | 232 +++++++++++++++ .../cluster-nacos-plugin/pom.xml | 96 +++++++ .../cluster/plugin/nacos/NacosCoordinator.java | 11 +- ...ITClusterModuleNacosProviderFunctionalTest.java | 198 +++++++++++++ .../cluster/plugin/nacos/NacosCoordinatorTest.java | 3 +- .../cluster-zookeeper-plugin/pom.xml | 95 ++++++ .../zookeeper/ClusterModuleZookeeperProvider.java | 3 +- .../plugin/zookeeper/ZookeeperCoordinator.java | 40 ++- .../ClusterModuleZookeeperProviderTest.java | 56 ++++ .../ClusterModuleZookeeperProviderTestCase.java | 77 ----- ...usterModuleZookeeperProviderFunctionalTest.java | 235 +++++++++++++++ .../plugin/zookeeper/ZookeeperCoordinatorTest.java | 7 +- .../configuration-zookeeper/pom.xml | 4 - .../analysis/worker/MetricsAggregateWorker.java | 26 +- .../src/main/resources/application.yml | 2 +- 27 files changed, 1746 insertions(+), 202 deletions(-) diff --cc oap-server/pom.xml index e8ec8fc,8816919..b2e2186 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@@ -82,9 -83,7 +82,10 @@@ <curator-test.version>2.12.0</curator-test.version> <etcd4j.version>2.17.0</etcd4j.version> <etcd.version>v3.2.3</etcd.version> + <antlr.version>4.7.1</antlr.version> + <freemarker.version>2.3.28</freemarker.version> + <javaassist.version>3.25.0-GA</javaassist.version> + <zookeeper.image.version>3.5</zookeeper.image.version> </properties> <dependencies>
