From 9a259e517165beb1c23b75400354ae15186562b2 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 10:12:18 -0800 Subject: [PATCH 1/6] commit --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a91ecbb4e0..4f490eae6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,4 +47,4 @@ tokio-stream = "0.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } -url = { version = "2.5", default-features = false } +url = { version = "=2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992 From 92cc5c331badce66baa060b0ab81e945627ea5e1 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 10:20:25 -0800 Subject: [PATCH 2/6] msrv patch url --- Cargo.toml | 2 +- scripts/patch_dependencies.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4f490eae6a..a91ecbb4e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,4 +47,4 @@ tokio-stream = "0.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } -url = { version = "=2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992 +url = { version = "2.5", default-features = false } diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index fffcd99327..f5dd5c3452 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -7,3 +7,4 @@ function patch_version() { } +patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 \ No newline at end of file From 34b75a5acb9c3de158c93eab173dc424491d9883 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 10:21:10 -0800 Subject: [PATCH 3/6] add newline --- scripts/patch_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index f5dd5c3452..7cfcd00718 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -7,4 +7,4 @@ function patch_version() { } -patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 \ No newline at end of file +patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 From eb5ec421f17ec0d9f765b27e586eba8191a995df Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 10:35:44 -0800 Subject: [PATCH 4/6] pin Cargo.toml --- Cargo.toml | 2 +- scripts/patch_dependencies.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a91ecbb4e0..3e123b901e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,4 +47,4 @@ tokio-stream = "0.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } -url = { version = "2.5", default-features = false } +url = { version = "2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992 diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index 7cfcd00718..1f537cefa7 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -5,6 +5,3 @@ function patch_version() { echo "patching $1 from $latest_version to $2" cargo update -p $1:$latest_version --precise $2 } - - -patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 From bff004f16c02082078f2aba7c6ff082c387019b1 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 11:02:41 -0800 Subject: [PATCH 5/6] need msrv too --- scripts/patch_dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index 1f537cefa7..8fabb3c889 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -5,3 +5,5 @@ function patch_version() { echo "patching $1 from $latest_version to $2" cargo update -p $1:$latest_version --precise $2 } + +patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 \ No newline at end of file From dda23a822747380181b5f998cc853ff10aa3c53d Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 4 Nov 2024 11:27:06 -0800 Subject: [PATCH 6/6] add changelog --- opentelemetry-sdk/CHANGELOG.md | 4 ++++ scripts/patch_dependencies.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md index d8d9aab540..96967fe421 100644 --- a/opentelemetry-sdk/CHANGELOG.md +++ b/opentelemetry-sdk/CHANGELOG.md @@ -30,6 +30,10 @@ - Removed `MeterProvider::versioned_meter` - Replaced these methods with `LoggerProvider::logger_with_scope`, `TracerProvider::logger_with_scope`, `MeterProvider::meter_with_scope` +- [#2272](https://github.com/open-telemetry/opentelemetry-rust/pull/2272) + - Pin url version to `2.5.2`. The higher version breaks the build refer: [servo/rust-url#992.](https://github.com/servo/rust-url/issues/992) + The `url` crate is used when `jaeger_remote_sampler` feature is enabled. + ## v0.26.0 Released 2024-Sep-30 diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh index 8fabb3c889..1bd1f05ceb 100755 --- a/scripts/patch_dependencies.sh +++ b/scripts/patch_dependencies.sh @@ -6,4 +6,4 @@ function patch_version() { cargo update -p $1:$latest_version --precise $2 } -patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992 \ No newline at end of file +patch_version url 2.5.2 #https://github.com/servo/rust-url/issues/992