Fix problem with local message report metric and test it properly

eclipse-vertx · Jul 5, 2016 · 0235938 · 0235938
1 parent 5338f63
commit 0235938
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java b/src/main/java/io/vertx/core/eventbus/impl/MessageImpl.java
@@ -160,7 +160,7 @@ protected <R> void sendReply(MessageImpl msg, DeliveryOptions options, Handler<A
     }
   }
 
-  boolean isLocal() {
+  protected boolean isLocal() {
     return true;
   }
 }
diff --git a/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java b/src/main/java/io/vertx/core/eventbus/impl/clustered/ClusteredMessage.java
@@ -246,7 +246,7 @@ public boolean isFromWire() {
     return fromWire;
   }
 
-  boolean isLocal() {
+  protected boolean isLocal() {
-    return isFromWire();
+    return !isFromWire();
   }
 }
diff --git a/src/test/java/io/vertx/test/core/MetricsTest.java b/src/test/java/io/vertx/test/core/MetricsTest.java
@@ -38,7 +38,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -278,10 +277,11 @@ private void testHandlerProcessMessage(Vertx from, Vertx to, int expectedLocalCo
         assertEquals(ADDRESS1, registration.address);
         assertEquals(null, registration.repliedAddress);
         assertEquals(1, registration.scheduleCount.get());
+        assertEquals(expectedLocalCount, registration.localScheduleCount.get());
         assertEquals(1, registration.beginCount.get());
         assertEquals(0, registration.endCount.get());
         assertEquals(0, registration.failureCount.get());
-        assertEquals(expectedLocalCount, registration.localCount.get());
+        assertEquals(expectedLocalCount, registration.localBeginCount.get());
         msg.reply("pong");
       }).completionHandler(onSuccess(v2 -> {
         to.runOnContext(v3 -> {
@@ -309,7 +309,7 @@ private void testHandlerProcessMessage(Vertx from, Vertx to, int expectedLocalCo
       // This might take a little time
       waitUntil(() -> 1 == registration.endCount.get());
       assertEquals(0, registration.failureCount.get());
-      assertEquals(expectedLocalCount, registration.localCount.get());
+      assertEquals(expectedLocalCount, registration.localBeginCount.get());
       testComplete();
     });
     waitUntil(() -> registration.scheduleCount.get() == 1);
@@ -361,7 +361,7 @@ public void testHandlerMetricReply() throws Exception {
       assertEquals(0, registration.scheduleCount.get());
       assertEquals(0, registration.beginCount.get());
       assertEquals(0, registration.endCount.get());
-      assertEquals(0, registration.localCount.get());
+      assertEquals(0, registration.localBeginCount.get());
       msg.reply("pong");
     }).completionHandler(ar -> {
       assertTrue(ar.succeeded());
@@ -375,14 +375,14 @@ public void testHandlerMetricReply() throws Exception {
       assertEquals(1, registration.scheduleCount.get());
       assertEquals(1, registration.beginCount.get());
       assertEquals(0, registration.endCount.get());
-      assertEquals(1, registration.localCount.get());
+      assertEquals(1, registration.localBeginCount.get());
       vertx.runOnContext(v -> {
         assertEquals(ADDRESS1, metrics.getRegistrations().get(0).address);
         assertEquals(ADDRESS1, registration.repliedAddress);
         assertEquals(1, registration.scheduleCount.get());
         assertEquals(1, registration.beginCount.get());
         assertEquals(1, registration.endCount.get());
-        assertEquals(1, registration.localCount.get());
+        assertEquals(1, registration.localBeginCount.get());
       });
       testComplete();
     });

diff --git a/src/test/java/io/vertx/test/fakemetrics/FakeEventBusMetrics.java b/src/test/java/io/vertx/test/fakemetrics/FakeEventBusMetrics.java
@@ -96,13 +96,16 @@ public void handlerUnregistered(HandlerMetric handler) {
   @Override
   public void scheduleMessage(HandlerMetric handler, boolean local) {
     handler.scheduleCount.incrementAndGet();
+    if (local) {
+      handler.localScheduleCount.incrementAndGet();
+    }
   }
 
   @Override
   public void beginHandleMessage(HandlerMetric handler, boolean local) {
     handler.beginCount.incrementAndGet();
     if (local) {
-      handler.localCount.incrementAndGet();
+      handler.localBeginCount.incrementAndGet();
     }
   }
 

diff --git a/src/test/java/io/vertx/test/fakemetrics/HandlerMetric.java b/src/test/java/io/vertx/test/fakemetrics/HandlerMetric.java
@@ -26,10 +26,11 @@ public class HandlerMetric {
   public final String address;
   public final String repliedAddress;
   public final AtomicInteger scheduleCount = new AtomicInteger();
+  public final AtomicInteger localScheduleCount = new AtomicInteger();
   public final AtomicInteger beginCount = new AtomicInteger();
   public final AtomicInteger endCount = new AtomicInteger();
   public final AtomicInteger failureCount = new AtomicInteger();
-  public final AtomicInteger localCount = new AtomicInteger();
+  public final AtomicInteger localBeginCount = new AtomicInteger();
 
   public HandlerMetric(String address, String repliedAddress) {
     this.address = address;
@@ -39,6 +40,6 @@ public HandlerMetric(String address, String repliedAddress) {
   @Override
   public String toString() {
     return "HandlerRegistration[address=" + address + ",repliedAddress=" + repliedAddress + ",beginCount=" + beginCount.get() +
-        ",endCount=" + endCount.get() + ",failureCount=" + failureCount + ",localCount=" + localCount.get() + "]";
+        ",endCount=" + endCount.get() + ",failureCount=" + failureCount + ",localCount=" + localBeginCount.get() + "]";
   }
 }