From 0ad6ba1b67ba0d937abf604bc2abaa4fed00f465 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 20:40:54 +0000 Subject: [PATCH 1/2] chore(deps): bump toml from 0.9.7 to 0.9.8 Bumps [toml](https://github.com/toml-rs/toml) from 0.9.7 to 0.9.8. - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.9.7...toml-v0.9.8) --- updated-dependencies: - dependency-name: toml dependency-version: 0.9.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db3939a..95d7ec5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2899,9 +2899,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" +checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" dependencies = [ "serde_core", ] @@ -3582,9 +3582,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" dependencies = [ "indexmap 2.11.4", "serde_core", @@ -3597,27 +3597,27 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" dependencies = [ "winnow", ] [[package]] name = "toml_writer" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109" +checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" [[package]] name = "tonic" From 0820dd46b73d42e7b6b4b9f160433dec3fea7c74 Mon Sep 17 00:00:00 2001 From: RAprogramm Date: Tue, 14 Oct 2025 07:35:22 +0700 Subject: [PATCH 2/2] fix: resolve tracing test race condition in telemetry_flushes_after_subscriber_install Add explicit drop call to ensure error cleanup before checking events. This eliminates race condition where test checked events before async subscriber processed them. --- README.md | 1 - src/app_error/tests.rs | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dbcacb1..20d8481 100644 --- a/README.md +++ b/README.md @@ -488,4 +488,3 @@ assert_eq!(problem.grpc.expect("grpc").name, "UNAUTHENTICATED"); MSRV: **1.90** · License: **MIT OR Apache-2.0** · No `unsafe` - diff --git a/src/app_error/tests.rs b/src/app_error/tests.rs index 7acb1d6..373a15b 100644 --- a/src/app_error/tests.rs +++ b/src/app_error/tests.rs @@ -622,14 +622,15 @@ fn telemetry_flushes_after_subscriber_install() { use tracing::{callsite::rebuild_interest_cache, dispatcher}; let (dispatch, events) = new_recording_dispatch(); - let events = events.clone(); + let events_clone = events.clone(); dispatcher::with_default(&dispatch, || { rebuild_interest_cache(); let err = AppError::internal("boom"); err.log(); + drop(err); - let events = events.lock().expect("events lock"); + let events = events_clone.lock().expect("events lock"); assert_eq!( events.len(), 1,