Fixed missing publish metrics for published messages without

issued/requested acknowledgements Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · May 11, 2021 · 7d75817 · 7d75817
1 parent 740abd2
commit 7d75817
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...ivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Sending.java b/...ivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Sending.java
@@ -89,11 +89,8 @@ public Optional<CompletionStage<CommandResponse>> monitorAndAcknowledge(
                     .or(() -> ackFromNullResponse)
                     .or(() -> Optional.ofNullable(result).flatMap(SendResult::getCommandResponse));
 
+            updateSendMonitor(getSentFailure(error, ackFromNullResponse.isPresent()));
             responseOrAlternatives.ifPresent(commandResponse -> updateAckMonitor(getAckFailure(commandResponse)));
-
-            if (error != null || responseOrAlternatives.isPresent()) {
-                updateSendMonitor(getSentFailure(error, ackFromNullResponse.isPresent()));
-            }
             return responseOrAlternatives.orElse(null);
         }));
     }

diff --git a/...y/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/SendingTest.java b/...y/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/SendingTest.java
@@ -282,7 +282,7 @@ public void monitorLiveResponseSendFailureKeepOriginalResponse() {
     }
 
     @Test
-    public void monitorNothingAsShouldNotAcknowledgeAndOriginalResponseIsNull() {
+    public void monitorNoAckAsShouldNotAcknowledgeAndOriginalResponseIsNull() {
         sendingContext = SendingContext.newBuilder()
                 .mappedOutboundSignal(mappedOutboundSignal)
                 .externalMessage(externalMessage)
@@ -298,7 +298,7 @@ public void monitorNothingAsShouldNotAcknowledgeAndOriginalResponseIsNull() {
 
         final Optional<CompletionStage<CommandResponse>> result = underTest.monitorAndAcknowledge(exceptionConverter);
 
-        Mockito.verifyNoInteractions(publishedMonitor, acknowledgedMonitor);
+        Mockito.verifyNoInteractions(acknowledgedMonitor);
         assertThat(result)
                 .hasValueSatisfying(resultFuture -> assertThat(resultFuture).isCompletedWithValue(commandResponse));
     }