From 7181140ecbe7155912f976cd252ad51bc7acb7d6 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 17 Jun 2026 14:51:00 -0400 Subject: [PATCH 1/4] Update VRL to use perf/smol-str-keystring branch --- Cargo.lock | 12 +++++++++++- Cargo.toml | 2 +- LICENSE-3rdparty.csv | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6daac2485e32a..5806c08112881 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10763,6 +10763,15 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + [[package]] name = "smpl_jwt" version = "0.8.0" @@ -13474,7 +13483,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vrl" version = "0.33.1" -source = "git+https://github.com/vectordotdev/vrl.git?branch=main#74e3e74582aa6b4445c1a94004bb3f14276d07df" +source = "git+https://github.com/vectordotdev/vrl.git?branch=perf%2Fsmol-str-keystring#d9b72fee50f19abab556b3aa4f08c0c6f3776adf" dependencies = [ "aes", "aes-siv", @@ -13565,6 +13574,7 @@ dependencies = [ "sha2 0.10.9", "sha3", "simdutf8", + "smol_str", "snafu 0.8.9", "snap", "strip-ansi-escapes", diff --git a/Cargo.toml b/Cargo.toml index 0fede344d2b1d..25d495f4b87aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -224,7 +224,7 @@ 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", default-features = false } -vrl = { git = "https://github.com/vectordotdev/vrl.git", branch = "main", default-features = false, features = ["arbitrary", "cli", "test", "test_framework", "stdlib-base"] } +vrl = { git = "https://github.com/vectordotdev/vrl.git", branch = "perf/smol-str-keystring", default-features = false, features = ["arbitrary", "cli", "test", "test_framework", "stdlib-base"] } mock_instant = { version = "0.6" } serial_test = { version = "3.4" } strum = { version = "0.28", features = ["derive"] } diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 809e71411a172..a6fdf5f3b0966 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -729,6 +729,7 @@ sketches-ddsketch,https://github.com/mheffner/rust-sketches-ddsketch,Apache-2.0, slab,https://github.com/tokio-rs/slab,MIT,Carl Lerche smallvec,https://github.com/servo/rust-smallvec,MIT OR Apache-2.0,The Servo Project Developers smol,https://github.com/smol-rs/smol,Apache-2.0 OR MIT,Stjepan Glavina +smol_str,https://github.com/rust-analyzer/smol_str,MIT OR Apache-2.0,Aleksey Kladov smpl_jwt,https://github.com/durch/rust-jwt,MIT,Drazen Urch snafu,https://github.com/shepmaster/snafu,MIT OR Apache-2.0,Jake Goulding snafu-derive,https://github.com/shepmaster/snafu,MIT OR Apache-2.0,Jake Goulding From dd5933e16d523ade4c639879b2ac015b7f315cf7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 17 Jun 2026 17:32:24 -0400 Subject: [PATCH 2/4] Switch FluentRecord from String to KeyString --- src/sources/fluent/message.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sources/fluent/message.rs b/src/sources/fluent/message.rs index a096fabbd2c32..c8c16b481d3a4 100644 --- a/src/sources/fluent/message.rs +++ b/src/sources/fluent/message.rs @@ -54,7 +54,7 @@ pub(super) struct FluentMessageOptions { pub(super) struct FluentEntry(pub(super) FluentTimestamp, pub(super) FluentRecord); /// Fluent record is just key/value pairs. -pub(super) type FluentRecord = BTreeMap; +pub(super) type FluentRecord = BTreeMap; /// Fluent message tag. pub(super) type FluentTag = String; From 2a18a5c642462da1c99439eab104cd8f7a009299 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 17 Jun 2026 17:43:34 -0400 Subject: [PATCH 3/4] Update branch ref --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5806c08112881..351bb82c03879 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13483,7 +13483,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vrl" version = "0.33.1" -source = "git+https://github.com/vectordotdev/vrl.git?branch=perf%2Fsmol-str-keystring#d9b72fee50f19abab556b3aa4f08c0c6f3776adf" +source = "git+https://github.com/vectordotdev/vrl.git?branch=perf%2Fsmol-str-keystring#0b5556b7993c064dcd0da3e510b5f8f3dde0ff82" dependencies = [ "aes", "aes-siv", From 1d9d40964a548fa7b220a70208d4f7e3e9db559f Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 18 Jun 2026 17:12:10 -0400 Subject: [PATCH 4/4] Bump VRL --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 351bb82c03879..9156bd97e661c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10765,11 +10765,11 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -13483,7 +13483,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vrl" version = "0.33.1" -source = "git+https://github.com/vectordotdev/vrl.git?branch=perf%2Fsmol-str-keystring#0b5556b7993c064dcd0da3e510b5f8f3dde0ff82" +source = "git+https://github.com/vectordotdev/vrl.git?branch=perf%2Fsmol-str-keystring#46f61ee8232d1ca9f8455788959f123e0c439b2b" dependencies = [ "aes", "aes-siv",