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 2020/07/21 15:31:36 UTC
[skywalking] branch master updated (20b1b51 -> b363b0e)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 20b1b51 Separate config initialization in the plugin out of core level Config. (#5136)
add b363b0e Add Nacos back into SkyWalking as an option(nacos-1.3.1) (#5137)
No new revisions were added by this update.
Summary of changes:
dist-material/release-docs/LICENSE | 1 +
docs/en/setup/backend/backend-cluster.md | 11 +-
docs/en/setup/backend/dynamic-config.md | 21 ++
oap-server/pom.xml | 8 +-
oap-server/server-bootstrap/pom.xml | 10 +
.../src/main/resources/application.yml | 18 ++
.../cluster-nacos-plugin}/pom.xml | 75 +++----
.../plugin/nacos/ClusterModuleNacosConfig.java} | 14 +-
.../plugin/nacos/ClusterModuleNacosProvider.java} | 40 ++--
.../cluster/plugin/nacos/NacosCoordinator.java | 78 ++++++++
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../nacos/ClusterModuleNacosProviderTest.java} | 60 +++---
...TClusterModuleNacosProviderFunctionalTest.java} | 86 +++------
.../cluster/plugin/nacos/NacosCoordinatorTest.java | 130 +++++++++++++
oap-server/server-cluster-plugin/pom.xml | 1 +
.../pom.xml | 50 ++---
.../nacos/NacosConfigWatcherRegister.java | 134 +++++++++++++
.../nacos/NacosConfigurationProvider.java} | 47 ++---
.../configuration/nacos/NacosServerSettings.java} | 24 +--
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../nacos/ITNacosConfigurationTest.java} | 45 ++---
.../nacos/NacosConfigWatcherRegisterTest.java | 65 +++++++
.../nacos/NacosConfigurationTestModule.java} | 7 +-
.../nacos/NacosConfigurationTestProvider.java} | 12 +-
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../src/test/resources/application.yml | 14 +-
.../docker-entrypoint-initdb.d/nacos-mysql.sql | 215 +++++++++++++++++++++
oap-server/server-configuration/pom.xml | 1 +
.../known-oap-backend-dependencies-es7.txt | 3 +
.../known-oap-backend-dependencies.txt | 3 +
31 files changed, 902 insertions(+), 279 deletions(-)
copy oap-server/{server-configuration/configuration-consul => server-cluster-plugin/cluster-nacos-plugin}/pom.xml (73%)
copy oap-server/{server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java => server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java} (81%)
copy oap-server/server-cluster-plugin/{cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProvider.java => cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java} (69%)
create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
copy oap-server/{exporter => server-cluster-plugin/cluster-nacos-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
copy oap-server/server-cluster-plugin/{cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java => cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java} (57%)
copy oap-server/server-cluster-plugin/{cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterModuleEtcdProviderFunctionalTest.java => cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java} (69%)
create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java
copy oap-server/server-configuration/{configuration-consul => configuration-nacos}/pom.xml (79%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java
copy oap-server/server-configuration/{configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationProvider.java => configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java} (64%)
copy oap-server/server-configuration/{configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java => configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java} (73%)
copy oap-server/{exporter => server-configuration/configuration-nacos}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
copy oap-server/server-configuration/{configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ITZookeeperConfigurationTest.java => configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java} (73%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java
copy oap-server/server-configuration/{configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java => configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java} (85%)
copy oap-server/server-configuration/{configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestProvider.java => configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java} (88%)
copy oap-server/server-configuration/{configuration-etcd => configuration-nacos}/src/test/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (91%)
copy oap-server/{exporter/src/main => server-configuration/configuration-nacos/src/test}/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
copy oap-server/server-configuration/{configuration-etcd => configuration-nacos}/src/test/resources/application.yml (84%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/resources/docker/docker-entrypoint-initdb.d/nacos-mysql.sql