chore(core): Allow log events to have a non-object root value (#12705)

Author: fuchsnj

Cargo.lock

@@ -22,7 +22,7 @@ fn benchmark_event_iterate(c: &mut Criterion) {
                     "key3": "value3"
                 }))
             },
-            |e| e.all_fields().count(),
+            |e| e.all_fields().unwrap().count(),
             BatchSize::SmallInput,
         )
     });
@@ -40,7 +40,7 @@ fn benchmark_event_iterate(c: &mut Criterion) {
                     "key3": "value3"
                 }))
             },
-            |e| e.all_fields().count(),
+            |e| e.all_fields().unwrap().count(),
             BatchSize::SmallInput,
         )
     });
@@ -57,7 +57,7 @@ fn benchmark_event_iterate(c: &mut Criterion) {
                     },
                 }))
             },
-            |e| e.all_fields().count(),
+            |e| e.all_fields().unwrap().count(),
             BatchSize::SmallInput,
         )
     });

benches/event.rs

@@ -42,7 +42,7 @@ fn route(c: &mut Criterion) {
     ] {
         fields.insert(String::from(alpha), Value::Bytes(Bytes::from(alpha)));
     }
-    let event = Event::from(LogEvent::from_parts(fields, EventMetadata::default()));
+    let event = Event::from(LogEvent::from_map(fields, EventMetadata::default()));
 
     let mut outputs = Vec::new();
     for name in [

benches/transform/route.rs

@@ -48,7 +48,7 @@ impl Encoder<Event> for LogfmtSerializer {
 
     fn encode(&mut self, event: Event, buffer: &mut BytesMut) -> Result<(), Self::Error> {
         let log = event.as_log();
-        let string = encode_logfmt::to_string(log.as_map())?;
+        let string = encode_logfmt::encode_value(log.value())?;
         buffer.extend_from_slice(string.as_bytes());
 
         Ok(())

lib/codecs/src/encoding/format/logfmt.rs

@@ -1,5 +1,4 @@
 mod jit;
-
 use std::borrow::Cow;
 use std::iter::Cloned;
 use std::slice::Iter;
@@ -230,6 +229,12 @@ impl<'a> From<&'a str> for BorrowedSegment<'a> {
     }
 }
 
+impl<'a> From<&'a String> for BorrowedSegment<'a> {
+    fn from(field: &'a String) -> Self {
+        BorrowedSegment::field(field.as_str())
+    }
+}
+
 impl From<usize> for BorrowedSegment<'_> {
     fn from(index: usize) -> Self {
         BorrowedSegment::index(index)
@@ -306,6 +311,29 @@ impl<'a> From<BorrowedSegment<'a>> for OwnedSegment {
     }
 }
 
+#[cfg(any(test, feature = "arbitrary"))]
+impl quickcheck::Arbitrary for BorrowedSegment<'static> {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
+        match usize::arbitrary(g) % 2 {
+            0 => BorrowedSegment::Index(usize::arbitrary(g) % 20),
+            _ => BorrowedSegment::Field(String::arbitrary(g).into()),
+        }
+    }
+
+    fn shrink(&self) -> Box<dyn Iterator<Item = Self>> {
+        match self {
+            BorrowedSegment::Invalid => Box::new(std::iter::empty()),
+            BorrowedSegment::Index(index) => Box::new(index.shrink().map(BorrowedSegment::Index)),
+            BorrowedSegment::Field(field) => Box::new(
+                field
+                    .to_string()
+                    .shrink()
+                    .map(|f| BorrowedSegment::Field(f.into())),
+            ),
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

lib/lookup/src/lookup_v2/mod.rs

@@ -16,6 +16,7 @@ prost = "0.10.3"
 prost-types = "0.10.1"
 snafu = { version = "0.7" }
 vector_common = { path = "../vector-common", features = ["btreemap"] }
+value = { path = "../value", features = ["json"] }
 
 [build-dependencies]
 prost-build = "0.10.3"

lib/prometheus-parser/Cargo.toml

@@ -32,6 +32,11 @@ test = []
 arbitrary = ["quickcheck"]
 
 [dev-dependencies]
+async-graphql = { version = "3.0.38", default-features = false }
 indoc = { version = "1.0.6", default-features = false }
 quickcheck = "1.0.3"
 lookup = { path = "../lookup", default-features = false, features = ["arbitrary"] }
+serde = { version = "1.0.137", default-features = false, features = ["derive", "rc"]}
+serde_json = { version = "1.0.81"}
+toml = { version = "0.5.9", default-features = false }
+mlua = { version = "0.7.4", default-features = false, features = ["lua54", "send", "vendored"]}