Merge branch 'master' into enhancement/loki-support-healthcheck.uri

simonhammes · web-flow · commit e14fd456de11 · 2026-02-13T23:43:15.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -128,6 +128,7 @@ members = [
   "lib/vector-stream",
   "lib/vector-tap",
   "lib/vector-top",
+  "lib/vector-vrl/category",
   "lib/vector-vrl/cli",
   "lib/vector-vrl/functions",
   "lib/vector-vrl/tests",
@@ -207,6 +208,7 @@ vector-config-common = { path = "lib/vector-config-common" }
 vector-config-macros = { path = "lib/vector-config-macros" }
 vector-common-macros = { path = "lib/vector-common-macros" }
 vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
+vector-vrl-category = { path = "lib/vector-vrl/category" }
 vector-vrl-functions = { path = "lib/vector-vrl/functions" }
 vrl = { git = "https://github.com/vectordotdev/vrl.git", branch = "main", features = ["arbitrary", "cli", "test", "test_framework"] }
 mock_instant = { version = "0.6" }
diff --git a/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs b/lib/dnstap-parser/src/vrl_functions/parse_dnstap.rs
@@ -47,6 +47,10 @@ impl Function for ParseDnstap {
         ]
     }
 
+    fn category(&self) -> &'static str {
+        Category::Parse.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::OBJECT
     }
diff --git a/lib/enrichment/Cargo.toml b/lib/enrichment/Cargo.toml
@@ -12,3 +12,4 @@ const-str.workspace = true
 dyn-clone = { version = "1.0.20", default-features = false }
 indoc.workspace = true
 vrl.workspace = true
+vector-vrl-category.workspace = true
diff --git a/lib/enrichment/src/find_enrichment_table_records.rs b/lib/enrichment/src/find_enrichment_table_records.rs
@@ -1,5 +1,6 @@
 use std::{collections::BTreeMap, sync::LazyLock};
 
+use vector_vrl_category::Category;
 use vrl::prelude::*;
 
 use crate::{
@@ -98,6 +99,10 @@ impl Function for FindEnrichmentTableRecords {
         )
     }
 
+    fn category(&self) -> &'static str {
+        Category::Enrichment.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::ARRAY
     }
diff --git a/lib/enrichment/src/get_enrichment_table_record.rs b/lib/enrichment/src/get_enrichment_table_record.rs
@@ -1,5 +1,6 @@
 use std::{collections::BTreeMap, sync::LazyLock};
 
+use vector_vrl_category::Category;
 use vrl::prelude::*;
 
 use crate::{
@@ -103,6 +104,10 @@ impl Function for GetEnrichmentTableRecord {
         ]
     }
 
+    fn category(&self) -> &'static str {
+        Category::Enrichment.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::OBJECT
     }
diff --git a/lib/vector-vrl-metrics/Cargo.toml b/lib/vector-vrl-metrics/Cargo.toml
@@ -14,3 +14,4 @@ vector-core = { path = "../vector-core", default-features = false, features = ["
 vector-common = { path = "../vector-common", default-features = false }
 tokio.workspace = true
 tokio-stream.workspace = true
+vector-vrl-category.workspace = true
diff --git a/lib/vector-vrl-metrics/src/aggregate_vector_metrics.rs b/lib/vector-vrl-metrics/src/aggregate_vector_metrics.rs
@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 use std::sync::LazyLock;
+use vector_vrl_category::Category;
 use vrl::prelude::expression::Expr;
 use vrl::value;
 
@@ -82,6 +83,10 @@ impl Function for AggregateVectorMetrics {
         )
     }
 
+    fn category(&self) -> &'static str {
+        Category::Metrics.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::FLOAT | kind::NULL
     }
diff --git a/lib/vector-vrl-metrics/src/find_vector_metrics.rs b/lib/vector-vrl-metrics/src/find_vector_metrics.rs
@@ -1,4 +1,5 @@
 use std::{collections::BTreeMap, sync::LazyLock};
+use vector_vrl_category::Category;
 use vrl::prelude::expression::Expr;
 
 use vrl::prelude::*;
@@ -58,6 +59,10 @@ impl Function for FindVectorMetrics {
         )
     }
 
+    fn category(&self) -> &'static str {
+        Category::Metrics.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::ARRAY
     }
diff --git a/lib/vector-vrl-metrics/src/get_vector_metric.rs b/lib/vector-vrl-metrics/src/get_vector_metric.rs
@@ -1,5 +1,6 @@
 use std::{collections::BTreeMap, sync::LazyLock};
 
+use vector_vrl_category::Category;
 use vrl::prelude::{expression::Expr, *};
 
 use crate::common::{
@@ -55,6 +56,10 @@ impl Function for GetVectorMetric {
         )
     }
 
+    fn category(&self) -> &'static str {
+        Category::Metrics.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::OBJECT | kind::NULL
     }
diff --git a/lib/vector-vrl/category/Cargo.toml b/lib/vector-vrl/category/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "vector-vrl-category"
+version = "0.1.0"
+authors = ["Vector Contributors <vector@datadoghq.com>"]
+edition = "2024"
+publish = false
+license = "MPL-2.0"
+
+[dependencies]
+strum = { version = "0.27", features = ["derive"] }
diff --git a/lib/vector-vrl/category/src/lib.rs b/lib/vector-vrl/category/src/lib.rs
@@ -0,0 +1,16 @@
+use strum::AsRefStr;
+
+/// Category classification for Vector-specific VRL functions.
+///
+/// This enum complements the categories defined in the VRL stdlib,
+/// providing Vector-specific categories for enrichment, metrics, and event functions.
+#[derive(Debug, Clone, Copy, AsRefStr)]
+#[strum(serialize_all = "PascalCase")]
+pub enum Category {
+    /// Enrichment table operations
+    Enrichment,
+    /// Event metadata and secret management
+    Event,
+    /// Internal Vector metrics operations
+    Metrics,
+}
diff --git a/lib/vector-vrl/functions/Cargo.toml b/lib/vector-vrl/functions/Cargo.toml
@@ -12,6 +12,7 @@ vrl.workspace = true
 enrichment = { path = "../../enrichment" }
 dnstap-parser = { path = "../../dnstap-parser", optional = true }
 vector-vrl-metrics = { path = "../../vector-vrl-metrics", optional = true }
