This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch docker/build
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 6103832 Update document
add b4ee1f1 update dependencyManagement (#2660)
add 91ffae2 support Nacos cluster (#2640)
new 89d0333 Merge branch 'master' of https://github.com/apache/skywalking
new 8993838 Merge branch 'master' into docker/build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apm-dist/release-docs/LICENSE | 2 +
apm-dist/release-docs/NOTICE | 38 ++++++
...ENSE-consul-client.txt => LICENSE-fastjson.txt} | 4 +-
docs/en/setup/backend/backend-cluster.md | 17 ++-
oap-server/pom.xml | 36 ++++++
.../pom.xml | 58 +++++----
.../plugin/nacos/ClusterModuleNacosConfig.java} | 11 +-
.../plugin/nacos/ClusterModuleNacosProvider.java | 84 +++++++++++++
.../cluster/plugin/nacos/NacosCoordinator.java | 79 ++++++++++++
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../nacos/ClusterModuleNacosProviderTest.java | 106 ++++++++++++++++
.../cluster/plugin/nacos/NacosCoordinatorTest.java | 134 +++++++++++++++++++++
oap-server/server-cluster-plugin/pom.xml | 1 +
...erException.java => ServiceQueryException.java} | 8 +-
oap-server/server-starter/pom.xml | 5 +
.../src/main/assembly/application.yml | 3 +
.../src/main/resources/application.yml | 47 ++++----
17 files changed, 567 insertions(+), 68 deletions(-)
copy apm-dist/release-docs/licenses/{LICENSE-consul-client.txt =>
LICENSE-fastjson.txt} (78%)
copy oap-server/server-cluster-plugin/{cluster-zookeeper-plugin =>
cluster-nacos-plugin}/pom.xml (57%)
copy
oap-server/server-cluster-plugin/{cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
=>
cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java}
(78%)
create mode 100644
oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java
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%)
create mode 100644
oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java
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-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/{ServiceRegisterException.java
=> ServiceQueryException.java} (85%)
