diff --git a/Cargo.lock b/Cargo.lock index cc4627fe4..f82450bb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2584,15 +2584,15 @@ dependencies = [ "mime", "mockito", "moka", - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-otlp", "opentelemetry-prometheus", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.1", "pem", "postgres-protocol", "postgres-types", "prio 0.18.1-alpha.2", - "prometheus", + "prometheus 0.13.4", "querystring", "quickcheck", "quickcheck_macros", @@ -2655,7 +2655,7 @@ dependencies = [ "janus_aggregator_core", "janus_core", "janus_messages 0.9.0-prerelease-1", - "opentelemetry", + "opentelemetry 0.27.1", "querystring", "rand 0.9.2", "rstest", @@ -2699,7 +2699,7 @@ dependencies = [ "janus_messages 0.9.0-prerelease-1", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.27.1", "postgres-protocol", "postgres-types", "prio 0.18.1-alpha.2", @@ -2859,8 +2859,8 @@ dependencies = [ "janus_messages 0.9.0-prerelease-1", "k8s-openapi", "kube", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.1", + "opentelemetry_sdk 0.27.1", "prio 0.18.1-alpha.2", "quickcheck", "rand 0.9.2", @@ -3563,6 +3563,30 @@ dependencies = [ "tracing", ] +[[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.27.0" @@ -3572,9 +3596,9 @@ dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.1", "prost 0.13.1", "thiserror 1.0.69", "tokio", @@ -3583,15 +3607,14 @@ dependencies = [ [[package]] name = "opentelemetry-prometheus" -version = "0.27.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b834e966ea5e2d03dfe5f2253f03d22cce21403ee940265070eeee96cee0bcc" +checksum = "14095eb06b569eb5d538fa4555969f7e8a410ed7910c903bfd295f9e1a50d7ea" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "prometheus", - "protobuf", + "opentelemetry 0.31.0", + "opentelemetry_sdk 0.31.0", + "prometheus 0.14.0", "tracing", ] @@ -3601,8 +3624,8 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.1", + "opentelemetry_sdk 0.27.1", "prost 0.13.1", "tonic 0.12.3", ] @@ -3625,7 +3648,7 @@ dependencies = [ "futures-executor", "futures-util", "glob", - "opentelemetry", + "opentelemetry 0.27.1", "percent-encoding", "rand 0.8.5", "serde_json", @@ -3634,6 +3657,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" @@ -4129,10 +4180,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.1" @@ -4194,6 +4260,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" @@ -6012,14 +6098,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053" +checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "smallvec", "tracing", "tracing-core", @@ -6204,7 +6290,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b5e36d8e79ad6b8858715b9342b4d761d936dcd884f5680ecfb15c0076fa46a" dependencies = [ - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-semantic-conventions", "trillium", "trillium-macros 0.0.6", @@ -6216,7 +6302,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", diff --git a/Cargo.toml b/Cargo.toml index 723af02be..b86f5a4bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ num_enum = "0.7.5" ohttp = { version = "0.7.2", default-features = false } opentelemetry = { version = "0.27", default-features = false, features = ["trace", "metrics"] } opentelemetry-otlp = { version = "0.27", default-features = false, features = ["trace", "metrics", "grpc-tonic"] } -opentelemetry-prometheus = "0.27" +opentelemetry-prometheus = "0.31" opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace", "metrics"] } pem = "3" postgres-protocol = "0.6.10" @@ -110,7 +110,7 @@ thiserror = "2.0" tracing = "0.1.44" tracing-chrome = "0.7.2" tracing-log = "0.2.0" -tracing-opentelemetry = "0.28" +tracing-opentelemetry = "0.31" tracing-stackdriver = "0.10.0" tracing-subscriber = "0.3" tokio = { version = "1.49", features = ["full", "tracing"] }