fix test + re-add error logic for certain cases

vectordotdev · Sep 10, 2024 · bdd82f7 · bdd82f7
1 parent 9563290
commit bdd82f7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/vector-core/src/event/log_event.rs b/lib/vector-core/src/event/log_event.rs
@@ -1186,7 +1186,10 @@ mod test {
         // Check if event id is UUID v7
         let log1 = LogEvent::default();
         assert_eq!(
-            log1.metadata().source_event_id().get_version(),
+            log1.metadata()
+                .source_event_id()
+                .expect("source_event_id should be auto-generated for new events")
+                .get_version(),
             Some(Version::SortRand)
         );
 

diff --git a/lib/vector-core/src/event/proto.rs b/lib/vector-core/src/event/proto.rs
@@ -675,7 +675,22 @@ impl From<Metadata> for EventMetadata {
             metadata = metadata.with_origin_metadata(origin_metadata.into());
         }
 
-        metadata = metadata.with_source_event_id(Uuid::from_slice(&value.source_event_id).ok());
+        let maybe_source_event_id = if value.source_event_id.is_empty() {
+            None
+        } else {
+            match Uuid::from_slice(&value.source_event_id) {
+                Ok(id) => Some(id),
+                Err(error) => {
+                    error!(
+                        message = "Failed to parse source_event_id: {}",
+                        %error,
+                        internal_log_rate_limit = true
+                    );
+                    None
+                }
+            }
+        };
+        metadata = metadata.with_source_event_id(maybe_source_event_id);
 
         metadata
     }