chore(dev): Move some macros into vector-core

lib/vector-config/src/component/generate.rs

@@ -2,3 +2,14 @@
 pub trait GenerateConfig {
     fn generate_config() -> toml::Value;
 }
+
+#[macro_export]
+macro_rules! impl_generate_config_from_default {
+    ($type:ty) => {
+        impl $crate::component::GenerateConfig for $type {
+            fn generate_config() -> toml::value::Value {
+                toml::value::Value::try_from(&Self::default()).unwrap()
+            }
+        }
+    };
+}

lib/vector-core/src/lib.rs

@@ -69,3 +69,43 @@ pub(crate) use vector_common::{Error, Result};
 pub(crate) fn float_eq(l_value: f64, r_value: f64) -> bool {
     (l_value.is_nan() && r_value.is_nan()) || l_value.eq_ulps(&r_value, &1)
 }
+
+// These macros aren't actually usable in lib crates without some `vector_lib` shenanigans.
+// This test version won't be needed once all `InternalEvent`s implement `name()`.
+#[cfg(feature = "test")]
+#[macro_export]
+macro_rules! emit {
+    ($event:expr) => {
+        vector_lib::internal_event::emit(vector_lib::internal_event::DefaultName {
+            event: $event,
+            name: stringify!($event),
+        })
+    };
+}
+
+#[cfg(not(feature = "test"))]
+#[macro_export]
+macro_rules! emit {
+    ($event:expr) => {
+        vector_lib::internal_event::emit($event)
+    };
+}
+
+#[cfg(feature = "test")]
+#[macro_export]
+macro_rules! register {
+    ($event:expr) => {
+        vector_lib::internal_event::register(vector_lib::internal_event::DefaultName {
+            event: $event,
+            name: stringify!($event),
+        })
+    };
+}
+
+#[cfg(not(feature = "test"))]
+#[macro_export]
+macro_rules! register {
+    ($event:expr) => {
+        vector_lib::internal_event::register($event)
+    };
+}

lib/vector-lib/src/lib.rs

@@ -12,13 +12,15 @@ pub use vector_common::{
     TimeZone,
 };
 pub use vector_config as configurable;
+pub use vector_config::impl_generate_config_from_default;
 #[cfg(feature = "vrl")]
 pub use vector_core::compile_vrl;
 #[cfg(feature = "test")]
 pub use vector_core::event_test_util;
 pub use vector_core::{
-    buckets, default_data_dir, event, fanout, metric_tags, metrics, partition, quantiles, samples,
-    schema, serde, sink, source, tcp, tls, transform, update_counter, EstimatedJsonEncodedSizeOf,
+    buckets, default_data_dir, emit, event, fanout, metric_tags, metrics, partition, quantiles,
+    register, samples, schema, serde, sink, source, tcp, tls, transform, update_counter,
+    EstimatedJsonEncodedSizeOf,
 };
 pub use vector_lookup as lookup;
 pub use vector_stream as stream;

src/conditions/vrl.rs

@@ -1,6 +1,5 @@
-use vector_lib::compile_vrl;
 use vector_lib::configurable::configurable_component;
-use vector_lib::TimeZone;
+use vector_lib::{compile_vrl, emit, TimeZone};
 use vrl::compiler::runtime::{Runtime, RuntimeResult, Terminate};
 use vrl::compiler::{CompilationResult, CompileConfig, Program, TypeState, VrlRuntime};
 use vrl::diagnostic::Formatter;
@@ -10,7 +9,6 @@ use crate::config::LogNamespace;
 use crate::event::TargetEvents;
 use crate::{
     conditions::{Condition, Conditional, ConditionalConfig},
-    emit,
     event::{Event, VrlTarget},
     internal_events::VrlConditionExecutionError,
 };

src/config/mod.rs

@@ -247,17 +247,6 @@ impl Default for HealthcheckOptions {
     }
 }
 
-#[macro_export]
-macro_rules! impl_generate_config_from_default {
-    ($type:ty) => {
-        impl $crate::config::GenerateConfig for $type {
-            fn generate_config() -> toml::value::Value {
-                toml::value::Value::try_from(&Self::default()).unwrap()
-            }
-        }
-    };
-}
-
 /// Unique thing, like port, of which only one owner can be.
 #[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub enum Resource {

src/config/unit_test/unit_test_components.rs

@@ -16,7 +16,6 @@ use crate::{
     config::{
         AcknowledgementsConfig, SinkConfig, SinkContext, SourceConfig, SourceContext, SourceOutput,
     },
-    impl_generate_config_from_default,
     sinks::Healthcheck,
     sources,
 };

src/internal_events/adaptive_concurrency.rs

@@ -1,7 +1,6 @@
 use std::time::Duration;
 
 use metrics::{register_histogram, Histogram};
