diff --git a/Cargo.lock b/Cargo.lock index 0d4e6bf3e..154928213 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -916,7 +916,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -1520,7 +1520,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]] @@ -2367,7 +2367,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.3", "tokio", "tower-service", "tracing", @@ -2636,15 +2636,15 @@ dependencies = [ "kube", "mockito", "moka", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-otlp", "opentelemetry-prometheus", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "pem", "postgres-protocol", "postgres-types", "prio", - "prometheus", + "prometheus 0.13.4", "quickcheck", "quickcheck_macros", "rand 0.8.6", @@ -2705,7 +2705,7 @@ dependencies = [ "janus_aggregator_core", "janus_core", "janus_messages 0.7.119", - "opentelemetry", + "opentelemetry 0.24.0", "querystring", "rand 0.8.6", "rstest", @@ -2749,7 +2749,7 @@ dependencies = [ "janus_messages 0.7.119", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "postgres-protocol", "postgres-types", "prio", @@ -2904,7 +2904,7 @@ dependencies = [ "janus_messages 0.7.119", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "prio", "quickcheck", "rand 0.8.6", @@ -3640,6 +3640,30 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "opentelemetry" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.18", + "tracing", +] + +[[package]] +name = "opentelemetry" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +dependencies = [ + "js-sys", + "tracing", +] + [[package]] name = "opentelemetry-otlp" version = "0.17.0" @@ -3649,9 +3673,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", @@ -3660,15 +3684,15 @@ dependencies = [ [[package]] name = "opentelemetry-prometheus" -version = "0.17.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" +checksum = "14095eb06b569eb5d538fa4555969f7e8a410ed7910c903bfd295f9e1a50d7ea" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "prometheus", - "protobuf", + "opentelemetry 0.31.0", + "opentelemetry_sdk 0.31.0", + "prometheus 0.14.0", + "tracing", ] [[package]] @@ -3677,8 +3701,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", ] @@ -3702,7 +3726,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "percent-encoding", "rand 0.8.6", "serde_json", @@ -3711,6 +3735,34 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "opentelemetry 0.30.0", + "percent-encoding", + "rand 0.9.2", + "thiserror 2.0.18", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "opentelemetry 0.31.0", + "thiserror 2.0.18", +] + [[package]] name = "ordered-float" version = "2.10.1" @@ -3727,7 +3779,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]] @@ -4200,10 +4252,25 @@ dependencies = [ "lazy_static", "memchr", "parking_lot", - "protobuf", + "protobuf 2.28.0", "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", + "protobuf 3.7.2", + "thiserror 2.0.18", +] + [[package]] name = "prost" version = "0.13.5" @@ -4265,6 +4332,26 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "protobuf" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror 1.0.69", +] + +[[package]] +name = "protobuf-support" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" +dependencies = [ + "thiserror 1.0.69", +] + [[package]] name = "querystring" version = "1.1.0" @@ -4304,7 +4391,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -4341,7 +4428,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.3", "tracing", "windows-sys 0.52.0", ] @@ -4704,7 +4791,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4772,7 +4859,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5647,7 +5734,7 @@ dependencies = [ "getrandom 0.4.1", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6197,14 +6284,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.25.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "smallvec", "tracing", "tracing-core", @@ -6389,7 +6476,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", @@ -6401,7 +6488,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", @@ -6984,7 +7071,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e85d04d3c..2bf3b0018 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,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.31" opentelemetry_sdk = { version = "0.24", default-features = false, features = ["trace", "metrics"] } pem = "3" postgres-protocol = "0.6.11" @@ -108,7 +108,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.31" tracing-stackdriver = "0.10.0" tracing-subscriber = "0.3" tokio = { version = "1.52", features = ["full", "tracing"] }