From 449c560b6380bafe8c7a86f2cae8c6537ed4f186 Mon Sep 17 00:00:00 2001 From: Adrian Benavides Date: Thu, 12 Dec 2024 11:31:09 +0100 Subject: [PATCH] chore(rust): logs adjustments --- implementations/rust/ockam/ockam_api/src/logs/setup.rs | 1 - .../rust/ockam/ockam_api/src/nodes/service/relay.rs | 1 - .../rust/ockam/ockam_api/tests/logging_tracing.rs | 5 ----- implementations/rust/ockam/ockam_command/src/node/show.rs | 2 +- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/implementations/rust/ockam/ockam_api/src/logs/setup.rs b/implementations/rust/ockam/ockam_api/src/logs/setup.rs index 080b2463209..2d02ba0c43c 100644 --- a/implementations/rust/ockam/ockam_api/src/logs/setup.rs +++ b/implementations/rust/ockam/ockam_api/src/logs/setup.rs @@ -3,7 +3,6 @@ use opentelemetry::trace::TracerProvider; use opentelemetry::{global, KeyValue}; use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; use opentelemetry_otlp::WithExportConfig; -use opentelemetry_sdk as sdk; use opentelemetry_sdk::export::logs::LogExporter; use opentelemetry_sdk::export::trace::SpanExporter; use opentelemetry_sdk::logs::{BatchLogProcessor, LoggerProvider}; diff --git a/implementations/rust/ockam/ockam_api/src/nodes/service/relay.rs b/implementations/rust/ockam/ockam_api/src/nodes/service/relay.rs index 58713f74fc6..f51b9fcbbc0 100644 --- a/implementations/rust/ockam/ockam_api/src/nodes/service/relay.rs +++ b/implementations/rust/ockam/ockam_api/src/nodes/service/relay.rs @@ -204,7 +204,6 @@ impl NodeManager { info!( %alias, %address, ?authorized, ?relay_address, - forwarding_route = ?relay_info.forwarding_route(), remote_address = ?relay_info.remote_address(), "relay created" ); diff --git a/implementations/rust/ockam/ockam_api/tests/logging_tracing.rs b/implementations/rust/ockam/ockam_api/tests/logging_tracing.rs index 12c010df860..a142e7126ac 100644 --- a/implementations/rust/ockam/ockam_api/tests/logging_tracing.rs +++ b/implementations/rust/ockam/ockam_api/tests/logging_tracing.rs @@ -5,11 +5,6 @@ use ockam_api::logs::{ use opentelemetry::global; use opentelemetry::trace::Tracer; - -use opentelemetry_sdk as sdk; -use sdk::testing::logs::*; -use sdk::testing::trace::*; - use opentelemetry_sdk::testing::logs::InMemoryLogsExporter; use opentelemetry_sdk::testing::trace::InMemorySpanExporter; use std::fs; diff --git a/implementations/rust/ockam/ockam_command/src/node/show.rs b/implementations/rust/ockam/ockam_command/src/node/show.rs index 52c9938ae01..2a0278fe924 100644 --- a/implementations/rust/ockam/ockam_command/src/node/show.rs +++ b/implementations/rust/ockam/ockam_command/src/node/show.rs @@ -171,7 +171,7 @@ pub async fn is_node_up( .ask_with_timeout::<(), NodeStatus>(ctx, api::query_status(), Duration::from_secs(1)) .await { - if status.status.is_running() { + if status.process_status.is_running() { return Ok(true); } }