From 5d8e5267b2537dd0611a8d1815472c71147caf03 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Thu, 12 Sep 2024 15:05:23 -0400
Subject: [PATCH] fix(metadata): merge 'source_event_id's

---
 lib/vector-core/src/event/metadata.rs | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs
index cd2c1d1dc8b36..5d44b8236aafb 100644
--- a/lib/vector-core/src/event/metadata.rs
+++ b/lib/vector-core/src/event/metadata.rs
@@ -325,6 +325,17 @@ impl EventMetadata {
     pub fn merge(&mut self, other: Self) {
         self.finalizers.merge(other.finalizers);
         self.secrets.merge(other.secrets);
+
+        // Update `source_event_id` if necessary.
+        match (self.source_event_id, other.source_event_id) {
+            (None, Some(id)) => {
+                self.source_event_id = Some(id);
+            }
+            (Some(uuid1), Some(uuid2)) if uuid2 < uuid1 => {
+                self.source_event_id = Some(uuid2);
+            }
+            _ => {} // Keep the existing value.
+        };
     }
 
     /// Update the finalizer(s) status.
@@ -523,4 +534,22 @@ mod test {
         assert_eq!(a.get("key-b").unwrap().as_ref(), "value-b1");
         assert_eq!(a.get("key-c").unwrap().as_ref(), "value-c2");
     }
+
+    #[test]
+    fn metadata_source_event_id_merging() {
+        let m1 = EventMetadata::default();
+        let m2 = EventMetadata::default();
+
+        {
+            let mut merged = m1.clone();
+            merged.merge(m2.clone());
+            assert_eq!(merged.source_event_id, m1.source_event_id);
+        }
+
+        {
+            let mut merged = m2.clone();
+            merged.merge(m1.clone());
+            assert_eq!(merged.source_event_id, m1.source_event_id);
+        }
+    }
 }