From 1ba48d1545479a48cf473057f52ea5896b81ecc0 Mon Sep 17 00:00:00 2001 From: Yufei Cai Date: Sun, 6 Dec 2020 18:58:24 +0100 Subject: [PATCH] Issue #878: stabilize MQTT client actor tests; remove unused metric. Signed-off-by: Yufei Cai --- .../messaging/mqtt/hivemq/HiveMqtt3ClientActorTest.java | 3 ++- .../messaging/mqtt/hivemq/HiveMqtt5ClientActorTest.java | 3 ++- .../services/utils/pubsub/ddata/AbstractDDataHandler.java | 6 ------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt3ClientActorTest.java b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt3ClientActorTest.java index d35cffcf5f..4d5499e831 100644 --- a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt3ClientActorTest.java +++ b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt3ClientActorTest.java @@ -14,6 +14,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.List; import org.eclipse.ditto.model.base.common.ByteBufferUtils; @@ -61,7 +62,7 @@ public void testSubscribeFails() { final ActorRef mqttClientActor = actorSystem.actorOf(props, "mqttClientActor-testSubscribeFails"); mqttClientActor.tell(OpenConnection.of(connectionId, DittoHeaders.empty()), getRef()); - expectMsgClass(Status.Failure.class); + expectMsgClass(Duration.ofSeconds(10L), Status.Failure.class); mqttClientActor.tell(CloseConnection.of(connectionId, DittoHeaders.empty()), getRef()); expectMsg(DISCONNECTED_SUCCESS); diff --git a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt5ClientActorTest.java b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt5ClientActorTest.java index 170a9e462d..d2e49ea920 100644 --- a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt5ClientActorTest.java +++ b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/HiveMqtt5ClientActorTest.java @@ -14,6 +14,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.List; import org.eclipse.ditto.model.base.common.ByteBufferUtils; @@ -58,7 +59,7 @@ public void testSubscribeFails() { final ActorRef mqttClientActor = actorSystem.actorOf(props, "mqttClientActor-testSubscribeFails"); mqttClientActor.tell(OpenConnection.of(connectionId, DittoHeaders.empty()), getRef()); - expectMsgClass(Status.Failure.class); + expectMsgClass(Duration.ofSeconds(10L), Status.Failure.class); mqttClientActor.tell(CloseConnection.of(connectionId, DittoHeaders.empty()), getRef()); expectMsg(DISCONNECTED_SUCCESS); diff --git a/services/utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/ddata/AbstractDDataHandler.java b/services/utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/ddata/AbstractDDataHandler.java index 25edc67ae0..1403407fc3 100644 --- a/services/utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/ddata/AbstractDDataHandler.java +++ b/services/utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/ddata/AbstractDDataHandler.java @@ -19,8 +19,6 @@ import org.eclipse.ditto.services.utils.ddata.DistributedData; import org.eclipse.ditto.services.utils.ddata.DistributedDataConfig; -import org.eclipse.ditto.services.utils.metrics.DittoMetrics; -import org.eclipse.ditto.services.utils.metrics.instruments.gauge.Gauge; import akka.actor.ActorRef; import akka.actor.ActorRefFactory; @@ -43,7 +41,6 @@ public abstract class AbstractDDataHandler> protected final SelfUniqueAddress selfUniqueAddress; private final String topicType; - private final Gauge ddataMetrics; protected AbstractDDataHandler(final DistributedDataConfig config, final ActorRefFactory actorRefFactory, @@ -53,7 +50,6 @@ protected AbstractDDataHandler(final DistributedDataConfig config, super(config, actorRefFactory, ddataExecutor); this.topicType = topicType; this.selfUniqueAddress = SelfUniqueAddress.apply(Cluster.get(actorSystem).selfUniqueAddress()); - ddataMetrics = DittoMetrics.gauge("pubsub-ddata-entries").tag("topic", topicType); } @Override @@ -63,10 +59,8 @@ public CompletionStage>> read( return get(readConsistency).thenApply(optional -> { if (optional.isPresent()) { final ORMultiMap mmap = optional.get(); - ddataMetrics.set((long) mmap.size()); return CollectionConverters.asJava(mmap.entries()); } else { - ddataMetrics.set(0L); return Map.of(); } });