diff --git a/Cargo.lock b/Cargo.lock index abb383db3..65a8afdaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2531,7 +2531,7 @@ dependencies = [ "kube", "mockito", "moka", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-otlp", "opentelemetry-prometheus", "opentelemetry_sdk", @@ -2539,7 +2539,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "prio", - "prometheus", + "prometheus 0.13.4", "quickcheck", "quickcheck_macros", "rand 0.8.5", @@ -2600,7 +2600,7 @@ dependencies = [ "janus_aggregator_core", "janus_core", "janus_messages 0.7.109", - "opentelemetry", + "opentelemetry 0.24.0", "querystring", "rand 0.8.5", "rstest", @@ -2644,7 +2644,7 @@ dependencies = [ "janus_messages 0.7.109", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "postgres-protocol", "postgres-types", "prio", @@ -2799,7 +2799,7 @@ dependencies = [ "janus_messages 0.7.109", "k8s-openapi", "kube", - "opentelemetry", + "opentelemetry 0.24.0", "prio", "quickcheck", "rand 0.8.5", @@ -3526,6 +3526,19 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "opentelemetry" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 1.0.69", +] + [[package]] name = "opentelemetry-otlp" version = "0.17.0" @@ -3535,7 +3548,7 @@ dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-proto", "opentelemetry_sdk", "prost 0.13.5", @@ -3551,9 +3564,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" dependencies = [ "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry_sdk", - "prometheus", + "prometheus 0.13.4", "protobuf", ] @@ -3563,7 +3576,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry_sdk", "prost 0.13.5", "tonic 0.12.3", @@ -3571,9 +3584,9 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.16.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" +checksum = "bc1b6902ff63b32ef6c489e8048c5e253e2e4a803ea3ea7e783914536eb15c52" [[package]] name = "opentelemetry_sdk" @@ -3588,7 +3601,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "percent-encoding", "rand 0.8.5", "serde_json", @@ -4090,6 +4103,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.18", +] + [[package]] name = "prost" version = "0.13.5" @@ -5517,7 +5544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1" dependencies = [ "fastrand 2.3.0", - "getrandom 0.3.4", + "getrandom 0.4.1", "once_cell", "rustix", "windows-sys 0.61.2", @@ -6055,7 +6082,7 @@ checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry_sdk", "smallvec", "tracing", @@ -6237,11 +6264,11 @@ dependencies = [ [[package]] name = "trillium-opentelemetry" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369989011133b91f356bc790cfda4eae9243ffd33929dfb067fb135a728f88af" +checksum = "3b5e36d8e79ad6b8858715b9342b4d761d936dcd884f5680ecfb15c0076fa46a" dependencies = [ - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-semantic-conventions", "trillium", "trillium-macros 0.0.6", @@ -6249,11 +6276,11 @@ dependencies = [ [[package]] name = "trillium-prometheus" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f303a99a7a00c127cff63985b16d4d78c8ec9af17102a40debe80eb19a68e1" +checksum = "c3ebf005713e863706df87bb90d9e35256e732401fb244ff84dadb7e7881b816" dependencies = [ - "prometheus", + "prometheus 0.14.0", "tracing", "trillium", "trillium-router", diff --git a/Cargo.toml b/Cargo.toml index 818054a20..3fe4a9738 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,8 +120,8 @@ trillium-api = { version = "0.2.0-rc.12", default-features = false } trillium-caching-headers = "0.2.3" trillium-head = "0.2.3" trillium-macros = "0.0.6" -trillium-opentelemetry = "0.9.0" -trillium-prometheus = "0.2.0" +trillium-opentelemetry = "0.10.0" +trillium-prometheus = "0.3.0" trillium-proxy = { version = "0.5.5", default-features = false } trillium-router = "0.4.1" trillium-rustls = "0.9"