moving operation_logs out of agent #1027

- moved operation logs out of agent to be used in mapper

Signed-off-by: initard <solo@softwareag.com>

7 files changed, 11 insertions, 5 deletions

diff --git a/Cargo.lock b/Cargo.lock
index f729c14a..8e0aec26 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1887,6 +1887,7 @@ dependencies = [
  "tempfile",
  "test-case",
  "thiserror",
+ "time",
  "tokio",
  "tracing",
  "url",
diff --git a/crates/core/plugin_sm/Cargo.toml b/crates/core/plugin_sm/Cargo.toml
index 017ed0c2..ef844a24 100644
--- a/crates/core/plugin_sm/Cargo.toml
+++ b/crates/core/plugin_sm/Cargo.toml
@@ -13,6 +13,8 @@ download = { path = "../../common/download" }
 logged_command = { path = "../../common/logged_command" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+tedge_utils = { path = "../../common/tedge_utils" }
+time = { version = "0.3", features = ["formatting"] }
 thiserror = "1.0"
 tokio = { version = "1.8", features = ["process", "rt"] }
 tracing = { version = "0.1", features = ["attributes", "log"] }
diff --git a/crates/core/plugin_sm/src/lib.rs b/crates/core/plugin_sm/src/lib.rs
index c124bbbc..396d0f36 100644
--- a/crates/core/plugin_sm/src/lib.rs
+++ b/crates/core/plugin_sm/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod log_file;
+pub mod operation_logs;
 pub mod plugin;
 pub mod plugin_manager;
diff --git a/crates/core/tedge_agent/src/operation_logs.rs b/crates/core/plugin_sm/src/operation_logs.rs
index a89303b1..aa768725 100644
--- a/crates/core/tedge_agent/src/operation_logs.rs
+++ b/crates/core/plugin_sm/src/operation_logs.rs
@@ -1,10 +1,11 @@
-use plugin_sm::log_file::LogFile;
 use std::cmp::Reverse;
 use std::collections::BinaryHeap;
 use std::path::PathBuf;
 use time::{format_description, OffsetDateTime};
 use tracing::log;
 
+use crate::log_file::LogFile;
+
 #[derive(Debug, thiserror::Error)]
 pub enum OperationLogsError {
     #[error(transparent)]
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs
index 938b7916..77bc6429 100644
--- a/crates/core/tedge_agent/src/agent.rs
+++ b/crates/core/tedge_agent/src/agent.rs
@@ -1,4 +1,3 @@
-use crate::operation_logs::{LogKind, OperationLogs};
 use crate::{
     error::AgentError,
     restart_operation_handler::restart_operation,
@@ -15,7 +14,10 @@ use agent_interface::{
 };
 use flockfile::{check_another_instance_is_not_running, Flockfile};
 use mqtt_channel::{Connection, Message, PubChannel, StreamExt, SubChannel, Topic, TopicFilter};
-use plugin_sm::plugin_manager::{ExternalPlugins, Plugins};
+use plugin_sm::{
+    operation_logs::{LogKind, OperationLogs},
+    plugin_manager::{ExternalPlugins, Plugins},
+};
 use serde_json::json;
 use std::process;
 use std::{convert::TryInto, fmt::Debug, path::PathBuf, sync::Arc};
diff --git a/crates/core/tedge_agent/src/error.rs b/crates/core/tedge_agent/src/error.rs
index 74be5d34..7e4e967b 100644
--- a/crates/core/tedge_agent/src/error.rs
+++ b/crates/core/tedge_agent/src/error.rs
@@ -51,7 +51,7 @@ pub enum AgentError {
     TimestampConversionError { timestamp: i64, error_msg: String },
 
     #[error(transparent)]
-    FromOperationsLogs(#[from] crate::operation_logs::OperationLogsError),
+    FromOperationsLogs(#[from] plugin_sm::operation_logs::OperationLogsError),
 }
 
 #[derive(Debug, thiserror::Error)]
diff --git a/crates/core/tedge_agent/src/main.rs b/crates/core/tedge_agent/src/main.rs
index 96069769..563e0147 100644
--- a/crates/core/tedge_agent/src/main.rs
+++ b/crates/core/tedge_agent/src/main.rs
@@ -6,7 +6,6 @@ use tedge_config::DEFAULT_TEDGE_CONFIG_PATH;
 
 mod agent;
 mod error;
-mod operation_logs;
 mod restart_operation_handler;
 mod state;