From 30217c752536b4511015cebb70baf572008690f8 Mon Sep 17 00:00:00 2001 From: Arun Pidugu Date: Thu, 15 Aug 2024 16:09:23 -0400 Subject: [PATCH] cargo fmt --- lib/vector-api-client/src/lib.rs | 1 - lib/vector-core/src/event/log_event.rs | 12 +++++++++--- lib/vector-core/src/event/metadata.rs | 12 ++++++------ lib/vector-core/src/event/proto.rs | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/vector-api-client/src/lib.rs b/lib/vector-api-client/src/lib.rs index 1a59f1271cf933..e31401172bdc9d 100644 --- a/lib/vector-api-client/src/lib.rs +++ b/lib/vector-api-client/src/lib.rs @@ -21,4 +21,3 @@ pub mod test; pub use client::*; pub use subscription::*; - diff --git a/lib/vector-core/src/event/log_event.rs b/lib/vector-core/src/event/log_event.rs index 3dddda477baa4a..9b3e5f5f14c1b1 100644 --- a/lib/vector-core/src/event/log_event.rs +++ b/lib/vector-core/src/event/log_event.rs @@ -817,10 +817,10 @@ impl tracing::field::Visit for LogEvent { #[cfg(test)] mod test { - use uuid::Version; use super::*; use crate::test_util::open_fixture; use lookup::event_path; + use uuid::Version; use vrl::{btreemap, value}; // The following two tests assert that renaming a key has no effect if the @@ -1185,10 +1185,16 @@ mod test { fn metadata_set_unique_uuid_v7_source_event_id() { // Check if event id is UUID v7 let log1 = LogEvent::default(); - assert_eq!(log1.metadata().source_event_id().get_version(), Some(Version::SortRand)); + assert_eq!( + log1.metadata().source_event_id().get_version(), + Some(Version::SortRand) + ); // Check if event id is unique on creation let log2 = LogEvent::default(); - assert_ne!(log1.metadata().source_event_id(), log2.metadata().source_event_id()); + assert_ne!( + log1.metadata().source_event_id(), + log2.metadata().source_event_id() + ); } } diff --git a/lib/vector-core/src/event/metadata.rs b/lib/vector-core/src/event/metadata.rs index caedbf177f6518..1010c97029a880 100644 --- a/lib/vector-core/src/event/metadata.rs +++ b/lib/vector-core/src/event/metadata.rs @@ -1,19 +1,19 @@ #![deny(missing_docs)] -use std::{borrow::Cow, collections::BTreeMap, fmt, sync::Arc}; +use super::{BatchNotifier, EventFinalizer, EventFinalizers, EventStatus, ObjectMap}; +use crate::{ + config::{LogNamespace, OutputId}, + schema, +}; use lookup::OwnedTargetPath; use serde::{Deserialize, Serialize}; +use std::{borrow::Cow, collections::BTreeMap, fmt, sync::Arc}; use uuid::Uuid; use vector_common::{byte_size_of::ByteSizeOf, config::ComponentKey, EventDataEq}; use vrl::{ compiler::SecretTarget, value::{KeyString, Kind, Value}, }; -use super::{BatchNotifier, EventFinalizer, EventFinalizers, EventStatus, ObjectMap}; -use crate::{ - config::{LogNamespace, OutputId}, - schema, -}; const DATADOG_API_KEY: &str = "datadog_api_key"; const SPLUNK_HEC_TOKEN: &str = "splunk_hec_token"; diff --git a/lib/vector-core/src/event/proto.rs b/lib/vector-core/src/event/proto.rs index 2a294a323e7e67..3c1d1c49f397d9 100644 --- a/lib/vector-core/src/event/proto.rs +++ b/lib/vector-core/src/event/proto.rs @@ -641,7 +641,7 @@ impl From for Metadata { source_type: source_type.map(|s| s.to_string()), upstream_id: upstream_id.map(|id| id.as_ref().clone()).map(Into::into), secrets, - source_event_id: source_event_id.into() + source_event_id: source_event_id.into(), } } }