From bdd82f723717220a56752c5e51ab21c5b844b20e Mon Sep 17 00:00:00 2001
From: Arun Pidugu <arun.pidugu@datadoghq.com>
Date: Tue, 10 Sep 2024 14:48:19 -0400
Subject: [PATCH] fix test + re-add error logic for certain cases

---
 lib/vector-core/src/event/log_event.rs |  5 ++++-
 lib/vector-core/src/event/proto.rs     | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/vector-core/src/event/log_event.rs b/lib/vector-core/src/event/log_event.rs
index 9b3e5f5f14c1b..03b8908ff58b0 100644
--- 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
index a61ec469a3567..0c05448931efa 100644
--- 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
     }