Revert

Author: ardatan

Cargo.lock

@@ -119,7 +119,7 @@ impl StableOverrideContext {
 /// It's intended to be used as a shared state in the router.
 pub struct OverrideLabelsEvaluator {
     static_enabled_labels: HashSet<String>,
-    expressions: HashMap<String, Expression>,
+    expressions: HashMap<String, VrlProgram>,
 }
 
 impl OverrideLabelsEvaluator {
@@ -174,7 +174,7 @@ impl OverrideLabelsEvaluator {
         let mut ctx = VrlContext::new(&mut target, &mut state, &timezone);
 
         for (label, expression) in &self.expressions {
-            match expression.execute_with_context(&mut ctx) {
+            match expression.resolve(&mut ctx) {
                 Ok(evaluated_value) => match evaluated_value {
                     VrlValue::Boolean(true) => {
                         active_flags.insert(label.clone());

bin/router/src/pipeline/progressive_override.rs

@@ -24,7 +24,6 @@ jsonwebtoken = { workspace = true }
 retry-policies = { workspace = true}
 tracing = { workspace = true }
 
-once_cell = "1.21.3"
 schemars = "1.0.4"
 humantime-serde = "1.1.1"
 config = { version = "0.15.14", features = ["yaml", "json", "json5"] }

lib/router-config/Cargo.toml

@@ -2,8 +2,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-use crate::primitives::expression::Expression;
-
 /// A map of label names to their override configuration.
 pub type OverrideLabelsConfig = HashMap<String, LabelOverrideValue>;
 
@@ -17,7 +15,7 @@ pub enum LabelOverrideValue {
     /// A static boolean value to enable or disable the label.
     Boolean(bool),
     /// A dynamic value computed by an expression.
-    Expression(Expression),
+    Expression { expression: String },
 }
 
 impl LabelOverrideValue {