diff --git a/Cargo.lock b/Cargo.lock index fde0ac9a1ff6e51f23c560f2cf78e7f7fce0eaed..65f4aaa707cd0f42c11961958cae402dcd632f8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4310,9 +4310,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" dependencies = [ "futures-core", "futures-sink", @@ -4324,9 +4324,9 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2" +checksum = "2c0080f0dc1d7c786f467cd85a4e395fcab11ee852004f39a29a18ab7c25d837" dependencies = [ "opentelemetry", "tracing", @@ -4336,9 +4336,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" +checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" dependencies = [ "async-trait", "bytes", @@ -4349,9 +4349,9 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f" +checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" dependencies = [ "http", "opentelemetry", @@ -4361,14 +4361,13 @@ dependencies = [ "prost", "reqwest", "thiserror 2.0.18", - "tracing", ] [[package]] name = "opentelemetry-proto" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" +checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" dependencies = [ "base64 0.22.1", "const-hex", @@ -4376,22 +4375,22 @@ dependencies = [ "opentelemetry_sdk", "prost", "serde", - "serde_json", "tonic", "tonic-prost", ] [[package]] name = "opentelemetry_sdk" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" dependencies = [ "futures-channel", "futures-executor", "futures-util", "opentelemetry", "percent-encoding", + "portable-atomic", "rand 0.9.4", "thiserror 2.0.18", "tokio", @@ -5300,9 +5299,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ "base64 0.22.1", "bytes", @@ -5318,9 +5317,6 @@ dependencies = [ "log", "percent-encoding", "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", "sync_wrapper", "tokio", "tower", @@ -5635,9 +5631,9 @@ dependencies = [ [[package]] name = "saturating-time" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63583a1dd0647d1484228529ab4ecaa874048d2956f117362aa5f5826456230" +checksum = "802bdbfcca9a239cb46eeaaedea507e37bb13ba1a673762d2e2ef7a9dac63144" [[package]] name = "schannel" @@ -8410,9 +8406,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc" +checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", "opentelemetry", diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml index b0416abd4c987ab3a970682c275ae9d636c49eec..16b3462743b4c0223a4acc7b441684ad41da89a8 100644 --- a/crates/arti/Cargo.toml +++ b/crates/arti/Cargo.toml @@ -187,11 +187,11 @@ metrics-exporter-prometheus = { version = "0.18.0", optional = true, default-fea "http-listener", ] } notify = { version = "8", default-features = false, features = ["macos_kqueue"] } -opentelemetry = { version = "0.31.0", optional = true } -opentelemetry-appender-tracing = { version = "0.31.1", optional = true } -opentelemetry-otlp = { version = "0.31.0", optional = true } -opentelemetry-proto = { version = "0.31.0", optional = true } -opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"], optional = true } # TODO: what's up with this feature +opentelemetry = { version = "0.32.0", optional = true } +opentelemetry-appender-tracing = { version = "0.32.0", optional = true } +opentelemetry-otlp = { version = "0.32.0", optional = true } +opentelemetry-proto = { version = "0.32.0", optional = true } +opentelemetry_sdk = { version = "0.32.1", features = ["rt-tokio"], optional = true } # TODO: what's up with this feature paste = "1.0.3" pin-project = "1" postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] } @@ -230,7 +230,7 @@ tor-socksproto = { path = "../tor-socksproto", version = "0.43.0" } tracing = "0.1.36" tracing-appender = "0.2.0" tracing-journald = { version = "0.3.0", optional = true } -tracing-opentelemetry = { version = "0.32.0", optional = true } +tracing-opentelemetry = { version = "0.33.0", optional = true } tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } visibility = { version = "0.1.0", optional = true } web-time-compat = { path = "../web-time-compat", version = "0.1.0" } diff --git a/crates/arti/src/logging/otlp_file_exporter.rs b/crates/arti/src/logging/otlp_file_exporter.rs index c31ba188f3c1185631a82f75c36b3735e1960db8..19943b1e480f9e61ec726d710540fe5f87e6e3b3 100644 --- a/crates/arti/src/logging/otlp_file_exporter.rs +++ b/crates/arti/src/logging/otlp_file_exporter.rs @@ -66,7 +66,7 @@ impl SpanExporter for FileExporter { })) } - fn force_flush(&mut self) -> OTelSdkResult { + fn force_flush(&self) -> OTelSdkResult { let mut writer = self .writer .lock() diff --git a/crates/tor-dirserver/Cargo.toml b/crates/tor-dirserver/Cargo.toml index b1d2acf377fa6513a96309fda8e095ace77c6713..4fc7dd3a8a9fd260467cd8618e97afd6a11ecded 100644 --- a/crates/tor-dirserver/Cargo.toml +++ b/crates/tor-dirserver/Cargo.toml @@ -43,7 +43,7 @@ rand = "0.10.1" retry-error = { version = "0.12.0", path = "../retry-error" } # NOTE: See the note for `rusqlite` in `../tor-dirmgr/Cargo.toml`. rusqlite = ">=0.36.0, <0.40.0" -saturating-time = "0.3.0" +saturating-time = "0.4.0" strum = { version = "0.28.0", features = ["derive"] } thiserror = "2.0.16" tokio = { version = "1.47.1", features = ["full", "test-util"] } diff --git a/crates/tor-netdoc/Cargo.toml b/crates/tor-netdoc/Cargo.toml index a42afd2a1aa199bb52f68e085bd34b80694a8f29..6ae645dfece07b3ee07afdb7ae7cf005cf171c52 100644 --- a/crates/tor-netdoc/Cargo.toml +++ b/crates/tor-netdoc/Cargo.toml @@ -87,7 +87,7 @@ memchr = "2.5" paste = "1.0.3" phf = { version = "0.13.1", features = ["macros"] } rand = { version = "0.10.1" } -saturating-time = "0.3.0" +saturating-time = "0.4.0" serde = { version = "1.0.103", features = ["derive"] } serde_with = "3.0.0" signature = "2"