diff --git a/Cargo.lock b/Cargo.lock index 18c8a5d9e..294d05c5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,7 +137,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -148,7 +148,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -946,7 +946,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1567,7 +1567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2659,15 +2659,15 @@ dependencies = [ "kube", "mockito", "moka", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-otlp", "opentelemetry-prometheus", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "pem 4.0.0", "postgres-protocol", "postgres-types", "prio", - "prometheus", + "prometheus 0.13.4", "quickcheck", "quickcheck_macros", "rand 0.8.7", @@ -2727,7 +2727,7 @@ dependencies = [ "janus_aggregator_core", "janus_core", "janus_messages 0.7.134", - "opentelemetry", + "opentelemetry 0.24.0", "querystring", "rand 0.8.7", "rstest", @@ -2771,7 +2771,7 @@ dependencies = [ "janus_messages 0.7.134", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "postgres-protocol", "postgres-types", "prio", @@ -2926,7 +2926,7 @@ dependencies = [ "janus_messages 0.7.134", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "prio", "quickcheck", "rand 0.8.7", @@ -3499,7 +3499,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3696,6 +3696,20 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "opentelemetry" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.19", + "tracing", +] + [[package]] name = "opentelemetry-otlp" version = "0.17.0" @@ -3705,9 +3719,9 @@ dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "prost 0.13.5", "thiserror 1.0.69", "tokio", @@ -3716,15 +3730,15 @@ dependencies = [ [[package]] name = "opentelemetry-prometheus" -version = "0.17.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" +checksum = "2c0359983e7f79cf33c9abd89e5d7ddf67c46c419d0148598022d70e70c01aba" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "prometheus", - "protobuf", + "opentelemetry 0.32.0", + "opentelemetry_sdk 0.32.1", + "prometheus 0.14.0", + "tracing", ] [[package]] @@ -3733,8 +3747,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "prost 0.13.5", "tonic 0.12.3", ] @@ -3758,7 +3772,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "percent-encoding", "rand 0.8.7", "serde_json", @@ -3767,6 +3781,20 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "opentelemetry 0.32.0", + "portable-atomic", + "thiserror 2.0.19", +] + [[package]] name = "ordered-float" version = "2.10.1" @@ -3783,7 +3811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.45.0", + "windows-sys 0.61.2", ] [[package]] @@ -4230,6 +4258,20 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "prometheus" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot", + "thiserror 2.0.19", +] + [[package]] name = "prost" version = "0.13.5" @@ -4707,7 +4749,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4775,7 +4817,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4796,7 +4838,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5387,7 +5429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5716,7 +5758,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6252,14 +6294,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.25.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.32.0", "smallvec", "tracing", "tracing-core", @@ -6444,7 +6484,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "369989011133b91f356bc790cfda4eae9243ffd33929dfb067fb135a728f88af" dependencies = [ - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-semantic-conventions", "trillium", "trillium-macros 0.0.6", @@ -6456,7 +6496,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37f303a99a7a00c127cff63985b16d4d78c8ec9af17102a40debe80eb19a68e1" dependencies = [ - "prometheus", + "prometheus 0.13.4", "tracing", "trillium", "trillium-router", @@ -6966,7 +7006,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1c909f085..418776125 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ num_enum = "0.7.6" ohttp = { version = "0.7.2", default-features = false } opentelemetry = { version = "0.24", default-features = false, features = ["trace", "metrics"] } opentelemetry-otlp = { version = "0.17", default-features = false, features = ["trace", "metrics", "grpc-tonic"] } -opentelemetry-prometheus = "0.17" +opentelemetry-prometheus = "0.32" opentelemetry_sdk = { version = "0.24", default-features = false, features = ["trace", "metrics"] } pem = "4" postgres-protocol = "0.6.11" @@ -107,7 +107,7 @@ thiserror = "2.0" tracing = "0.1.44" tracing-chrome = "0.7.2" tracing-log = "0.2.0" -tracing-opentelemetry = "0.25" +tracing-opentelemetry = "0.33" tracing-stackdriver = "0.10.0" tracing-subscriber = "0.3" tokio = { version = "1.52", features = ["full", "tracing"] }