diff --git a/Cargo.lock b/Cargo.lock index 11efd8e99..d3e9c7ce8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3138,7 +3138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3302,15 +3302,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-stdout", - "opentelemetry_sdk", + "opentelemetry_sdk 0.26.0", "prometheus", "rand", "rand_chacha", @@ -3437,7 +3437,7 @@ dependencies = [ "minijinja", "nonzero_ext", "oauth2-types", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-semantic-conventions", "pbkdf2", "psl", @@ -3480,7 +3480,7 @@ dependencies = [ "hyper-rustls", "hyper-util", "mas-tower", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-semantic-conventions", "pin-project-lite", "rustls", @@ -3757,7 +3757,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry", + "opentelemetry 0.24.0", "rand_core", "serde", "serde_json", @@ -3816,7 +3816,7 @@ dependencies = [ "mas-storage-pg", "mas-templates", "mas-tower", - "opentelemetry", + "opentelemetry 0.24.0", "rand", "rand_chacha", "serde", @@ -3864,8 +3864,8 @@ name = "mas-tower" version = "0.12.0" dependencies = [ "http", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.24.0", + "opentelemetry-http 0.13.0", "opentelemetry-semantic-conventions", "pin-project-lite", "tower 0.5.1", @@ -4210,6 +4210,20 @@ dependencies = [ "thiserror", ] +[[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", +] + [[package]] name = "opentelemetry-http" version = "0.13.0" @@ -4222,32 +4236,44 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "opentelemetry", + "opentelemetry 0.24.0", "tokio", ] +[[package]] +name = "opentelemetry-http" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6351496aeaa49d7c267fb480678d85d1cd30c5edb20b497c48c56f62a8c14b99" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry 0.26.0", +] + [[package]] name = "opentelemetry-jaeger-propagator" -version = "0.3.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +checksum = "ed7673897c81631b7d4fb7a6901f045cc3010fea5eec5aee511192a6b8e5afe6" dependencies = [ - "opentelemetry", + "opentelemetry 0.26.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.17.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +checksum = "29e1f9c8b032d4f635c730c0efcf731d5e2530ea13fa8bef7939ddc8420696bd" dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.26.0", + "opentelemetry-http 0.26.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.26.0", "prost", "thiserror", ] @@ -4259,20 +4285,20 @@ 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.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +checksum = "abbbb5e699de56aacd607631354d0ed0315e67ed36b7398849e4f8a039eaa07e" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.26.0", + "opentelemetry_sdk 0.26.0", "prost", "tonic", ] @@ -4283,9 +4309,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00a7e965924ad5234917f135243605ef6f2ae3f4da8d3363065d679b2c150f2a" dependencies = [ - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", ] [[package]] @@ -4296,15 +4322,15 @@ checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" [[package]] name = "opentelemetry-stdout" -version = "0.5.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" +checksum = "4a5c185afbc26decc6f10d728971847e3f96532d2b3fb7db2569c1bce154509b" dependencies = [ "async-trait", "chrono", "futures-util", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.26.0", + "opentelemetry_sdk 0.26.0", "ordered-float", "serde", "serde_json", @@ -4323,7 +4349,25 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", + "percent-encoding", + "rand", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.26.0", "percent-encoding", "rand", "serde_json", @@ -6605,8 +6649,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 a1bac3241..d1dc4fd0a 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -47,13 +47,13 @@ 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 = ["trace", "metrics", "http-proto"] } +opentelemetry-jaeger-propagator = "0.26.0" +opentelemetry-otlp = { version = "0.26.0", default-features = false, features = ["trace", "metrics", "http-proto"] } opentelemetry-prometheus = "0.17.0" opentelemetry-resource-detectors = "0.3.0" opentelemetry-semantic-conventions.workspace = true -opentelemetry-stdout = { version = "0.5.0", features = ["trace", "metrics"] } -opentelemetry_sdk = { version = "0.24.1", features = ["trace", "metrics", "rt-tokio"] } +opentelemetry-stdout = { version = "0.26.0", features = ["trace", "metrics"] } +opentelemetry_sdk = { version = "0.26.0", features = ["trace", "metrics", "rt-tokio"] } prometheus = "0.13.4" sentry.workspace = true sentry-tracing.workspace = true