From e6d279ea769cd01d2d0c09bc1e7e86059b0eef7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 22:19:45 +0000 Subject: [PATCH] chore(deps): bump tokio from 1.6.1 to 1.6.2 (#7858) * chore(deps): bump tokio from 1.6.1 to 1.6.2 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.6.1...tokio-1.6.2) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Put assert_eq back Given that this tokio upgrade fixes the imprecision https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3852 Signed-off-by: Jesse Szwedko Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesse Szwedko --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- lib/file-source/Cargo.toml | 2 +- lib/k8s-e2e-tests/Cargo.toml | 2 +- lib/k8s-test-framework/Cargo.toml | 2 +- lib/vector-api-client/Cargo.toml | 2 +- lib/vector-core/Cargo.toml | 2 +- lib/vector-core/buffers/Cargo.toml | 2 +- src/sinks/util/adaptive_concurrency/service.rs | 3 +-- src/sinks/util/adaptive_concurrency/tests.rs | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54987a79b5ca1..f5d3454c13fb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7209,9 +7209,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +checksum = "aea337f72e96efe29acc234d803a5981cd9a2b6ed21655cd7fc21cfe021e8ec7" dependencies = [ "autocfg 1.0.1", "bytes 1.0.1", diff --git a/Cargo.toml b/Cargo.toml index 6448a58750502..cd9d00d3c3f39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,7 +110,7 @@ datadog-search-syntax = { path = "lib/datadog/search-syntax", optional = true } # Tokio / Futures async-trait = "0.1.50" futures = { version = "0.3.15", default-features = false, features = ["compat", "io-compat"], package = "futures" } -tokio = { version = "1.6.1", default-features = false, features = ["full"] } +tokio = { version = "1.6.2", default-features = false, features = ["full"] } tokio-openssl = { version = "0.6.2", default-features = false } tokio-stream = { version = "0.1.6", default-features = false, features = ["net", "sync"] } tokio-util = { version = "0.6.7", default-features = false, features = ["codec", "time"] } @@ -305,7 +305,7 @@ matches = "0.1.8" pretty_assertions = "0.7.2" reqwest = { version = "0.11.4", features = ["json"] } tempfile = "3.2.0" -tokio = { version = "1.6.1", features = ["test-util"] } +tokio = { version = "1.6.2", features = ["test-util"] } tokio-test = "0.4.2" tower-test = "0.4.0" walkdir = "2.3.2" diff --git a/lib/file-source/Cargo.toml b/lib/file-source/Cargo.toml index e0515ad3ec040..6605e0b3bd5d3 100644 --- a/lib/file-source/Cargo.toml +++ b/lib/file-source/Cargo.toml @@ -66,7 +66,7 @@ default-features = false features = [] [dependencies.tokio] -version = "1.6.1" +version = "1.6.2" default-features = false features = ["full"] diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml index 0b11b0c03498f..2438e11f877c0 100644 --- a/lib/k8s-e2e-tests/Cargo.toml +++ b/lib/k8s-e2e-tests/Cargo.toml @@ -14,7 +14,7 @@ k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" } regex = "1" reqwest = { version = "0.11.4", features = ["json"] } serde_json = "1" -tokio = { version = "1.6.1", features = ["full"] } +tokio = { version = "1.6.2", features = ["full"] } indoc = "1.0.3" env_logger = "0.8" tracing = { version = "0.1", features = ["log"] } diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml index 89dcf4d69f3c4..b4595605d89bd 100644 --- a/lib/k8s-test-framework/Cargo.toml +++ b/lib/k8s-test-framework/Cargo.toml @@ -12,5 +12,5 @@ k8s-openapi = { version = "0.12.0", default-features = false, features = ["v1_16 once_cell = "1" serde_json = "1" tempfile = "3" -tokio = { version = "1.6.1", features = ["full"] } +tokio = { version = "1.6.2", features = ["full"] } log = "0.4" diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml index 214aa516aa3d7..923ae0659c0c3 100644 --- a/lib/vector-api-client/Cargo.toml +++ b/lib/vector-api-client/Cargo.toml @@ -19,7 +19,7 @@ anyhow = "1.0.41" async-stream = "0.3.2" async-trait = "0.1" futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] } -tokio = { version = "1.6.1", features = ["full"] } +tokio = { version = "1.6.2", features = ["full"] } tokio-stream = { version = "0.1.6", features = ["sync"] } # GraphQL diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index f9e0f3b471baf..49ab1b0b723f7 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -35,7 +35,7 @@ serde = { version = "1.0.126", default-features = false, features = ["derive"] } serde_json = { version = "1.0.64", default-features = false } shared = { path = "../shared" } snafu = { version = "0.6.10", default-features = false } -tokio = { version = "1.6.1", default-features = false } +tokio = { version = "1.6.2", default-features = false } tokio-stream = { version = "0.1", default-features = false, optional = true } toml = { version = "0.5.8", default-features = false } tracing = { version = "0.1.26", default-features = false } diff --git a/lib/vector-core/buffers/Cargo.toml b/lib/vector-core/buffers/Cargo.toml index 92833a5e2f70d..c33fc4e13d4bf 100644 --- a/lib/vector-core/buffers/Cargo.toml +++ b/lib/vector-core/buffers/Cargo.toml @@ -14,7 +14,7 @@ metrics = { version = "0.16.0", default-features = false, features = ["std"] } pin-project = { version = "1.0.7", default-features = false } serde = { version = "1.0.126", default-features = false, features = ["derive"] } snafu = { version = "0.6.10", default-features = false, features = ["std"], optional = true } -tokio = { version = "1.6.1", default-features = false, features = ["rt", "macros", "rt-multi-thread"] } +tokio = { version = "1.6.2", default-features = false, features = ["rt", "macros", "rt-multi-thread"] } tracing = { version = "0.1.26", default-features = false } [dev-dependencies] diff --git a/src/sinks/util/adaptive_concurrency/service.rs b/src/sinks/util/adaptive_concurrency/service.rs index 41f5194a0e2aa..ffc0070e45b80 100644 --- a/src/sinks/util/adaptive_concurrency/service.rs +++ b/src/sinks/util/adaptive_concurrency/service.rs @@ -122,7 +122,6 @@ mod tests { }; use super::*; use crate::assert_downcast_matches; - use approx::assert_relative_eq; use snafu::Snafu; use std::{ sync::{Mutex, MutexGuard}, @@ -279,7 +278,7 @@ mod tests { assert_eq!(in_flight.mean, 1.0); let observed_rtt = stats.observed_rtt.stats().unwrap(); - assert_relative_eq!(observed_rtt.mean, 1.0, epsilon = 0.002); + assert_eq!(observed_rtt.mean, 1.0); } #[tokio::test] diff --git a/src/sinks/util/adaptive_concurrency/tests.rs b/src/sinks/util/adaptive_concurrency/tests.rs index bf5bbf9791db6..184d8081d83ce 100644 --- a/src/sinks/util/adaptive_concurrency/tests.rs +++ b/src/sinks/util/adaptive_concurrency/tests.rs @@ -384,7 +384,7 @@ async fn run_test(params: TestParams) -> TestResults { // This is crude and dumb, but it works, and the tests run fast and // the results are highly repeatable. while stats.lock().expect("Poisoned stats lock").completed < params.requests { - time::advance(Duration::from_millis(0)).await; + time::sleep(Duration::from_millis(1)).await; } topology.stop().await;