Metrics improvements : rename a few things and use static instance fo…

…r DummyMetrics as they are stateless

src/main/java/io/vertx/core/impl/VertxImpl.java

@@ -378,7 +378,7 @@ private VertxMetrics initialiseMetrics(VertxOptions options) {
         return metrics;
       }
     }
-    return new DummyVertxMetrics();
+    return DummyVertxMetrics.INSTANCE;
   }
 
   private ClusterManager getClusterManager(VertxOptions options) {

src/main/java/io/vertx/core/metrics/impl/DummyVertxMetrics.java

@@ -44,6 +44,8 @@
  */
 public class DummyVertxMetrics implements VertxMetrics {
 
+  public static final DummyVertxMetrics INSTANCE = new DummyVertxMetrics();
+
   @Override
   public void verticleDeployed(Verticle verticle) {
   }
@@ -62,37 +64,37 @@ public void timerEnded(long id, boolean cancelled) {
 
   @Override
   public EventBusMetrics createMetrics(EventBus eventBus) {
-    return new DummyEventBusMetrics();
+    return DummyEventBusMetrics.INSTANCE;
   }
 
   @Override
   public HttpServerMetrics createMetrics(HttpServer server, SocketAddress localAddress, HttpServerOptions options) {
-    return new DummyHttpServerMetrics();
+    return DummyHttpServerMetrics.INSTANCE;
   }
 
   @Override
   public HttpClientMetrics createMetrics(HttpClient client, HttpClientOptions options) {
-    return new DummyHttpClientMetrics();
+    return DummyHttpClientMetrics.INSTANCE;
   }
 
   @Override
   public TCPMetrics createMetrics(NetServer server, SocketAddress localAddress, NetServerOptions options) {
-    return new DummyTCPMetrics();
+    return DummyTCPMetrics.INSTANCE;
   }
 
   @Override
   public TCPMetrics createMetrics(NetClient client, NetClientOptions options) {
-    return new DummyTCPMetrics();
+    return DummyTCPMetrics.INSTANCE;
   }
 
   @Override
   public DatagramSocketMetrics createMetrics(DatagramSocket socket, DatagramSocketOptions options) {
-    return new DummyDatagramMetrics();
+    return DummyDatagramMetrics.INSTANCE;
   }
 
   @Override
   public <P> PoolMetrics<?> createMetrics(P pool, String poolType, String poolName, int maxPoolSize) {
-    return new DummyWorkerPoolMetrics();
+    return DummyWorkerPoolMetrics.INSTANCE;
   }
 
   @Override
@@ -109,7 +111,9 @@ public boolean isMetricsEnabled() {
     return false;
   }
 
-  protected class DummyEventBusMetrics implements EventBusMetrics<Void> {
+  public static class DummyEventBusMetrics implements EventBusMetrics<Void> {
+
+    public static final DummyEventBusMetrics INSTANCE = new DummyEventBusMetrics();
 
     @Override
     public void messageWritten(String address, int numberOfBytes) {
@@ -158,7 +162,9 @@ public void close() {
     }
   }
 
-  protected class DummyHttpServerMetrics implements HttpServerMetrics<Void, Void, Void> {
+  public static class DummyHttpServerMetrics implements HttpServerMetrics<Void, Void, Void> {
+
+    public static final DummyHttpServerMetrics INSTANCE = new DummyHttpServerMetrics();
 
     @Override
     public Void requestBegin(Void socketMetric, HttpServerRequest request) {
@@ -223,7 +229,9 @@ public void disconnected(Void serverWebSocketMetric) {
     }
   }
 
-  protected class DummyHttpClientMetrics implements HttpClientMetrics<Void, Void, Void> {
+  public static class DummyHttpClientMetrics implements HttpClientMetrics<Void, Void, Void> {
+
+    public static final DummyHttpClientMetrics INSTANCE = new DummyHttpClientMetrics();
 
     @Override
     public Void requestBegin(Void socketMetric, SocketAddress localAddress, SocketAddress remoteAddress, HttpClientRequest request) {
@@ -283,7 +291,9 @@ public void disconnected(Void webSocketMetric) {
     }
   }
 
-  protected class DummyTCPMetrics implements TCPMetrics<Void> {
+  public static class DummyTCPMetrics implements TCPMetrics<Void> {
+
+    public static final DummyTCPMetrics INSTANCE = new DummyTCPMetrics();
 
     @Override
     public Void connected(SocketAddress remoteAddress, String remoteName) {
@@ -316,7 +326,9 @@ public boolean isEnabled() {
     }
   }
 
-  protected class DummyDatagramMetrics implements DatagramSocketMetrics {
+  public static class DummyDatagramMetrics implements DatagramSocketMetrics {
+
+    public static final DummyDatagramMetrics INSTANCE = new DummyDatagramMetrics();
 
     @Override
     public void listening(String localName, SocketAddress localAddress) {
@@ -344,7 +356,9 @@ public boolean isEnabled() {
     }
   }
 
-  private class DummyWorkerPoolMetrics implements PoolMetrics<Void> {
+  public static class DummyWorkerPoolMetrics implements PoolMetrics<Void> {
+
+    public static final DummyWorkerPoolMetrics INSTANCE = new DummyWorkerPoolMetrics();
 
     @Override
     public Void submitted() {

src/test/java/io/vertx/test/core/CustomMetricsFactory.java

@@ -30,7 +30,7 @@ public class CustomMetricsFactory implements VertxMetricsFactory {
 
   @Override
   public VertxMetrics metrics(Vertx vertx, VertxOptions options) {
-    return new DummyVertxMetrics();
+    return DummyVertxMetrics.INSTANCE;
   }
 
   @Override

src/test/java/io/vertx/test/core/MetricsContextTest.java

@@ -49,7 +49,7 @@ public void testFactory() throws Exception {
     VertxMetricsFactory factory = (vertx, options) -> {
       metricsThread.set(Thread.currentThread());
       metricsContext.set(Vertx.currentContext());
-      return new DummyVertxMetrics();
+      return DummyVertxMetrics.INSTANCE;
     };
     vertx(new VertxOptions().setMetricsOptions(new MetricsOptions().setEnabled(true).setFactory(factory)));
     assertSame(Thread.currentThread(), metricsThread.get());
@@ -64,7 +64,7 @@ public void testFactoryInCluster() throws Exception {
     VertxMetricsFactory factory = (vertx, options) -> {
       metricsThread.set(Thread.currentThread());
       metricsContext.set(Vertx.currentContext());
-      return new DummyVertxMetrics();
+      return DummyVertxMetrics.INSTANCE;
     };
     clusteredVertx(new VertxOptions().setClustered(true).setMetricsOptions(new MetricsOptions().setEnabled(true).setFactory(factory)), onSuccess(vertx -> {
       assertSame(testThread, metricsThread.get());

src/test/java/io/vertx/test/core/MetricsOptionsTest.java

@@ -27,7 +27,6 @@
 import org.junit.Test;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -88,7 +87,7 @@ public void testMetricsEnabledWithoutConfig() {
 
   @Test
   public void testSetMetricsInstance() {
-    DummyVertxMetrics metrics = new DummyVertxMetrics();
+    DummyVertxMetrics metrics = DummyVertxMetrics.INSTANCE;
     vertx.close();
     vertx = Vertx.vertx(new VertxOptions().setMetricsOptions(new MetricsOptions().setEnabled(true).setFactory(new SimpleVertxMetricsFactory<>(metrics))));
     assertSame(metrics, ((VertxInternal) vertx).metricsSPI());
@@ -106,7 +105,7 @@ public void testMetricsFromServiceLoader() {
 
   @Test
   public void testSetMetricsInstanceTakesPrecedenceOverServiceLoader() {
-    DummyVertxMetrics metrics = new DummyVertxMetrics();
+    DummyVertxMetrics metrics = DummyVertxMetrics.INSTANCE;
     vertx.close();
     VertxOptions options = new VertxOptions().setMetricsOptions(new MetricsOptions().setEnabled(true).setFactory(new SimpleVertxMetricsFactory<>(metrics)));
     vertx = createVertxLoadingMetricsFromMetaInf(options, "io.vertx.test.fakemetrics.FakeMetricsFactory");

src/test/java/io/vertx/test/core/MetricsTest.java

@@ -29,8 +29,6 @@
 import io.vertx.core.net.NetSocket;
 import io.vertx.core.spi.metrics.PoolMetrics;
 import io.vertx.test.fakemetrics.*;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.net.InetAddress;
@@ -674,9 +672,9 @@ private void testDatagram(String host, Consumer<PacketMetric> checker) throws Ex
 
   @Test
   public void testThreadPoolMetricsWithExecuteBlocking() {
-    Map<String, PoolMetrics> all = FakeThreadPoolMetrics.getThreadPoolMetrics();
+    Map<String, PoolMetrics> all = FakePoolMetrics.getPoolMetrics();
 
-    FakeThreadPoolMetrics metrics = (FakeThreadPoolMetrics) all.get("vert.x-worker-thread");
+    FakePoolMetrics metrics = (FakePoolMetrics) all.get("vert.x-worker-thread");
 
     assertThat(metrics.getPoolSize(), is(getOptions().getInternalBlockingPoolSize()));
     assertThat(metrics.numberOfIdleThreads(), is(getOptions().getWorkerPoolSize()));
@@ -724,8 +722,8 @@ public void testThreadPoolMetricsWithExecuteBlocking() {
   public void testThreadPoolMetricsWithInternalExecuteBlocking() {
     // Internal blocking thread pool is used by blocking file system actions.
 
-    Map<String, PoolMetrics> all = FakeThreadPoolMetrics.getThreadPoolMetrics();
-    FakeThreadPoolMetrics metrics = (FakeThreadPoolMetrics) all.get("vert.x-internal-blocking");
+    Map<String, PoolMetrics> all = FakePoolMetrics.getPoolMetrics();
+    FakePoolMetrics metrics = (FakePoolMetrics) all.get("vert.x-internal-blocking");
 
     assertThat(metrics.getPoolSize(), is(getOptions().getInternalBlockingPoolSize()));
     assertThat(metrics.numberOfIdleThreads(), is(getOptions().getInternalBlockingPoolSize()));
@@ -785,8 +783,8 @@ public void testThreadPoolMetricsWithWorkerVerticleAndMultiThread() {
 
   private void testWithWorkerVerticle(DeploymentOptions options) {
     AtomicInteger counter = new AtomicInteger();
-    Map<String, PoolMetrics> all = FakeThreadPoolMetrics.getThreadPoolMetrics();
-    FakeThreadPoolMetrics metrics = (FakeThreadPoolMetrics) all.get("vert.x-worker-thread");
+    Map<String, PoolMetrics> all = FakePoolMetrics.getPoolMetrics();
+    FakePoolMetrics metrics = (FakePoolMetrics) all.get("vert.x-worker-thread");
 
     assertThat(metrics.getPoolSize(), is(getOptions().getInternalBlockingPoolSize()));
     assertThat(metrics.numberOfIdleThreads(), is(getOptions().getWorkerPoolSize()));
@@ -855,9 +853,9 @@ public void testThreadPoolMetricsWithNamedExecuteBlocking() {
 
     WorkerExecutor workerExec = vertx.createSharedWorkerExecutor("my-pool", 10);
 
-    Map<String, PoolMetrics> all = FakeThreadPoolMetrics.getThreadPoolMetrics();
+    Map<String, PoolMetrics> all = FakePoolMetrics.getPoolMetrics();
 
-    FakeThreadPoolMetrics metrics = (FakeThreadPoolMetrics) all.get("my-pool");
+    FakePoolMetrics metrics = (FakePoolMetrics) all.get("my-pool");
 
     assertThat(metrics.getPoolSize(), is(10));
     assertThat(metrics.numberOfIdleThreads(), is(10));
@@ -906,9 +904,9 @@ public void testWorkerPoolClose() {
     WorkerExecutor ex1 = vertx.createSharedWorkerExecutor("ex1");
     WorkerExecutor ex1_ = vertx.createSharedWorkerExecutor("ex1");
     WorkerExecutor ex2 = vertx.createSharedWorkerExecutor("ex2");
-    Map<String, PoolMetrics> all = FakeThreadPoolMetrics.getThreadPoolMetrics();
-    FakeThreadPoolMetrics metrics1 = (FakeThreadPoolMetrics) all.get("ex1");
-    FakeThreadPoolMetrics metrics2 = (FakeThreadPoolMetrics) all.get("ex2");
+    Map<String, PoolMetrics> all = FakePoolMetrics.getPoolMetrics();
+    FakePoolMetrics metrics1 = (FakePoolMetrics) all.get("ex1");
+    FakePoolMetrics metrics2 = (FakePoolMetrics) all.get("ex2");
     assertNotNull(metrics1);
     assertNotNull(metrics2);
     assertNotSame(metrics1, metrics2);

src/test/java/io/vertx/test/fakemetrics/FakeThreadPoolMetrics.java → src/test/java/io/vertx/test/fakemetrics/FakePoolMetrics.java

@@ -28,7 +28,7 @@
  *
  * @author <a href="http://escoffier.me">Clement Escoffier</a>
  */
-public class FakeThreadPoolMetrics implements PoolMetrics<Void> {
+public class FakePoolMetrics implements PoolMetrics<Void> {
   private final static Map<String, PoolMetrics> METRICS = new ConcurrentHashMap<>();
 
   private final int poolSize;
@@ -41,7 +41,7 @@ public class FakeThreadPoolMetrics implements PoolMetrics<Void> {
   private final String name;
   private final AtomicBoolean closed = new AtomicBoolean();
 
-  public FakeThreadPoolMetrics(String name, int poolSize) {
+  public FakePoolMetrics(String name, int poolSize) {
     this.poolSize = poolSize;
     this.name = name;
     this.idle.set(this.poolSize);
@@ -116,7 +116,7 @@ public int numberOfRunningTasks() {
     return running.get();
   }
 
-  public static Map<String, PoolMetrics> getThreadPoolMetrics() {
+  public static Map<String, PoolMetrics> getPoolMetrics() {
     return METRICS;
   }
 

src/test/java/io/vertx/test/fakemetrics/FakeVertxMetrics.java

@@ -136,7 +136,7 @@ public DatagramSocketMetrics createMetrics(DatagramSocket socket, DatagramSocket
 
   @Override
   public <P> PoolMetrics<?> createMetrics(P pool, String poolType, String poolName, int maxPoolSize) {
-    return new FakeThreadPoolMetrics(poolName, maxPoolSize);
+    return new FakePoolMetrics(poolName, maxPoolSize);
   }
 
   public boolean isEnabled() {