Issue #106: Let 'ConnectionPersistenceActor' handle 'AddConnectionLog…

…Entry'. Signed-off-by: Juergen Fickel <juergen.fickel@bosch.io>
eclipse-ditto · Nov 11, 2021 · d842488 · d842488
1 parent 0fb1522
commit d842488
Show file tree

Hide file tree

Showing 4 changed files with 982 additions and 935 deletions.
diff --git a/connectivity/service/pom.xml b/connectivity/service/pom.xml
@@ -186,6 +186,13 @@ jmh-generator-annprocess). jmh-generator-annprocess overwrites the whole META-IN
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.ditto</groupId>
+            <artifactId>ditto-internal-utils-akka</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-test</artifactId>

diff --git a/.../eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java b/.../eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
@@ -41,6 +41,7 @@
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.connectivity.api.BaseClientState;
+import org.eclipse.ditto.connectivity.api.messaging.monitoring.logs.AddConnectionLogEntry;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.ConnectionLifecycle;
@@ -632,11 +633,18 @@ protected Receive matchAnyAfterInitialization() {
                 // maintain client actor refs
                 .match(ActorRef.class, this::addClientActor)
                 .match(Terminated.class, this::removeClientActor)
+                .match(AddConnectionLogEntry.class, this::handleAddConnectionLogEntry)
                 .build()
                 .orElse(createInitializationAndConfigUpdateBehavior())
                 .orElse(super.matchAnyAfterInitialization());
     }
 
+    private void handleAddConnectionLogEntry(final AddConnectionLogEntry addConnectionLogEntry) {
+        final var logEntry = addConnectionLogEntry.getLogEntry();
+        log.withCorrelationId(logEntry.getCorrelationId()).debug("Handling <{}>.", addConnectionLogEntry);
+        connectionLogger.logEntry(logEntry);
+    }
+
     @Override
     protected Receive matchAnyWhenDeleted() {
         return createInitializationAndConfigUpdateBehavior()