include jvmId in archived recording event

cryostatio · Sep 5, 2024 · 5a2acc3 · 5a2acc3
1 parent 08bb790
commit 5a2acc3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/io/cryostat/recordings/ActiveRecording.java b/src/main/java/io/cryostat/recordings/ActiveRecording.java
@@ -243,8 +243,8 @@ public record ArchivedRecordingEvent(
             // has disappeared and we are emitting an event regarding an archived recording
             // originally sourced from that target, or if we are accepting a recording upload from a
             // client.
-            // This should embed the target jvmId and optionally the database ID.
-            public record Payload(String target, ArchivedRecordings.ArchivedRecording recording) {
+            public record Payload(
+                    String target, String jvmId, ArchivedRecordings.ArchivedRecording recording) {
                 public Payload {
                     Objects.requireNonNull(recording);
                 }
@@ -253,6 +253,13 @@ public static Payload of(
                         URI connectUrl, ArchivedRecordings.ArchivedRecording recording) {
                     return new Payload(
                             Optional.ofNullable(connectUrl).map(URI::toString).orElse(null),
+                            Optional.ofNullable(connectUrl)
+                                    .flatMap(
+                                            url ->
+                                                    Target.find("connectUrl", url)
+                                                            .<Target>singleResultOptional())
+                                    .map(t -> t.jvmId)
+                                    .orElse(null),
                             recording);
                 }
             }

diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -1203,17 +1203,16 @@ public ArchivedRecording updateArchivedRecordingMetadata(
                         size,
                         lastModified.getEpochSecond());
 
-        notifyArchiveMetadataUpdate(updatedRecording);
+        notifyArchiveMetadataUpdate(jvmId, updatedRecording);
         return updatedRecording;
     }
 
-    private void notifyArchiveMetadataUpdate(ArchivedRecording updatedRecording) {
-
+    private void notifyArchiveMetadataUpdate(String jvmId, ArchivedRecording updatedRecording) {
         var event =
                 new ArchivedRecordingEvent(
                         ActiveRecordings.RecordingEventCategory.METADATA_UPDATED,
                         new ArchivedRecordingEvent.Payload(
-                                updatedRecording.downloadUrl(), updatedRecording));
+                                updatedRecording.downloadUrl(), jvmId, updatedRecording));
         bus.publish(event.category().category(), event.payload().recording());
         bus.publish(
                 MessagingServer.class.getName(),