From c37fcfd786a8c9a6179e2a87042b10fc0024885f Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 28 Jun 2024 16:33:58 +0200 Subject: [PATCH] Bump the other opentelemetry crates --- Cargo.lock | 122 +++++++++++++----------------------- Cargo.toml | 28 +++++++-- crates/cli/Cargo.toml | 1 + crates/cli/src/telemetry.rs | 18 +++--- 4 files changed, 76 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1bbae04..554bdfbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2292,7 +2292,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3035,14 +3035,15 @@ dependencies = [ "mas-templates", "mas-tower", "oauth2-types", - "opentelemetry 0.22.0", - "opentelemetry-http 0.11.1", + "opentelemetry", + "opentelemetry-http", "opentelemetry-jaeger-propagator", "opentelemetry-otlp", "opentelemetry-prometheus", + "opentelemetry-resource-detectors", "opentelemetry-semantic-conventions", "opentelemetry-stdout", - "opentelemetry_sdk 0.23.0", + "opentelemetry_sdk", "prometheus", "rand", "rand_chacha", @@ -3163,7 +3164,7 @@ dependencies = [ "mime", "minijinja", "oauth2-types", - "opentelemetry 0.22.0", + "opentelemetry", "opentelemetry-semantic-conventions", "pbkdf2", "psl", @@ -3200,7 +3201,7 @@ dependencies = [ "hyper 0.14.28", "hyper-rustls", "mas-tower", - "opentelemetry 0.22.0", + "opentelemetry", "opentelemetry-semantic-conventions", "rustls 0.22.4", "rustls-platform-verifier", @@ -3480,7 +3481,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry 0.22.0", + "opentelemetry", "rand_core", "serde", "serde_json", @@ -3539,7 +3540,7 @@ dependencies = [ "mas-storage-pg", "mas-templates", "mas-tower", - "opentelemetry 0.22.0", + "opentelemetry", "rand", "rand_chacha", "serde", @@ -3587,8 +3588,8 @@ name = "mas-tower" version = "0.9.0" dependencies = [ "http 0.2.12", - "opentelemetry 0.22.0", - "opentelemetry-http 0.11.1", + "opentelemetry", + "opentelemetry-http", "opentelemetry-semantic-conventions", "pin-project-lite", "tower", @@ -3886,7 +3887,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "indexmap 1.9.3", + "indexmap 2.2.6", "json-patch", "md-5", "parse-size", @@ -3917,21 +3918,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - [[package]] name = "opentelemetry" version = "0.23.0" @@ -3946,20 +3932,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "opentelemetry-http" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7690dc77bf776713848c4faa6501157469017eaf332baccd4eb1cea928743d94" -dependencies = [ - "async-trait", - "bytes", - "http 0.2.12", - "hyper 0.14.28", - "opentelemetry 0.22.0", - "tokio", -] - [[package]] name = "opentelemetry-http" version = "0.12.0" @@ -3969,7 +3941,9 @@ dependencies = [ "async-trait", "bytes", "http 0.2.12", - "opentelemetry 0.23.0", + "hyper 0.14.28", + "opentelemetry", + "tokio", ] [[package]] @@ -3978,7 +3952,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c190755e0aeec909343896f94670446ac686dd1eaf5e2beb4149a7148cfe1d6c" dependencies = [ - "opentelemetry 0.23.0", + "opentelemetry", ] [[package]] @@ -3990,10 +3964,10 @@ dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry 0.23.0", - "opentelemetry-http 0.12.0", + "opentelemetry", + "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk 0.23.0", + "opentelemetry_sdk", "prost", "thiserror", ] @@ -4005,8 +3979,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1a24eafe47b693cb938f8505f240dc26c71db60df9aca376b4f857e9653ec7" dependencies = [ "once_cell", - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", + "opentelemetry", + "opentelemetry_sdk", "prometheus", "protobuf", ] @@ -4017,17 +3991,28 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", + "opentelemetry", + "opentelemetry_sdk", "prost", "tonic", ] [[package]] -name = "opentelemetry-semantic-conventions" -version = "0.14.0" +name = "opentelemetry-resource-detectors" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" +checksum = "b5cd98b7277913e22e95b6fd3a5f7413438005471a6e33e8a4ae7b9a20be36ad" +dependencies = [ + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" [[package]] name = "opentelemetry-stdout" @@ -4038,33 +4023,14 @@ dependencies = [ "async-trait", "chrono", "futures-util", - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", + "opentelemetry", + "opentelemetry_sdk", "ordered-float", "serde", "serde_json", "thiserror", ] -[[package]] -name = "opentelemetry_sdk" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry 0.22.0", - "ordered-float", - "percent-encoding", - "rand", - "thiserror", -] - [[package]] name = "opentelemetry_sdk" version = "0.23.0" @@ -4078,7 +4044,7 @@ dependencies = [ "glob", "lazy_static", "once_cell", - "opentelemetry 0.23.0", + "opentelemetry", "ordered-float", "percent-encoding", "rand", @@ -6213,14 +6179,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", - "opentelemetry 0.22.0", - "opentelemetry_sdk 0.22.1", + "opentelemetry", + "opentelemetry_sdk", "tracing", "tracing-core", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index e3f8f3e0..f6149724 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,7 +115,15 @@ default-features = false [workspace.dependencies.lettre] version = "=0.11.4" default-features = false -features = ["tokio1-rustls-tls", "hostname", "builder", "tracing", "pool", "smtp-transport", "sendmail-transport"] +features = [ + "tokio1-rustls-tls", + "hostname", + "builder", + "tracing", + "pool", + "smtp-transport", + "sendmail-transport", +] # Templates [workspace.dependencies.minijinja] @@ -151,7 +159,15 @@ features = ["preserve_order"] # SQL database support [workspace.dependencies.sqlx] version = "0.7.4" -features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "json", "uuid", "ipnetwork"] +features = [ + "runtime-tokio-rustls", + "postgres", + "migrate", + "chrono", + "json", + "uuid", + "ipnetwork", +] # Custom error types [workspace.dependencies.thiserror] @@ -175,15 +191,15 @@ version = "0.3.18" # OpenTelemetry [workspace.dependencies.opentelemetry] -version = "0.22.0" +version = "0.23.0" features = ["trace", "metrics"] [workspace.dependencies.opentelemetry-http] -version = "0.11.1" +version = "0.12.0" features = ["hyper", "tokio"] [workspace.dependencies.opentelemetry-semantic-conventions] -version = "0.14.0" +version = "0.15.0" [workspace.dependencies.tracing-opentelemetry] -version = "0.23.0" +version = "0.24.0" default-features = false # URL manipulation diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 7096db29..54787166 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -46,6 +46,7 @@ opentelemetry-http.workspace = true 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-resource-detectors = "0.2.0" opentelemetry-semantic-conventions.workspace = true opentelemetry-stdout = { version = "0.4.0", features = ["trace", "metrics"] } opentelemetry_sdk = { version = "0.23.0", features = ["trace", "metrics", "rt-tokio"] } diff --git a/crates/cli/src/telemetry.rs b/crates/cli/src/telemetry.rs index 9fd08913..48b4ecab 100644 --- a/crates/cli/src/telemetry.rs +++ b/crates/cli/src/telemetry.rs @@ -1,4 +1,4 @@ -// Copyright 2021, 2022 The Matrix.org Foundation C.I.C. +// Copyright 2021-2024 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -127,12 +127,12 @@ fn tracer(config: &TracingConfig) -> anyhow::Result> { } }; - let tracer = tracer_provider.versioned_tracer( - env!("CARGO_PKG_NAME"), - Some(env!("CARGO_PKG_VERSION")), - Some(semcov::SCHEMA_URL), - None, - ); + let tracer = tracer_provider + .tracer_builder(env!("CARGO_PKG_NAME")) + .with_version(env!("CARGO_PKG_VERSION")) + .with_schema_url(semcov::SCHEMA_URL) + .build(); + global::set_tracer_provider(tracer_provider); Ok(Some(tracer)) @@ -248,8 +248,8 @@ fn resource() -> Resource { Duration::from_secs(5), vec![ Box::new(opentelemetry_sdk::resource::EnvResourceDetector::new()), - Box::new(opentelemetry_sdk::resource::OsResourceDetector), - Box::new(opentelemetry_sdk::resource::ProcessResourceDetector), + Box::new(opentelemetry_resource_detectors::OsResourceDetector), + Box::new(opentelemetry_resource_detectors::ProcessResourceDetector), Box::new(opentelemetry_sdk::resource::TelemetryResourceDetector), ], );