diff --git a/Cargo.lock b/Cargo.lock index 7c70a89b..d1bbae04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2292,7 +2292,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3035,14 +3035,14 @@ dependencies = [ "mas-templates", "mas-tower", "oauth2-types", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.22.0", + "opentelemetry-http 0.11.1", "opentelemetry-jaeger-propagator", "opentelemetry-otlp", "opentelemetry-prometheus", "opentelemetry-semantic-conventions", "opentelemetry-stdout", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prometheus", "rand", "rand_chacha", @@ -3163,7 +3163,7 @@ dependencies = [ "mime", "minijinja", "oauth2-types", - "opentelemetry", + "opentelemetry 0.22.0", "opentelemetry-semantic-conventions", "pbkdf2", "psl", @@ -3200,7 +3200,7 @@ dependencies = [ "hyper 0.14.28", "hyper-rustls", "mas-tower", - "opentelemetry", + "opentelemetry 0.22.0", "opentelemetry-semantic-conventions", "rustls 0.22.4", "rustls-platform-verifier", @@ -3480,7 +3480,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry", + "opentelemetry 0.22.0", "rand_core", "serde", "serde_json", @@ -3539,7 +3539,7 @@ dependencies = [ "mas-storage-pg", "mas-templates", "mas-tower", - "opentelemetry", + "opentelemetry 0.22.0", "rand", "rand_chacha", "serde", @@ -3587,8 +3587,8 @@ name = "mas-tower" version = "0.9.0" dependencies = [ "http 0.2.12", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.22.0", + "opentelemetry-http 0.11.1", "opentelemetry-semantic-conventions", "pin-project-lite", "tower", @@ -3886,7 +3886,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "indexmap 2.2.6", + "indexmap 1.9.3", "json-patch", "md-5", "parse-size", @@ -3932,6 +3932,20 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry-http" version = "0.11.1" @@ -3942,58 +3956,69 @@ dependencies = [ "bytes", "http 0.2.12", "hyper 0.14.28", - "opentelemetry", + "opentelemetry 0.22.0", "tokio", ] [[package]] -name = "opentelemetry-jaeger-propagator" -version = "0.1.0" +name = "opentelemetry-http" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb4ec62efc537b60aaa89b92624f986f2523d3a609079f3511cc8ee73490826" +checksum = "b0ba633e55c5ea6f431875ba55e71664f2fa5d3a90bd34ec9302eecc41c865dd" dependencies = [ - "opentelemetry", + "async-trait", + "bytes", + "http 0.2.12", + "opentelemetry 0.23.0", +] + +[[package]] +name = "opentelemetry-jaeger-propagator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c190755e0aeec909343896f94670446ac686dd1eaf5e2beb4149a7148cfe1d6c" +dependencies = [ + "opentelemetry 0.23.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.23.0", + "opentelemetry-http 0.12.0", "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prost", "thiserror", ] [[package]] name = "opentelemetry-prometheus" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bbcf6341cab7e2193e5843f0ac36c446a5b3fccb28747afaeda17996dcd02e" +checksum = "5e1a24eafe47b693cb938f8505f240dc26c71db60df9aca376b4f857e9653ec7" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "prometheus", "protobuf", ] [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "prost", "tonic", ] @@ -4006,18 +4031,19 @@ checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" [[package]] name = "opentelemetry-stdout" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdf28b381f23afcd150afc0b38a4183dd321fc96320c1554752b6b761648f78" +checksum = "d6d080bf06af02b738feb2e6830cf72c30b76ca18b40f555cdf1b53e7b491bfe" dependencies = [ "async-trait", "chrono", "futures-util", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "ordered-float", "serde", "serde_json", + "thiserror", ] [[package]] @@ -4031,13 +4057,33 @@ dependencies = [ "futures-channel", "futures-executor", "futures-util", - "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "ordered-float", "percent-encoding", "rand", "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "lazy_static", + "once_cell", + "opentelemetry 0.23.0", + "ordered-float", + "percent-encoding", + "rand", + "serde_json", + "thiserror", "tokio", "tokio-stream", ] @@ -6173,8 +6219,8 @@ checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", "tracing", "tracing-core", "tracing-subscriber", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 295b1704..7096db29 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -43,12 +43,12 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] } tracing-opentelemetry.workspace = true opentelemetry.workspace = true opentelemetry-http.workspace = true -opentelemetry-jaeger-propagator = "0.1.0" -opentelemetry-otlp = { version = "0.15.0", default-features = false, features = ["trace", "metrics", "http-proto"] } -opentelemetry-prometheus = "0.15.0" +opentelemetry-jaeger-propagator = "0.2.0" +opentelemetry-otlp = { version = "0.16.0", default-features = false, features = ["trace", "metrics", "http-proto"] } +opentelemetry-prometheus = "0.16.0" opentelemetry-semantic-conventions.workspace = true -opentelemetry-stdout = { version = "0.3.0", features = ["trace", "metrics"] } -opentelemetry_sdk = { version = "0.22.1", features = ["trace", "metrics", "rt-tokio"] } +opentelemetry-stdout = { version = "0.4.0", features = ["trace", "metrics"] } +opentelemetry_sdk = { version = "0.23.0", features = ["trace", "metrics", "rt-tokio"] } prometheus = "0.13.4" sentry = { version = "0.31.8", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] } sentry-tracing = "0.31.8"