Merge pull request #769 from scalecube/update-cluster

Updated cluster, fixed jmx object name

Author: artem-v

pom.xml

@@ -23,7 +23,7 @@
 
   <properties>
     <jackson.version>2.11.0</jackson.version>
-    <scalecube-cluster.version>2.6.0-RC1</scalecube-cluster.version>
+    <scalecube-cluster.version>2.6.0-RC2</scalecube-cluster.version>
     <scalecube-commons.version>1.0.4</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.4.3</scalecube-config.version>

services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java

@@ -238,6 +238,8 @@ public interface MonitorMBean {
 
   private static class JmxMonitorMBean implements MonitorMBean {
 
+    private static final String OBJECT_NAME_FORMAT = "io.scalecube.services.discovery:name=%s@%s";
+
     public static final int RECENT_DISCOVERY_EVENTS_SIZE = 128;
 
     private final ScalecubeServiceDiscovery discovery;
@@ -251,9 +253,9 @@ private static JmxMonitorMBean start(ScalecubeServiceDiscovery instance) throws
       MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
       JmxMonitorMBean jmxMBean = new JmxMonitorMBean(instance);
       jmxMBean.init();
-      String id = instance.serviceEndpoint.id() + "/" + Integer.toHexString(instance.hashCode());
       ObjectName objectName =
-          new ObjectName("io.scalecube.services:name=ScalecubeServiceDiscovery@" + id);
+          new ObjectName(
+              String.format(OBJECT_NAME_FORMAT, instance.serviceEndpoint.id(), System.nanoTime()));
       StandardMBean standardMBean = new StandardMBean(jmxMBean, MonitorMBean.class);
       mbeanServer.registerMBean(standardMBean, objectName);
       return jmxMBean;

services-examples-parent/services-examples/src/main/java/io/scalecube/services/examples/discovery/CompositeDiscoveryExample.java

@@ -16,7 +16,7 @@ public class CompositeDiscoveryExample {
    *
    * @param args arguments
    */
-  public static void main(String[] args) {
+  public static void main(String[] args) throws InterruptedException {
     Microservices seed1 =
         Microservices.builder()
             .discovery("seed1", ScalecubeServiceDiscovery::new)
@@ -60,13 +60,13 @@ public static void main(String[] args) {
                 "domain1",
                 endpoint ->
                     new ScalecubeServiceDiscovery(endpoint)
-                        .options(cfg -> cfg.memberIdGenerator(() -> endpoint.id() + "/domain1"))
+                        .options(cfg -> cfg.memberIdGenerator(endpoint::id))
                         .membership(cfg -> cfg.seedMembers(seed1Address)))
             .discovery(
                 "domain2",
                 endpoint ->
                     new ScalecubeServiceDiscovery(endpoint)
-                        .options(cfg -> cfg.memberIdGenerator(() -> endpoint.id() + "/domain2"))
+                        .options(cfg -> cfg.memberIdGenerator(endpoint::id))
                         .membership(cfg -> cfg.seedMembers(seed2Address)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
@@ -78,6 +78,8 @@ public static void main(String[] args) {
     Greeting greeting2 =
         compositeMs.call().api(GreetingsService2.class).sayHello("hello two").block();
     System.err.println("This is response from GreetingsService2: " + greeting2.message());
+
+    Thread.currentThread().join();
   }
 
   @Service

services/src/main/java/io/scalecube/services/Microservices.java

@@ -127,7 +127,7 @@ public final class Microservices {
 
   public static final Logger LOGGER = LoggerFactory.getLogger(Microservices.class);
 
-  private final String id = generateId();
+  private final String id = UUID.randomUUID().toString().replace("-", "");
   private final Map<String, String> tags;
   private final List<ServiceProvider> serviceProviders;
   private final ServiceRegistry serviceRegistry;
@@ -174,12 +174,6 @@ public String id() {
     return this.id;
   }
 
-  private static String generateId() {
-    UUID uuid = UUID.randomUUID();
-    return Long.toHexString(uuid.getMostSignificantBits())
-        + Long.toHexString(uuid.getLeastSignificantBits());
-  }
-
   @Override
   public String toString() {
     return "Microservices@" + id;
@@ -787,12 +781,15 @@ public interface MonitorMBean {
 
   private static class JmxMonitorMBean implements MonitorMBean {
 
+    private static final String OBJECT_NAME_FORMAT = "io.scalecube.services:name=%s@%s";
+
     private final Microservices microservices;
 
     private static JmxMonitorMBean start(Microservices instance) throws Exception {
       MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
       JmxMonitorMBean jmxMBean = new JmxMonitorMBean(instance);
-      ObjectName objectName = new ObjectName("io.scalecube.services:name=" + instance.toString());
+      ObjectName objectName =
+          new ObjectName(String.format(OBJECT_NAME_FORMAT, instance.id(), System.nanoTime()));
       StandardMBean standardMBean = new StandardMBean(jmxMBean, MonitorMBean.class);
       mbeanServer.registerMBean(standardMBean, objectName);
       return jmxMBean;