feat: propagate step IDs (#465)

getgrit · Aug 17, 2024 · 08d2350 · 08d2350
1 parent f8024ca
commit 08d2350
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/crates/cli/src/result_formatting.rs b/crates/cli/src/result_formatting.rs
@@ -408,18 +408,19 @@ impl Messager for FormattedMessager<'_> {
             let mut writer = writer.lock().map_err(|_| anyhow!("Output lock poisoned"))?;
             writeln!(writer, "[{:?}] {}", log.level, log.message)?;
         } else {
+            let msg = format!("[{:?}] {} {:?}", log.level, log.message, log.step_id);
             match log.level {
                 AnalysisLogLevel::Debug => {
-                    debug!("{}", log.message);
+                    debug!("{}", msg);
                 }
                 AnalysisLogLevel::Info => {
-                    info!("{}", log.message);
+                    info!("{}", msg);
                 }
                 AnalysisLogLevel::Warn => {
-                    warn!("{}", log.message);
+                    warn!("{}", msg);
                 }
                 AnalysisLogLevel::Error => {
-                    error!("{}", log.message);
+                    error!("{}", msg);
                 }
             }
         }

diff --git a/crates/marzano_messenger/src/logs.rs b/crates/marzano_messenger/src/logs.rs
@@ -6,4 +6,5 @@ pub struct SimpleLogMessage {
     pub message: String,
     pub level: AnalysisLogLevel,
     pub meta: Option<std::collections::HashMap<String, serde_json::Value>>,
+    pub step_id: String,
 }
diff --git a/crates/marzano_messenger/src/workflows.rs b/crates/marzano_messenger/src/workflows.rs
@@ -50,11 +50,13 @@ pub trait WorkflowMessenger: Messager {
 pub struct SimpleWorkflowMessage {
     pub kind: String,
     pub message: serde_json::Value,
+    pub step_id: String,
 }
 
 /// Wrap match results to account for workflow logic and path normalization
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WorkflowMatchResult {
     pub result: MatchResult,
     pub workspace_path: Option<PathBuf>,
+    pub step_id: String,
 }