Merge branch 'main' into value-map-collect

open-telemetry · Nov 4, 2024 · edbbeaf · edbbeaf
2 parents e52baeb + eca53b2
commit edbbeaf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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/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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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