-use vector_lib::registered_event;
 
 #[derive(Clone, Copy)]
 pub struct AdaptiveConcurrencyLimitData {

src/internal_events/aws_cloudwatch_logs.rs

@@ -2,8 +2,6 @@ use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
-use crate::emit;
-
 #[derive(Debug)]
 pub struct AwsCloudwatchLogsMessageSizeError {
     pub size: usize,

src/internal_events/aws_ec2_metadata.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/aws_ecs_metrics.rs

@@ -1,9 +1,8 @@
 use std::borrow::Cow;
 
 use metrics::counter;
-use vector_lib::internal_event::InternalEvent;
 use vector_lib::{
-    internal_event::{error_stage, error_type},
+    internal_event::{error_stage, error_type, InternalEvent},
     json_size::JsonSize,
 };
 

src/internal_events/aws_kinesis.rs

@@ -1,5 +1,4 @@
 /// Used in both `aws_kinesis_streams` and `aws_kinesis_firehose` sinks
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};

src/internal_events/aws_sqs.rs

@@ -2,7 +2,6 @@ use metrics::counter;
 #[cfg(feature = "sources-aws_s3")]
 pub use s3::*;
 use vector_lib::internal_event::InternalEvent;
-
 #[cfg(any(feature = "sources-aws_s3", feature = "sources-aws_sqs"))]
 use vector_lib::internal_event::{error_stage, error_type};
 

src/internal_events/batch.rs

@@ -1,7 +1,5 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/codecs.rs

@@ -1,7 +1,5 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/common.rs

@@ -1,10 +1,8 @@
 use std::time::Instant;
 
-use crate::emit;
 use metrics::{counter, histogram};
 pub use vector_lib::internal_event::EventsReceived;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/conditions.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug, Copy, Clone)]

src/internal_events/datadog_metrics.rs

@@ -1,7 +1,5 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/datadog_traces.rs

@@ -1,7 +1,5 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/dedupe.rs

@@ -1,4 +1,3 @@
-use crate::emit;
 use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};
 
 #[derive(Debug)]

src/internal_events/dnstap.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/eventstoredb_metrics.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/exec.rs

@@ -1,6 +1,5 @@
 use std::time::Duration;
 
-use crate::emit;
 use metrics::{counter, histogram};
 use tokio::time::error::Elapsed;
 use vector_lib::internal_event::InternalEvent;

src/internal_events/file.rs

@@ -2,8 +2,6 @@ use metrics::{counter, gauge};
 use std::borrow::Cow;
 use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, UNINTENTIONAL};
 
-use crate::emit;
-
 #[cfg(any(feature = "sources-file", feature = "sources-kubernetes_logs"))]
 pub use self::source::*;
 
@@ -86,7 +84,7 @@ mod source {
     use vector_lib::file_source::FileSourceInternalEvents;
 
     use super::{FileOpen, InternalEvent};
-    use crate::emit;
+    use vector_lib::emit;
     use vector_lib::{
         internal_event::{error_stage, error_type},
         json_size::JsonSize,

src/internal_events/filter.rs

@@ -1,7 +1,5 @@
 use vector_lib::internal_event::{ComponentEventsDropped, Count, Registered, INTENTIONAL};
 
-use crate::register;
-
 vector_lib::registered_event! (
     FilterEventsDropped => {
         events_dropped: Registered<ComponentEventsDropped<'static, INTENTIONAL>>

src/internal_events/fluent.rs

@@ -1,8 +1,8 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type};
 
 use crate::sources::fluent::DecodeError;
-use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]
 pub struct FluentMessageReceived {

src/internal_events/gcp_pubsub.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 pub struct GcpPubsubConnectError {

src/internal_events/host_metrics.rs

@@ -1,6 +1,5 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/http.rs

@@ -3,7 +3,6 @@ use std::{error::Error, time::Duration};
 use http::Response;
 use metrics::{counter, histogram};
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,

src/internal_events/http_client.rs

@@ -7,7 +7,6 @@ use http::{
 use hyper::{body::HttpBody, Error};
 use metrics::{counter, histogram};
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/influxdb.rs

@@ -1,4 +1,3 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};

src/internal_events/journald.rs

@@ -1,7 +1,6 @@
 use metrics::counter;
 use vector_lib::codecs::decoding::BoxedFramingError;
 use vector_lib::internal_event::InternalEvent;
-
 use vector_lib::internal_event::{error_stage, error_type};
 
 #[derive(Debug)]

src/internal_events/kafka.rs

@@ -1,11 +1,10 @@
 use metrics::{counter, gauge};
 use vector_lib::{internal_event::InternalEvent, update_counter};
-use vrl::path::OwnedTargetPath;
-
 use vector_lib::{
     internal_event::{error_stage, error_type},
     json_size::JsonSize,
 };
+use vrl::path::OwnedTargetPath;
 
 #[derive(Debug)]
 pub struct KafkaBytesReceived<'a> {

src/internal_events/kubernetes_logs.rs

@@ -1,13 +1,12 @@
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
-use crate::emit;
-use crate::event::Event;
 use vector_lib::{
     internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL},
     json_size::JsonSize,
 };
 
+use crate::event::Event;
+
 #[derive(Debug)]
 pub struct KubernetesLogsEventsReceived<'a> {
     pub file: &'a str,

src/internal_events/log_to_metric.rs

@@ -2,8 +2,6 @@ use std::num::ParseFloatError;
 
 use metrics::counter;
 use vector_lib::internal_event::InternalEvent;
-
-use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 pub struct LogToMetricFieldNullError<'a> {

src/internal_events/loki.rs

@@ -1,4 +1,3 @@
-use crate::emit;
 use metrics::counter;
 use vector_lib::internal_event::{error_stage, error_type};
 use vector_lib::internal_event::{ComponentEventsDropped, InternalEvent, INTENTIONAL};

src/internal_events/lua.rs

@@ -1,9 +1,8 @@
 use metrics::{counter, gauge};
 use vector_lib::internal_event::InternalEvent;
+use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
-use crate::emit;
 use crate::transforms::lua::v2::BuildError;
-use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]
 pub struct LuaGcTriggered {

src/internal_events/metric_to_log.rs

@@ -1,8 +1,6 @@
 use metrics::counter;
 use serde_json::Error;
 use vector_lib::internal_event::InternalEvent;
-
-use crate::emit;
 use vector_lib::internal_event::{error_stage, error_type, ComponentEventsDropped, UNINTENTIONAL};
 
 #[derive(Debug)]