chore(dev): Add wrapper for enrichment to vector-lib (#18977)

Author: bruceg

Cargo.lock

@@ -130,7 +130,6 @@ pin-project.workspace = true
 
 # Internal libs
 dnsmsg-parser = { path = "lib/dnsmsg-parser", optional = true }
-enrichment = { path = "lib/enrichment" }
 fakedata = { path = "lib/fakedata", optional = true }
 file-source = { path = "lib/file-source", optional = true }
 lookup = { package = "vector-lookup", path = "lib/vector-lookup" }

Cargo.toml

@@ -7,6 +7,7 @@ publish = false
 
 [dependencies]
 codecs = { path = "../codecs", default-features = false }
+enrichment = { path = "../enrichment" }
 vector-buffers = { path = "../vector-buffers", default-features = false }
 vector-common = { path = "../vector-common" }
 vector-config = { path = "../vector-config" }

lib/vector-lib/Cargo.toml

@@ -1,4 +1,5 @@
 pub use codecs;
+pub use enrichment;
 pub use vector_buffers as buffers;
 pub use vector_common::{
     assert_event_data_eq, btreemap, byte_size_of, byte_size_of::ByteSizeOf, conversion,

lib/vector-lib/src/lib.rs

@@ -38,7 +38,10 @@ impl Conditional for DatadogSearchRunner {
 }
 
 impl ConditionalConfig for DatadogSearchConfig {
-    fn build(&self, _enrichment_tables: &enrichment::TableRegistry) -> crate::Result<Condition> {
+    fn build(
+        &self,
+        _enrichment_tables: &vector_lib::enrichment::TableRegistry,
+    ) -> crate::Result<Condition> {
         let node = parse(&self.source)?;
         let matcher = as_log(build_matcher(&node, &EventFilter));
 

src/conditions/datadog_search.rs

@@ -116,7 +116,10 @@ pub enum ConditionConfig {
 }
 
 impl ConditionConfig {
-    pub fn build(&self, enrichment_tables: &enrichment::TableRegistry) -> crate::Result<Condition> {
+    pub fn build(
+        &self,
+        enrichment_tables: &vector_lib::enrichment::TableRegistry,
+    ) -> crate::Result<Condition> {
         match self {
             ConditionConfig::IsLog => Ok(Condition::IsLog),
             ConditionConfig::IsMetric => Ok(Condition::IsMetric),
@@ -148,7 +151,10 @@ pub trait Conditional: std::fmt::Debug {
 }
 
 pub trait ConditionalConfig: std::fmt::Debug + Send + Sync + dyn_clone::DynClone {
-    fn build(&self, enrichment_tables: &enrichment::TableRegistry) -> crate::Result<Condition>;
+    fn build(
+        &self,
+        enrichment_tables: &vector_lib::enrichment::TableRegistry,
+    ) -> crate::Result<Condition>;
 }
 
 dyn_clone::clone_trait_object!(ConditionalConfig);
@@ -184,7 +190,10 @@ pub enum AnyCondition {
 }
 
 impl AnyCondition {
-    pub fn build(&self, enrichment_tables: &enrichment::TableRegistry) -> crate::Result<Condition> {
+    pub fn build(
+        &self,
+        enrichment_tables: &vector_lib::enrichment::TableRegistry,
+    ) -> crate::Result<Condition> {
         match self {
             AnyCondition::String(s) => {
                 let vrl_config = VrlConfig {

src/conditions/mod.rs

@@ -30,7 +30,10 @@ pub struct VrlConfig {
 impl_generate_config_from_default!(VrlConfig);
 
 impl ConditionalConfig for VrlConfig {
-    fn build(&self, enrichment_tables: &enrichment::TableRegistry) -> crate::Result<Condition> {
+    fn build(
+        &self,
+        enrichment_tables: &vector_lib::enrichment::TableRegistry,
+    ) -> crate::Result<Condition> {
         // TODO(jean): re-add this to VRL
         // let constraint = TypeConstraint {
         //     allow_any: false,
@@ -43,7 +46,7 @@ impl ConditionalConfig for VrlConfig {
 
         let functions = vrl::stdlib::all()
             .into_iter()
-            .chain(enrichment::vrl_functions())
+            .chain(vector_lib::enrichment::vrl_functions())
             .chain(vector_vrl_functions::all())
             .collect::<Vec<_>>();
 

src/conditions/vrl.rs

@@ -37,5 +37,5 @@ pub trait EnrichmentTableConfig: NamedComponent + core::fmt::Debug + Send + Sync
     async fn build(
         &self,
         globals: &GlobalOptions,
-    ) -> crate::Result<Box<dyn enrichment::Table + Send + Sync>>;
+    ) -> crate::Result<Box<dyn vector_lib::enrichment::Table + Send + Sync>>;
 }

src/config/enrichment_table.rs

@@ -77,7 +77,7 @@ impl Graph {
                 Node::Transform {
                     in_ty: transform.inner.input().data_type(),
                     outputs: transform.inner.outputs(
-                        enrichment::TableRegistry::default(),
+                        vector_lib::enrichment::TableRegistry::default(),
                         &[(id.into(), schema::Definition::any())],
                         schema.log_namespace(),
                     ),

src/config/graph.rs

@@ -105,7 +105,7 @@ pub struct TransformContext {
 
     pub globals: GlobalOptions,
 
-    pub enrichment_tables: enrichment::TableRegistry,
+    pub enrichment_tables: vector_lib::enrichment::TableRegistry,
 
     /// Tracks the schema IDs assigned to schemas exposed by the transform.
     ///
@@ -193,7 +193,7 @@ pub trait TransformConfig: DynClone + NamedComponent + core::fmt::Debug + Send +
     /// of events flowing through the transform.
     fn outputs(
         &self,
-        enrichment_tables: enrichment::TableRegistry,
+        enrichment_tables: vector_lib::enrichment::TableRegistry,
         input_definitions: &[(OutputId, schema::Definition)],
 
         // This only exists for transforms that create logs from non-logs, to know which namespace
@@ -250,7 +250,7 @@ pub fn get_transform_output_ids<T: TransformConfig + ?Sized>(
 ) -> impl Iterator<Item = OutputId> + '_ {
     transform
         .outputs(
-            enrichment::TableRegistry::default(),
+            vector_lib::enrichment::TableRegistry::default(),
             &[(key.clone().into(), schema::Definition::any())],
             global_log_namespace,
         )