diff --git a/Cargo.lock b/Cargo.lock index fcb8b8c2938..e5890b4ee71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5183,9 +5183,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" dependencies = [ "futures-core", "futures-sink", @@ -5197,9 +5197,9 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.5.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84de945cb3a6f1e0d6317cbd998bbd0519ab00f4b790db67e0ff4fdcf7cedb6" +checksum = "14f62d9a23c680ab91c74605f5006110768eb67600bb654937fef5c852fb8ec7" dependencies = [ "opentelemetry", "tracing", @@ -5209,9 +5209,9 @@ dependencies = [ [[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", @@ -5227,9 +5227,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.7.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +checksum = "c9d3968ce3aefdcca5c27e3c4ea4391b37547726a70893aab52d3de95d5f8b34" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -5239,15 +5239,15 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.16.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" +checksum = "db945c1eaea8ac6a9677185357480d215bb6999faa9f691d0c4d4d641eab7a09" [[package]] name = "opentelemetry_sdk" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" dependencies = [ "async-std", "async-trait", @@ -8120,9 +8120,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +checksum = "dc58af5d3f6c5811462cabb3289aec0093f7338e367e5a33d28c0433b3c7360b" dependencies = [ "js-sys", "once_cell", diff --git a/implementations/rust/ockam/ockam_api/Cargo.toml b/implementations/rust/ockam/ockam_api/Cargo.toml index 9c74a52b161..15f5645f0c0 100644 --- a/implementations/rust/ockam/ockam_api/Cargo.toml +++ b/implementations/rust/ockam/ockam_api/Cargo.toml @@ -79,11 +79,11 @@ miette = "7" minicbor = { version = "0.24.1", features = ["alloc", "derive"] } nix = { version = "0.29", features = ["signal"] } open = "5.3.0" -opentelemetry = { version = "0.24.0", features = ["logs", "metrics", "trace"] } -opentelemetry-appender-tracing = { version = "0.5.0" } -opentelemetry-otlp = { version = "0.17.0", features = ["logs", "metrics", "trace", "grpc-tonic", "tls", "tls-roots"], default-features = false } -opentelemetry-semantic-conventions = { version = "0.16.0" } -opentelemetry_sdk = { version = "0.24.1", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false } +opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"] } +opentelemetry-appender-tracing = { version = "0.26.0" } +opentelemetry-otlp = { version = "0.26.0", features = ["logs", "metrics", "trace", "grpc-tonic", "tls", "tls-roots"], default-features = false } +opentelemetry-semantic-conventions = { version = "0.26.0", features = ["semconv_experimental"] } +opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false } petname = { version = "2.0.2", default-features = false, features = ["default-rng", "default-words"] } r3bl_rs_utils_core = "0.9" r3bl_tui = "0.5" @@ -107,8 +107,8 @@ tracing = { version = "0.1", default-features = false } tracing-appender = "0.2.2" tracing-core = { version = "0.1.32", default-features = false } tracing-error = "0.2.0" -tracing-opentelemetry = "0.25.0" -tracing-subscriber = { version = "0.3.18", features = ["json"] } +tracing-opentelemetry = "0.27.0" +tracing-subscriber = { version = "0.3", features = ["json"] } url = "2.5.2" ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.62.0", features = ["cbor", "serde"] } @@ -164,7 +164,7 @@ ockam_macros = { path = "../ockam_macros", features = ["std"], version = "^0.35. ockam_transport_core = { path = "../ockam_transport_core", version = "^0.92.0" } ockam_transport_tcp = { path = "../ockam_transport_tcp", default-features = false, version = "^0.125.0" } once_cell = { version = "1", default-features = false } -opentelemetry_sdk = { version = "0.24.1", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false } +opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false } pretty_assertions = "1.4.1" proptest = "1.5.0" quickcheck = "1.0.1" diff --git a/implementations/rust/ockam/ockam_api/src/logs/log_exporters.rs b/implementations/rust/ockam/ockam_api/src/logs/log_exporters.rs index ba47d967916..d223bd42d3e 100644 --- a/implementations/rust/ockam/ockam_api/src/logs/log_exporters.rs +++ b/implementations/rust/ockam/ockam_api/src/logs/log_exporters.rs @@ -1,7 +1,6 @@ use ockam_core::async_trait; use opentelemetry::logs::{LogResult, Severity}; -use opentelemetry_sdk::export::logs::{LogData, LogExporter}; -use std::borrow::Cow; +use opentelemetry_sdk::export::logs::{LogBatch, LogExporter}; use std::time::Duration; /// This exporter can be used to intercept the log records sent to an OpenTelemetry collector @@ -12,7 +11,7 @@ pub struct DecoratedLogExporter { #[async_trait] impl LogExporter for DecoratedLogExporter { - async fn export<'a>(&mut self, batch: Vec>) -> LogResult<()> { + async fn export(&mut self, batch: LogBatch<'_>) -> LogResult<()> { self.exporter.export(batch).await } @@ -41,7 +40,7 @@ pub struct OckamLogExporter { #[async_trait] impl LogExporter for OckamLogExporter { - async fn export<'a>(&mut self, batch: Vec>) -> LogResult<()> { + async fn export(&mut self, batch: LogBatch<'_>) -> LogResult<()> { match self.log_export_cutoff { Some(cutoff) => { let f = self.exporter.export(batch); diff --git a/implementations/rust/ockam/ockam_api/src/logs/setup.rs b/implementations/rust/ockam/ockam_api/src/logs/setup.rs index c9256a48eba..e27bbdd33b8 100644 --- a/implementations/rust/ockam/ockam_api/src/logs/setup.rs +++ b/implementations/rust/ockam/ockam_api/src/logs/setup.rs @@ -10,6 +10,7 @@ use opentelemetry_sdk::propagation::TraceContextPropagator; use opentelemetry_sdk::trace::{BatchConfig, BatchConfigBuilder, BatchSpanProcessor}; use opentelemetry_sdk::{self as sdk}; use opentelemetry_sdk::{logs, Resource}; +use opentelemetry_semantic_conventions::attribute; use std::io::{empty, stdout}; use tonic::metadata::*; use tracing_appender::non_blocking::NonBlocking; @@ -428,14 +429,8 @@ fn create_tracer( fn make_resource(app_name: String) -> Resource { let host_name = gethostname().to_string_lossy().to_string(); Resource::new(vec![ - KeyValue::new( - opentelemetry_semantic_conventions::resource::SERVICE_NAME, - "ockam", - ), - KeyValue::new( - opentelemetry_semantic_conventions::resource::HOST_NAME, - host_name, - ), + KeyValue::new(attribute::SERVICE_NAME, "ockam"), + KeyValue::new(attribute::HOST_NAME, host_name), KeyValue::new(APP_NAME.clone(), app_name), ]) } diff --git a/implementations/rust/ockam/ockam_command/Cargo.toml b/implementations/rust/ockam/ockam_command/Cargo.toml index df673a364f8..5fdd42aa479 100644 --- a/implementations/rust/ockam/ockam_command/Cargo.toml +++ b/implementations/rust/ockam/ockam_command/Cargo.toml @@ -79,7 +79,7 @@ ockam_node = { path = "../ockam_node", version = "^0.127.0" } ockam_vault = { path = "../ockam_vault", version = "^0.120.0", default-features = false, features = ["storage", "std"] } once_cell = "1.19" open = "5.3.0" -opentelemetry = { version = "0.24.0", features = ["metrics", "trace"] } +opentelemetry = { version = "0.26.0", features = ["metrics", "trace"] } pem-rfc7468 = { version = "0.7.0", features = ["std"] } r3bl_rs_utils_core = "0.9.12" r3bl_tui = "0.5.8" diff --git a/implementations/rust/ockam/ockam_core/Cargo.toml b/implementations/rust/ockam/ockam_core/Cargo.toml index ecac9f57340..a3e516c7d90 100644 --- a/implementations/rust/ockam/ockam_core/Cargo.toml +++ b/implementations/rust/ockam/ockam_core/Cargo.toml @@ -82,7 +82,7 @@ miette = { version = "7", optional = true } minicbor = { version = "0.24.1", features = ["derive"] } ockam_macros = { path = "../ockam_macros", version = "^0.35.0", default-features = false } once_cell = { version = "1", optional = true, default-features = false } -opentelemetry = { version = "0.24.0", features = ["logs", "metrics", "trace"], optional = true } +opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"], optional = true } rand = { version = "0.8", default-features = false } rand_pcg = { version = "0.3.1", default-features = false, optional = true } regex = { version = "1.10.6", default-features = false, optional = true } @@ -94,7 +94,7 @@ strum = { version = "0.26.3", default-features = false, features = ["derive"] } tinyvec = { version = "1.8.0", features = ["rustc_1_57"] } tracing = { version = "0.1", default-features = false } tracing-error = { version = "0.2", default-features = false, optional = true } -tracing-opentelemetry = { version = "0.25.0", optional = true } +tracing-opentelemetry = { version = "0.27.0", optional = true } tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"], optional = true } # Wasn't tested on no_std utcnow = { version = "0.2.5", default-features = false, features = ["fallback"], optional = true } diff --git a/implementations/rust/ockam/ockam_node/Cargo.toml b/implementations/rust/ockam/ockam_node/Cargo.toml index 313ba53ffe2..7eb03cb7500 100644 --- a/implementations/rust/ockam/ockam_node/Cargo.toml +++ b/implementations/rust/ockam/ockam_node/Cargo.toml @@ -92,7 +92,7 @@ ockam_executor = { path = "../ockam_executor", version = "^0.87.0", default-feat ockam_macros = { path = "../ockam_macros", version = "^0.35.0" } ockam_transport_core = { path = "../ockam_transport_core", version = "^0.92.0", default-features = false, optional = true } once_cell = { version = "1.19.0", optional = true, default-features = false } -opentelemetry = { version = "0.24.0", features = ["logs", "metrics", "trace"], optional = true } +opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"], optional = true } regex = { version = "1.10.6", default-features = false, optional = true } serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1", optional = true } @@ -106,7 +106,7 @@ tokio = { version = "1.39", default-features = false, optional = true, features tokio-retry = { version = "0.3.0", optional = true } tracing = { version = "0.1", default-features = false } tracing-error = { version = "0.2", optional = true } -tracing-opentelemetry = { version = "0.25.0", optional = true } +tracing-opentelemetry = { version = "0.27.0", optional = true } tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"], optional = true } [dev-dependencies] diff --git a/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml b/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml index 73732e71855..d162737f068 100644 --- a/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml +++ b/implementations/rust/ockam/ockam_transport_tcp/Cargo.toml @@ -43,7 +43,7 @@ ockam_core = { path = "../ockam_core", version = "^0.118.0" } ockam_macros = { path = "../ockam_macros", version = "^0.35.0" } ockam_node = { path = "../ockam_node", version = "^0.127.0" } ockam_transport_core = { path = "../ockam_transport_core", version = "^0.92.0" } -opentelemetry = { version = "0.24.0", features = ["logs", "metrics", "trace"], optional = true } +opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"], optional = true } rand = "0.8" rustls = { version = "0.23", default-features = false } rustls-native-certs = "0.8"