From e58f3b0532015376de45520032f21c151b0896cc Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 5 Jun 2024 12:12:03 +1000 Subject: [PATCH 1/2] Bump opentelemetry dependencies to 0.23 --- Cargo.lock | 49 +++++++++++++------------------------------------ Cargo.toml | 12 ++++++------ 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e02337..d469d98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,25 +65,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - [[package]] name = "deranged" version = "0.3.10" @@ -277,9 +258,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" dependencies = [ "futures-core", "futures-sink", @@ -287,15 +268,15 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", - "urlencoding", ] [[package]] name = "opentelemetry-stdout" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdf28b381f23afcd150afc0b38a4183dd321fc96320c1554752b6b761648f78" +checksum = "d6d080bf06af02b738feb2e6830cf72c30b76ca18b40f555cdf1b53e7b491bfe" dependencies = [ + "async-trait", "chrono", "futures-util", "opentelemetry", @@ -303,25 +284,27 @@ dependencies = [ "ordered-float", "serde", "serde_json", + "thiserror", ] [[package]] name = "opentelemetry_sdk" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" dependencies = [ "async-trait", - "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", "glob", + "lazy_static", "once_cell", "opentelemetry", "ordered-float", "percent-encoding", "rand", + "serde_json", "thiserror", ] @@ -650,9 +633,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", @@ -678,7 +661,7 @@ dependencies = [ [[package]] name = "tracing-stackdriver" -version = "0.10.0" +version = "0.11.0" dependencies = [ "Inflector", "http", @@ -749,12 +732,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "valuable" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 58c3468..10efe9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tracing-stackdriver" -version = "0.10.0" +version = "0.11.0" authors = ["Alex Pearson "] edition = "2021" license = "MIT" @@ -32,7 +32,7 @@ version = "0.2.9" [dependencies.opentelemetry] default-features = false features = ["trace"] -version = "0.22.0" +version = "0.23.0" optional = true [dependencies.serde] @@ -45,7 +45,7 @@ features = ["formatting"] version = "0.3.30" [dependencies.tracing-opentelemetry] -version = "0.23.0" +version = "0.24.0" optional = true [dependencies.tracing-subscriber] @@ -69,7 +69,7 @@ version = "0.1.0" lazy_static = "1.4.0" tracing = "0.1.34" rand = "0.8.5" -opentelemetry_sdk = "0.22.1" +opentelemetry_sdk = "0.23.0" [dev-dependencies.time] features = ["serde", "serde-well-known", "formatting"] @@ -78,11 +78,11 @@ version = "0.3.30" [dev-dependencies.opentelemetry] default-features = false features = ["testing", "trace"] -version = "0.22.0" +version = "0.23.0" [dev-dependencies.opentelemetry-stdout] features = ["trace"] -version = "0.3.0" +version = "0.4.0" [features] valuable = ["dep:valuable", "valuable-serde", "http", "url"] From 3e4a41ff6e2e5abc0c89e5124070cf187205f7cb Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 24 Jul 2024 17:30:32 +1000 Subject: [PATCH 2/2] Bump to 0.24 --- Cargo.lock | 18 ++++++++---------- Cargo.toml | 10 +++++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d469d98..c3215ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -258,9 +258,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" dependencies = [ "futures-core", "futures-sink", @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "opentelemetry-stdout" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d080bf06af02b738feb2e6830cf72c30b76ca18b40f555cdf1b53e7b491bfe" +checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" dependencies = [ "async-trait", "chrono", @@ -289,19 +289,17 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", "glob", - "lazy_static", "once_cell", "opentelemetry", - "ordered-float", "percent-encoding", "rand", "serde_json", @@ -633,9 +631,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 10efe9c..1ff2d80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ version = "0.2.9" [dependencies.opentelemetry] default-features = false features = ["trace"] -version = "0.23.0" +version = "0.24.0" optional = true [dependencies.serde] @@ -45,7 +45,7 @@ features = ["formatting"] version = "0.3.30" [dependencies.tracing-opentelemetry] -version = "0.24.0" +version = "0.25.0" optional = true [dependencies.tracing-subscriber] @@ -69,7 +69,7 @@ version = "0.1.0" lazy_static = "1.4.0" tracing = "0.1.34" rand = "0.8.5" -opentelemetry_sdk = "0.23.0" +opentelemetry_sdk = "0.24.1" [dev-dependencies.time] features = ["serde", "serde-well-known", "formatting"] @@ -78,11 +78,11 @@ version = "0.3.30" [dev-dependencies.opentelemetry] default-features = false features = ["testing", "trace"] -version = "0.23.0" +version = "0.24.0" [dev-dependencies.opentelemetry-stdout] features = ["trace"] -version = "0.4.0" +version = "0.5.0" [features] valuable = ["dep:valuable", "valuable-serde", "http", "url"]