Merge log_manager crate under tedge_log_manager

Signed-off-by: Didier Wenzek <[email protected]>

Cargo.toml

@@ -92,7 +92,6 @@ itertools = "0.13"
 json-writer = { path = "crates/common/json_writer" }
 lazy_static = "1.4"
 log = "0.4"
-log_manager = { path = "crates/common/log_manager" }
 maplit = "1.0"
 miette = { version = "5.5.0", features = ["fancy"] }
 mime = "0.3.17"

crates/extensions/tedge_log_manager/Cargo.toml

@@ -12,8 +12,12 @@ repository = { workspace = true }
 [dependencies]
 async-trait = { workspace = true }
 camino = { workspace = true }
+easy_reader = { workspace = true }
+glob = { workspace = true }
 log = { workspace = true }
-log_manager = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tedge_actors = { workspace = true }
 tedge_api = { workspace = true }
@@ -22,6 +26,7 @@ tedge_file_system_ext = { workspace = true }
 tedge_mqtt_ext = { workspace = true }
 tedge_uploader_ext = { workspace = true }
 tedge_utils = { workspace = true }
+time = { workspace = true, features = ["formatting"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 toml = { workspace = true }
@@ -32,6 +37,7 @@ assert-json-diff = { workspace = true }
 filetime = { workspace = true }
 tedge_actors = { workspace = true, features = ["test-helpers"] }
 tedge_test_utils = { workspace = true }
+time = { workspace = true, features = ["macros"] }
 
 [lints]
 workspace = true

crates/extensions/tedge_log_manager/src/actor.rs

@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
+use crate::manager::LogPluginConfig;
 use async_trait::async_trait;
 use camino::Utf8Path;
 use log::debug;
 use log::error;
 use log::info;
 use log::warn;
-use log_manager::LogPluginConfig;
 use tedge_actors::fan_in_message_type;
 use tedge_actors::Actor;
 use tedge_actors::ChannelError;
@@ -156,7 +156,7 @@ impl LogManagerActor {
     ) -> Result<(), LogManagementError> {
         let topic = request.topic(&self.config.mqtt_schema).as_ref().to_string();
         let request = &request.payload;
-        let log_path = log_manager::new_read_logs(
+        let log_path = crate::manager::new_read_logs(
             &self.plugin_config.files,
             &request.log_type,
             request.date_from,

crates/extensions/tedge_log_manager/src/error.rs

@@ -18,7 +18,7 @@ pub enum LogManagementError {
     FromPathsError(#[from] tedge_utils::paths::PathsError),
 
     #[error(transparent)]
-    FromLogRetrievalError(#[from] log_manager::LogRetrievalError),
+    FromLogRetrievalError(#[from] crate::manager::LogRetrievalError),
 }
 
 impl From<LogManagementError> for tedge_actors::RuntimeError {

crates/extensions/tedge_log_manager/src/lib.rs

@@ -1,14 +1,15 @@
 mod actor;
 mod config;
 mod error;
+mod manager;
 
 #[cfg(test)]
 mod tests;
 
 pub use actor::*;
 pub use config::*;
 use log::error;
-use log_manager::LogPluginConfig;
+use manager::LogPluginConfig;
 use std::path::PathBuf;
 use tedge_actors::Builder;
 use tedge_actors::CloneSender;

crates/common/log_manager/src/log_utils.rs → crates/extensions/tedge_log_manager/src/manager/log_utils.rs

@@ -175,7 +175,7 @@ mod tests {
     use std::io::Write;
 
     use super::*;
-    use crate::FileEntry;
+    use crate::manager::FileEntry;
     use filetime::set_file_mtime;
     use filetime::FileTime;
     use tedge_test_utils::fs::TempTedgeDir;