diff --git a/Cargo.lock b/Cargo.lock index 2d8f42fc0..7bcb38869 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3069,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3234,15 +3234,15 @@ dependencies = [ "mas-templates", "mas-tower", "oauth2-types", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.24.0", + "opentelemetry-http 0.13.0", "opentelemetry-jaeger-propagator", "opentelemetry-otlp", "opentelemetry-prometheus", "opentelemetry-resource-detectors", - "opentelemetry-semantic-conventions", + "opentelemetry-semantic-conventions 0.16.0", "opentelemetry-stdout", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.0", "prometheus", "rand", "rand_chacha", @@ -3376,8 +3376,8 @@ dependencies = [ "minijinja-contrib", "nonzero_ext", "oauth2-types", - "opentelemetry", - "opentelemetry-semantic-conventions", + "opentelemetry 0.24.0", + "opentelemetry-semantic-conventions 0.16.0", "pbkdf2", "pkcs8", "psl", @@ -3415,9 +3415,9 @@ dependencies = [ "headers", "http", "hyper-util", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", + "opentelemetry 0.24.0", + "opentelemetry-http 0.13.0", + "opentelemetry-semantic-conventions 0.16.0", "reqwest", "rustls-platform-verifier", "tokio", @@ -3692,7 +3692,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry", + "opentelemetry 0.24.0", "rand_core", "serde", "serde_json", @@ -3715,7 +3715,7 @@ dependencies = [ "mas-jose", "mas-storage", "oauth2-types", - "opentelemetry-semantic-conventions", + "opentelemetry-semantic-conventions 0.16.0", "rand", "rand_chacha", "sea-query", @@ -3751,7 +3751,7 @@ dependencies = [ "mas-storage-pg", "mas-templates", "mas-tower", - "opentelemetry", + "opentelemetry 0.24.0", "rand", "rand_chacha", "serde", @@ -3800,9 +3800,9 @@ name = "mas-tower" version = "0.12.0" dependencies = [ "http", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", + "opentelemetry 0.24.0", + "opentelemetry-http 0.13.0", + "opentelemetry-semantic-conventions 0.16.0", "pin-project-lite", "tower 0.5.1", "tracing", @@ -4147,6 +4147,34 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "opentelemetry" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror 1.0.69", +] + +[[package]] +name = "opentelemetry" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3cebff57f7dbd1255b44d8bddc2cebeb0ea677dbaa2e25a3070a91b318f660" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror 1.0.69", +] + [[package]] name = "opentelemetry-http" version = "0.13.0" @@ -4156,32 +4184,44 @@ dependencies = [ "async-trait", "bytes", "http", - "opentelemetry", + "opentelemetry 0.24.0", "reqwest", ] +[[package]] +name = "opentelemetry-http" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a8a7f5f6ba7c1b286c2fbca0454eaba116f63bbe69ed250b642d36fbb04d80" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry 0.27.0", +] + [[package]] name = "opentelemetry-jaeger-propagator" -version = "0.3.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +checksum = "4e33208695c9d3049c848d2abf32f7336ec05cb5c02af1b710e89a99500edeb0" dependencies = [ - "opentelemetry", + "opentelemetry 0.27.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.17.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76" dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.27.0", + "opentelemetry-http 0.27.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.0", "prost", "thiserror 1.0.69", ] @@ -4193,33 +4233,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "prometheus", "protobuf", ] [[package]] name = "opentelemetry-proto" -version = "0.7.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.0", + "opentelemetry_sdk 0.27.0", "prost", "tonic", ] [[package]] name = "opentelemetry-resource-detectors" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00a7e965924ad5234917f135243605ef6f2ae3f4da8d3363065d679b2c150f2a" +checksum = "50b6e2f52e7e482fb8d2a01026014a92f0307dd0f0fc597eb991d05177fcd5ff" dependencies = [ - "opentelemetry", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry 0.26.0", + "opentelemetry-semantic-conventions 0.26.0", + "opentelemetry_sdk 0.26.0", ] [[package]] @@ -4228,17 +4268,23 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db945c1eaea8ac6a9677185357480d215bb6999faa9f691d0c4d4d641eab7a09" + [[package]] name = "opentelemetry-stdout" -version = "0.5.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" +checksum = "bc8a298402aa5c260be90d10dc54b5a7d4e1025c354848f8e2c976d761351049" dependencies = [ "async-trait", "chrono", "futures-util", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.0", + "opentelemetry_sdk 0.27.0", "ordered-float", "serde", "serde_json", @@ -4257,13 +4303,46 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", + "percent-encoding", + "rand", + "thiserror 1.0.69", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry 0.26.0", + "thiserror 1.0.69", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b742c1cae4693792cc564e58d75a2a0ba29421a34a85b50da92efa89ecb2bc" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.27.0", "percent-encoding", "rand", "serde_json", "thiserror 1.0.69", "tokio", "tokio-stream", + "tracing", ] [[package]] @@ -6652,8 +6731,8 @@ checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "tracing", "tracing-core", "tracing-subscriber", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 45dd9f8c6..f5544fd91 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -49,17 +49,17 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] } tracing-opentelemetry.workspace = true opentelemetry.workspace = true opentelemetry-http.workspace = true -opentelemetry-jaeger-propagator = "0.3.0" -opentelemetry-otlp = { version = "0.17.0", default-features = false, features = [ +opentelemetry-jaeger-propagator = "0.27.0" +opentelemetry-otlp = { version = "0.27.0", default-features = false, features = [ "trace", "metrics", "http-proto", ] } opentelemetry-prometheus = "0.17.0" -opentelemetry-resource-detectors = "0.3.0" +opentelemetry-resource-detectors = "0.5.0" opentelemetry-semantic-conventions.workspace = true -opentelemetry-stdout = { version = "0.5.0", features = ["trace", "metrics"] } -opentelemetry_sdk = { version = "0.24.1", features = [ +opentelemetry-stdout = { version = "0.27.0", features = ["trace", "metrics"] } +opentelemetry_sdk = { version = "0.27.0", features = [ "trace", "metrics", "rt-tokio",