From b2ab467701416c013d3bff5a3cf802682365dd38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 04:40:34 +0000 Subject: [PATCH 1/2] chore(deps): Bump criterion from 0.5.1 to 0.6.0 Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.5.1 to 0.6.0. - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/bheisler/criterion.rs/compare/0.5.1...0.6.0) --- updated-dependencies: - dependency-name: criterion dependency-version: 0.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++------- Cargo.toml | 2 +- lib/dnsmsg-parser/Cargo.toml | 2 +- lib/file-source/Cargo.toml | 2 +- lib/tracing-limit/Cargo.toml | 2 +- lib/vector-buffers/Cargo.toml | 2 +- lib/vector-core/Cargo.toml | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c465db7ff350..31347f1fe0d0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2568,26 +2568,22 @@ dependencies = [ [[package]] name = "criterion" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679" dependencies = [ "anes", "cast", "ciborium", "clap", "criterion-plot", - "futures 0.3.31", - "is-terminal", - "itertools 0.10.5", + "itertools 0.13.0", "num-traits", - "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_derive", "serde_json", "tinytemplate", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 4bf10447c73ac..459906ad6ed93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -433,7 +433,7 @@ azure_identity = { version = "0.17", default-features = false, features = ["enab azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] } azure_storage = { version = "0.17", default-features = false } base64 = "0.22.1" -criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } +criterion = { version = "0.6.0", features = ["html_reports", "async_tokio"] } itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] } libc = "0.2.172" similar-asserts = "1.7.0" diff --git a/lib/dnsmsg-parser/Cargo.toml b/lib/dnsmsg-parser/Cargo.toml index 4722e929c13cc..69378f2e56b99 100644 --- a/lib/dnsmsg-parser/Cargo.toml +++ b/lib/dnsmsg-parser/Cargo.toml @@ -12,7 +12,7 @@ hickory-proto.workspace = true snafu.workspace = true [dev-dependencies] -criterion = "0.5" +criterion = "0.6" [lib] bench = false diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml index f9c5c178d5651..56b2bcbf9cefd 100644 --- a/lib/file-source/Cargo.toml +++ b/lib/file-source/Cargo.toml @@ -73,7 +73,7 @@ default-features = false features = ["full"] [dev-dependencies] -criterion = "0.5" +criterion = "0.6" quickcheck = "1" tempfile.workspace = true similar-asserts = "1.7.0" diff --git a/lib/tracing-limit/Cargo.toml b/lib/tracing-limit/Cargo.toml index 8fb0fb62090e1..f677b05ba83ba 100644 --- a/lib/tracing-limit/Cargo.toml +++ b/lib/tracing-limit/Cargo.toml @@ -12,7 +12,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["r dashmap = { version = "6.1.0", default-features = false } [dev-dependencies] -criterion = "0.5" +criterion = "0.6" tracing = "0.1.34" mock_instant = { version = "0.5" } tracing-subscriber = { version = "0.3.19", default-features = false, features = ["env-filter", "fmt"] } diff --git a/lib/vector-buffers/Cargo.toml b/lib/vector-buffers/Cargo.toml index 24e6c90ff0862..e15ff51fc4b20 100644 --- a/lib/vector-buffers/Cargo.toml +++ b/lib/vector-buffers/Cargo.toml @@ -35,7 +35,7 @@ vector-common = { path = "../vector-common", default-features = false, features [dev-dependencies] clap.workspace = true -criterion = { version = "0.5", features = ["html_reports", "async_tokio"] } +criterion = { version = "0.6", features = ["html_reports", "async_tokio"] } crossbeam-queue = "0.3.12" hdrhistogram = "7.5.4" metrics-tracing-context.workspace = true diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index af3c2839e8dfe..269b6e6c098a9 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -78,7 +78,7 @@ prost-build.workspace = true [dev-dependencies] base64 = "0.22.1" chrono-tz.workspace = true -criterion = { version = "0.5.1", features = ["html_reports"] } +criterion = { version = "0.6.0", features = ["html_reports"] } env-test-util = "1.0.1" quickcheck = "1" quickcheck_macros = "1" From ca24c16add5fde43811aaadbc54953cadea8db02 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Mon, 9 Jun 2025 10:28:38 -0400 Subject: [PATCH 2/2] deprecation fix --- lib/tracing-limit/benches/limit.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/tracing-limit/benches/limit.rs b/lib/tracing-limit/benches/limit.rs index f7214525e9819..7eeb61daa52bc 100644 --- a/lib/tracing-limit/benches/limit.rs +++ b/lib/tracing-limit/benches/limit.rs @@ -1,15 +1,14 @@ -#[macro_use] -extern crate tracing; - #[macro_use] extern crate criterion; +#[macro_use] +extern crate tracing; +use criterion::{BenchmarkId, Criterion}; +use std::hint::black_box; use std::{ fmt, sync::{Mutex, MutexGuard}, }; - -use criterion::{black_box, BenchmarkId, Criterion}; use tracing::{field, span, subscriber::Interest, Event, Metadata, Subscriber}; use tracing_limit::RateLimitedLayer; use tracing_subscriber::layer::{Context, Layer, SubscriberExt};