diff --git a/oap-server/server-cluster-plugin/cluster_consul_plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml
similarity index 97%
rename from oap-server/server-cluster-plugin/cluster_consul_plugin/pom.xml
rename to oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml
index d9e6ed9a5..871813571 100644
--- a/oap-server/server-cluster-plugin/cluster_consul_plugin/pom.xml
+++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml
@@ -27,7 +27,7 @@
4.0.0
- cluster_consul_plugin
+ cluster-consul-plugin
jar
@@ -52,4 +52,4 @@
-
\ No newline at end of file
+
diff --git a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
similarity index 100%
rename from oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
rename to oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
diff --git a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
similarity index 78%
rename from oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
rename to oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
index cbafca76a..65e407f49 100644
--- a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
+++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
@@ -20,12 +20,20 @@ package org.apache.skywalking.oap.server.cluster.plugin.consul;
import com.google.common.net.HostAndPort;
import com.orbitz.consul.Consul;
-import java.util.*;
import org.apache.skywalking.oap.server.core.CoreModule;
-import org.apache.skywalking.oap.server.core.cluster.*;
-import org.apache.skywalking.oap.server.library.module.*;
-import org.apache.skywalking.oap.server.library.util.*;
-import org.slf4j.*;
+import org.apache.skywalking.oap.server.core.cluster.ClusterModule;
+import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
+import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
+import org.apache.skywalking.oap.server.library.module.ModuleConfig;
+import org.apache.skywalking.oap.server.library.module.ModuleProvider;
+import org.apache.skywalking.oap.server.library.module.ModuleStartException;
+import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException;
+import org.apache.skywalking.oap.server.library.util.Address;
+import org.apache.skywalking.oap.server.library.util.ConnectStringParseException;
+import org.apache.skywalking.oap.server.library.util.ConnectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Use consul to manage all service instances in SkyWalking cluster.
@@ -34,8 +42,6 @@ import org.slf4j.*;
*/
public class ClusterModuleConsulProvider extends ModuleProvider {
- private static final Logger logger = LoggerFactory.getLogger(ClusterModuleConsulProvider.class);
-
private final ClusterModuleConsulConfig config;
private Consul client;
diff --git a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
similarity index 85%
rename from oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
rename to oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
index bff8f2468..7cf732c61 100644
--- a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
+++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
@@ -19,22 +19,28 @@
package org.apache.skywalking.oap.server.cluster.plugin.consul;
import com.google.common.base.Strings;
-import com.orbitz.consul.*;
-import com.orbitz.consul.model.agent.*;
+import com.orbitz.consul.AgentClient;
+import com.orbitz.consul.Consul;
+import com.orbitz.consul.HealthClient;
+import com.orbitz.consul.model.agent.ImmutableRegistration;
+import com.orbitz.consul.model.agent.Registration;
import com.orbitz.consul.model.health.ServiceHealth;
-import java.util.*;
-import org.apache.skywalking.oap.server.core.cluster.*;
+import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
+import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
+import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
+import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException;
import org.apache.skywalking.oap.server.core.remote.client.Address;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
-import org.slf4j.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
/**
* @author peng-yongsheng
*/
public class ConsulCoordinator implements ClusterRegister, ClusterNodesQuery {
- private static final Logger logger = LoggerFactory.getLogger(ConsulCoordinator.class);
-
private final Consul client;
private final String serviceName;
private volatile Address selfAddress;
diff --git a/oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
similarity index 100%
rename from oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
rename to oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml
index d458868b6..27ad7db0a 100644
--- a/oap-server/server-cluster-plugin/pom.xml
+++ b/oap-server/server-cluster-plugin/pom.xml
@@ -31,7 +31,7 @@
cluster-zookeeper-plugin
cluster-standalone-plugin
cluster-kubernetes-plugin
- cluster_consul_plugin
+ cluster-consul-plugin
@@ -46,4 +46,4 @@
${project.version}
-
\ No newline at end of file
+
diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml
index c522862db..b8afbeae4 100644
--- a/oap-server/server-starter/pom.xml
+++ b/oap-server/server-starter/pom.xml
@@ -68,7 +68,7 @@
org.apache.skywalking
- cluster_consul_plugin
+ cluster-consul-plugin
${project.version}
@@ -186,4 +186,4 @@
-
\ No newline at end of file
+