+vector-vrl-category.workspace = true
 
 [features]
 default = []
diff --git a/lib/vector-vrl/functions/src/get_secret.rs b/lib/vector-vrl/functions/src/get_secret.rs
@@ -1,3 +1,4 @@
+use vector_vrl_category::Category;
 use vrl::prelude::*;
 
 fn get_secret(ctx: &mut Context, key: Value) -> std::result::Result<Value, ExpressionError> {
@@ -21,6 +22,10 @@ impl Function for GetSecret {
         "Returns the value of the given secret from an event."
     }
 
+    fn category(&self) -> &'static str {
+        Category::Event.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::BYTES | kind::NULL
     }
diff --git a/lib/vector-vrl/functions/src/remove_secret.rs b/lib/vector-vrl/functions/src/remove_secret.rs
@@ -1,3 +1,4 @@
+use vector_vrl_category::Category;
 use vrl::prelude::*;
 
 fn remove_secret(ctx: &mut Context, key: Value) -> std::result::Result<Value, ExpressionError> {
@@ -18,6 +19,10 @@ impl Function for RemoveSecret {
         "Removes a secret from an event."
     }
 
+    fn category(&self) -> &'static str {
+        Category::Event.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::NULL
     }
diff --git a/lib/vector-vrl/functions/src/set_secret.rs b/lib/vector-vrl/functions/src/set_secret.rs
@@ -1,3 +1,4 @@
+use vector_vrl_category::Category;
 use vrl::prelude::*;
 
 fn set_secret(
@@ -25,6 +26,10 @@ impl Function for SetSecret {
         "Sets the given secret in the event."
     }
 
+    fn category(&self) -> &'static str {
+        Category::Event.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::NULL
     }
diff --git a/lib/vector-vrl/functions/src/set_semantic_meaning.rs b/lib/vector-vrl/functions/src/set_semantic_meaning.rs
@@ -3,6 +3,7 @@ use std::{
     ops::{Deref, DerefMut},
 };
 
+use vector_vrl_category::Category;
 use vrl::{
     diagnostic::Label,
     path::{OwnedTargetPath, PathPrefix},
@@ -46,6 +47,10 @@ impl Function for SetSemanticMeaning {
         "}
     }
 
+    fn category(&self) -> &'static str {
+        Category::Event.as_ref()
+    }
+
     fn return_kind(&self) -> u16 {
         kind::NULL
     }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ impl Function for ParseDnstap {`
`47`	`47`	`]`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ fn category(&self) -> &'static str {`
	`51`	`+ Category::Parse.as_ref()`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`fn return_kind(&self) -> u16 {`
`51`	`55`	`kind::OBJECT`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`use std::{collections::BTreeMap, sync::LazyLock};`
`2`	`2`
	`3`	`+use vector_vrl_category::Category;`
`3`	`4`	`use vrl::prelude::*;`
`4`	`5`
`5`	`6`	`use crate::{`
`@@ -98,6 +99,10 @@ impl Function for FindEnrichmentTableRecords {`
`98`	`99`	`)`
`99`	`100`	`}`
`100`	`101`
	`102`	`+ fn category(&self) -> &'static str {`
	`103`	`+ Category::Enrichment.as_ref()`
	`104`	`+ }`
	`105`	`+`
`101`	`106`	`fn return_kind(&self) -> u16 {`
`102`	`107`	`kind::ARRAY`
`103`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`use std::collections::BTreeMap;`
`2`	`2`	`use std::sync::LazyLock;`
	`3`	`+use vector_vrl_category::Category;`
`3`	`4`	`use vrl::prelude::expression::Expr;`
`4`	`5`	`use vrl::value;`
`5`	`6`
`@@ -82,6 +83,10 @@ impl Function for AggregateVectorMetrics {`
`82`	`83`	`)`
`83`	`84`	`}`
`84`	`85`
	`86`	`+ fn category(&self) -> &'static str {`
	`87`	`+ Category::Metrics.as_ref()`
	`88`	`+ }`
	`89`	`+`
`85`	`90`	`fn return_kind(&self) -> u16 {`
`86`	`91`	`kind::FLOAT \| kind::NULL`
`87`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use std::{collections::BTreeMap, sync::LazyLock};`
	`2`	`+use vector_vrl_category::Category;`
`2`	`3`	`use vrl::prelude::expression::Expr;`
`3`	`4`
`4`	`5`	`use vrl::prelude::*;`
`@@ -58,6 +59,10 @@ impl Function for FindVectorMetrics {`
`58`	`59`	`)`
`59`	`60`	`}`
`60`	`61`
	`62`	`+ fn category(&self) -> &'static str {`
	`63`	`+ Category::Metrics.as_ref()`
	`64`	`+ }`
	`65`	`+`
`61`	`66`	`fn return_kind(&self) -> u16 {`
`62`	`67`	`kind::ARRAY`
`63`	`68`	`}`