chore(vector-common): Move ExtraContext out of the binary crate

Moves the leaf module into vector-common. Call sites import it from vector_lib.

Author: bruceg

src/extra_context.rs lib/vector-common/src/extra_context.rssrc/extra_context.rs renamed to lib/vector-common/src/extra_context.rs

@@ -46,6 +46,8 @@ pub use event_data_eq::EventDataEq;
 #[cfg(any(test, feature = "test"))]
 pub mod event_test_util;
 
+pub mod extra_context;
+
 pub mod finalization;
 pub mod finalizer;
 pub use finalizer::EmptyStream;

lib/vector-common/src/lib.rs

@@ -11,8 +11,8 @@ pub use vector_buffers as buffers;
 pub use vector_common::event_test_util;
 pub use vector_common::{
     Error, NamedInternalEvent, Result, TimeZone, assert_event_data_eq, atomic, btreemap,
-    byte_size_of, byte_size_of::ByteSizeOf, conversion, counter, encode_logfmt, finalization,
-    finalizer, gauge, histogram, id, impl_event_data_eq, internal_event, json_size,
+    byte_size_of, byte_size_of::ByteSizeOf, conversion, counter, encode_logfmt, extra_context,
+    finalization, finalizer, gauge, histogram, id, impl_event_data_eq, internal_event, json_size,
     registered_event, request_metadata, sampling, sensitive_string, shutdown,
     spawn_in_current_span, stats, trigger,
 };

lib/vector-lib/src/lib.rs

@@ -18,6 +18,7 @@ use tokio::{
     sync::{MutexGuard, broadcast::error::RecvError},
 };
 use tokio_stream::wrappers::UnboundedReceiverStream;
+use vector_lib::extra_context::ExtraContext;
 
 #[cfg(feature = "api")]
 use crate::api;
@@ -26,7 +27,6 @@ use crate::internal_events::ApiStarted;
 use crate::{
     cli::{LogFormat, Opts, RootOpts, WatchConfigMethod, handle_config_errors},
     config::{self, Component, ComponentConfig, ComponentKind, Config, ConfigPath},
-    extra_context::ExtraContext,
     heartbeat,
     internal_events::{
         VectorConfigLoadError, VectorQuit, VectorStarted, VectorStopped, VectorStopping,

src/app.rs

@@ -309,7 +309,7 @@ fn run_validation(configuration: ValidationConfiguration, test_case_data_path: s
         let mut runner = Runner::from_configuration(
             configuration,
             test_case_data_path,
-            crate::extra_context::ExtraContext::default(),
+            vector_lib::extra_context::ExtraContext::default(),
         );
         runner.add_validator(StandardValidators::ComponentSpec);
 

src/components/validation/mod.rs

@@ -18,6 +18,7 @@ use tokio::{
 use tokio_util::codec::Encoder as _;
 use vector_lib::{
     EstimatedJsonEncodedSizeOf, codecs::encoding, config::LogNamespace, event::Event,
+    extra_context::ExtraContext,
 };
 
 pub use self::config::TopologyBuilder;
@@ -30,7 +31,6 @@ use crate::{
     codecs::Encoder,
     components::validation::{RunnerMetrics, TestCase},
     config::ConfigBuilder,
-    extra_context::ExtraContext,
     topology::RunningTopology,
 };
 

src/components/validation/runner/mod.rs

@@ -21,10 +21,9 @@ use vector_vrl_metrics::MetricsStorage;
 use super::{
     ComponentKey, DynValidatedSink, ProxyConfig, Resource, dot_graph::GraphConfig, schema,
 };
-use crate::{
-    extra_context::ExtraContext,
-    sinks::{Healthcheck, util::UriSerde},
-};
+use vector_lib::extra_context::ExtraContext;
+
+use crate::sinks::{Healthcheck, util::UriSerde};
 
 pub type BoxedSink = Box<dyn SinkConfig>;
 

src/config/sink.rs

@@ -18,7 +18,9 @@ use vector_lib::{
 use vector_vrl_metrics::MetricsStorage;
 
 use super::{ComponentKey, ProxyConfig, Resource, dot_graph::GraphConfig, schema};
-use crate::{SourceSender, extra_context::ExtraContext, shutdown::ShutdownSignal};
+use vector_lib::extra_context::ExtraContext;
+
+use crate::{SourceSender, shutdown::ShutdownSignal};
 
 pub type BoxedSource = Box<dyn SourceConfig>;
 

src/config/source.rs

@@ -22,8 +22,9 @@ use vector_lib::{
 };
 use vector_vrl_metrics::MetricsStorage;
 
+use vector_lib::extra_context::ExtraContext;
+
 use super::{ComponentKey, OutputId, dot_graph::GraphConfig, schema::Options as SchemaOptions};
-use crate::extra_context::ExtraContext;
 
 pub type BoxedTransform = Box<dyn TransformConfig>;
 

src/config/transform.rs

@@ -79,7 +79,6 @@ mod convert_config;
 pub mod cpu_time;
 pub mod encoding_transcode;
 pub mod enrichment_tables;
-pub mod extra_context;
 #[cfg(feature = "gcp")]
 pub mod gcp;
 pub(crate) mod graph;