From 7e6fdf059a30cda0bd27bb2321b5c0dd5f6a2b7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 18:22:35 +0000 Subject: [PATCH 1/2] Bump the rust-dependencies group with 3 updates Bumps the rust-dependencies group with 3 updates: [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust), [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust) and [opentelemetry-stdout](https://github.com/open-telemetry/opentelemetry-rust). Updates `opentelemetry` from 0.20.0 to 0.21.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.20.0...v0.21.0) Updates `opentelemetry_sdk` from 0.20.0 to 0.21.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.20.0...v0.21.1) Updates `opentelemetry-stdout` from 0.1.0 to 0.2.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-rust/blob/v0.2.0/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/commits/v0.2.0) --- updated-dependencies: - dependency-name: opentelemetry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry_sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry-stdout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] --- Cargo.lock | 69 +++++++++------------------ buildpacks/nodejs-corepack/Cargo.toml | 2 +- common/nodejs-utils/Cargo.toml | 6 +-- 3 files changed, 26 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61b8d57b..40768b83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -520,12 +520,6 @@ dependencies = [ "regex", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.2" @@ -740,16 +734,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -757,7 +741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -1000,49 +984,40 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opentelemetry" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "futures-core", + "futures-sink", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-stdout" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd550321bc0f9d3f6dcbfe5c75262789de5b3e2776da2cbcfd2392aa05db0c6" +checksum = "c13b2df4cd59c176099ac82806725ba340c8fa7b1a7004c0912daad30470f63e" dependencies = [ + "chrono", "futures-util", - "opentelemetry_api", + "opentelemetry", "opentelemetry_sdk", "ordered-float", "serde", "serde_json", ] -[[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - [[package]] name = "opentelemetry_sdk" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" dependencies = [ "async-trait", "crossbeam-channel", @@ -1050,7 +1025,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api", + "opentelemetry", "ordered-float", "percent-encoding", "rand", @@ -1059,9 +1034,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" dependencies = [ "num-traits", ] @@ -1085,7 +1060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -1494,7 +1469,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.1.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", diff --git a/buildpacks/nodejs-corepack/Cargo.toml b/buildpacks/nodejs-corepack/Cargo.toml index 4b7c10eb..4966a880 100644 --- a/buildpacks/nodejs-corepack/Cargo.toml +++ b/buildpacks/nodejs-corepack/Cargo.toml @@ -11,7 +11,7 @@ heroku-nodejs-utils.workspace = true indoc = "2" libcnb = "=0.16.0" libherokubuildpack = "=0.16.0" -opentelemetry = "0.20.0" +opentelemetry = "0.21.0" serde = "1" thiserror = "1" diff --git a/common/nodejs-utils/Cargo.toml b/common/nodejs-utils/Cargo.toml index f70e584a..7e2d29c9 100644 --- a/common/nodejs-utils/Cargo.toml +++ b/common/nodejs-utils/Cargo.toml @@ -12,9 +12,9 @@ chrono = { version = "0.4", features = ["serde"] } commons = { git = "https://github.com/heroku/buildpacks-ruby", branch = "main" } indoc = "2" node-semver = "2" -opentelemetry = "0.20.0" -opentelemetry_sdk = { version = "0.20.0", features = ["trace"] } -opentelemetry-stdout = { version = "0.1.0", features = ["trace"] } +opentelemetry = "0.21.0" +opentelemetry_sdk = { version = "0.21.1", features = ["trace"] } +opentelemetry-stdout = { version = "0.2.0", features = ["trace"] } regex = "1" serde = { version = "1", features = ['derive'] } serde_json = "1" From db7cbc594d1dfb05bda7f2c134bf61dd519d28f1 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Fri, 17 Nov 2023 18:41:10 +0000 Subject: [PATCH 2/2] Fix version specifiers to match existing style --- buildpacks/nodejs-corepack/Cargo.toml | 2 +- common/nodejs-utils/Cargo.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildpacks/nodejs-corepack/Cargo.toml b/buildpacks/nodejs-corepack/Cargo.toml index 4966a880..df7b990a 100644 --- a/buildpacks/nodejs-corepack/Cargo.toml +++ b/buildpacks/nodejs-corepack/Cargo.toml @@ -11,7 +11,7 @@ heroku-nodejs-utils.workspace = true indoc = "2" libcnb = "=0.16.0" libherokubuildpack = "=0.16.0" -opentelemetry = "0.21.0" +opentelemetry = "0.21" serde = "1" thiserror = "1" diff --git a/common/nodejs-utils/Cargo.toml b/common/nodejs-utils/Cargo.toml index 7e2d29c9..f0d0eac3 100644 --- a/common/nodejs-utils/Cargo.toml +++ b/common/nodejs-utils/Cargo.toml @@ -12,9 +12,9 @@ chrono = { version = "0.4", features = ["serde"] } commons = { git = "https://github.com/heroku/buildpacks-ruby", branch = "main" } indoc = "2" node-semver = "2" -opentelemetry = "0.21.0" -opentelemetry_sdk = { version = "0.21.1", features = ["trace"] } -opentelemetry-stdout = { version = "0.2.0", features = ["trace"] } +opentelemetry = "0.21" +opentelemetry_sdk = { version = "0.21", features = ["trace"] } +opentelemetry-stdout = { version = "0.2", features = ["trace"] } regex = "1" serde = { version = "1", features = ['derive'] } serde_json = "1"