diff --git a/Cargo.lock b/Cargo.lock index 253308775..867e1c340 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3175,7 +3175,7 @@ dependencies = [ "mas-tasks", "mas-templates", "mas-tower", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-http", "opentelemetry-jaeger-propagator", "opentelemetry-otlp", @@ -3183,7 +3183,7 @@ dependencies = [ "opentelemetry-resource-detectors", "opentelemetry-semantic-conventions", "opentelemetry-stdout", - "opentelemetry_sdk", + "opentelemetry_sdk 0.31.0", "rand 0.8.5", "rand_chacha 0.3.1", "reqwest", @@ -3246,7 +3246,7 @@ name = "mas-context" version = "1.3.0" dependencies = [ "console", - "opentelemetry", + "opentelemetry 0.30.0", "pin-project-lite", "quanta", "tokio", @@ -3340,7 +3340,7 @@ dependencies = [ "minijinja", "minijinja-contrib", "oauth2-types", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-semantic-conventions", "pbkdf2", "pkcs8", @@ -3379,7 +3379,7 @@ dependencies = [ "headers", "http", "hyper-util", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-http", "opentelemetry-semantic-conventions", "reqwest", @@ -3646,7 +3646,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry", + "opentelemetry 0.30.0", "rand_core 0.6.4", "serde", "serde_json", @@ -3669,7 +3669,7 @@ dependencies = [ "mas-jose", "mas-storage", "oauth2-types", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-semantic-conventions", "rand 0.8.5", "rand_chacha 0.3.1", @@ -3701,7 +3701,7 @@ dependencies = [ "mas-storage", "mas-storage-pg", "mas-templates", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-semantic-conventions", "rand 0.8.5", "rand_chacha 0.3.1", @@ -3751,7 +3751,7 @@ name = "mas-tower" version = "1.3.0" dependencies = [ "http", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-http", "opentelemetry-semantic-conventions", "pin-project-lite", @@ -4122,6 +4122,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "opentelemetry" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.17", + "tracing", +] + [[package]] name = "opentelemetry-http" version = "0.30.0" @@ -4131,7 +4145,7 @@ dependencies = [ "async-trait", "bytes", "http", - "opentelemetry", + "opentelemetry 0.30.0", "reqwest", ] @@ -4141,7 +4155,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090b8ec07bb2e304b529581aa1fe530d7861298c9ef549ebbf44a4a56472c539" dependencies = [ - "opentelemetry", + "opentelemetry 0.30.0", ] [[package]] @@ -4151,22 +4165,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b" dependencies = [ "http", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.30.0", "prost", "thiserror 2.0.17", ] [[package]] name = "opentelemetry-prometheus-text-exporter" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddbb5743c13741bd9207de7c449f9797c0e513ac07551eac807da94056c530d9" +checksum = "897906366b17a89bec845f6051e0c3474049402a09a0711eea180941293bd013" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.31.0", + "opentelemetry_sdk 0.31.0", "smartstring", ] @@ -4176,8 +4190,8 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "prost", "tonic", ] @@ -4188,9 +4202,9 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a44e076f07fa3d76e741991f4f7d3ecbac0eed8521ced491fbdf8db77d024cf" dependencies = [ - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.30.0", ] [[package]] @@ -4206,8 +4220,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447191061af41c3943e082ea359ab8b64ff27d6d34d30d327df309ddef1eef6f" dependencies = [ "chrono", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", ] [[package]] @@ -4219,11 +4233,26 @@ dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry", + "opentelemetry 0.30.0", "percent-encoding", "rand 0.9.2", "serde_json", "thiserror 2.0.17", +] + +[[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", + "percent-encoding", + "rand 0.9.2", + "thiserror 2.0.17", "tokio", "tokio-stream", ] @@ -5172,7 +5201,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6028,7 +6057,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6118,7 +6147,7 @@ dependencies = [ "mas-storage", "mas-storage-pg", "oauth2-types", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-semantic-conventions", "rand 0.8.5", "rand_chacha 0.3.1", @@ -6578,8 +6607,8 @@ checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "tracing", "tracing-core", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index 8d525c706..17402d3bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -408,7 +408,7 @@ version = "0.30.0" default-features = false features = ["trace", "metrics", "http-proto"] [workspace.dependencies.opentelemetry-prometheus-text-exporter] -version = "0.2.0" +version = "0.2.1" [workspace.dependencies.opentelemetry-resource-detectors] version = "0.9.0" [workspace.dependencies.opentelemetry-semantic-conventions] @@ -418,7 +418,7 @@ features = ["semconv_experimental"] version = "0.30.0" features = ["trace", "metrics"] [workspace.dependencies.opentelemetry_sdk] -version = "0.30.0" +version = "0.31.0" features = [ "experimental_trace_batch_span_processor_with_async_runtime", "experimental_metrics_periodicreader_with_async_runtime",