chore: Add computed and replayed receipt logs

ipvm-wg · Mar 13, 2024 · 4e30711 · 4e30711
1 parent 60c4d41
commit 4e30711
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/homestar-runtime/src/logger.rs b/homestar-runtime/src/logger.rs
@@ -72,6 +72,11 @@ fn init(
 
     let filter = if every_cli {
         EnvFilter::new("off")
+            .add_directive(
+                "homestar_runtime::runner[run_worker]=info"
+                    .parse()
+                    .expect(DIRECTIVE_EXPECT),
+            )
             .add_directive(
                 "homestar_runtime::worker[run]=info"
                     .parse()

diff --git a/homestar-runtime/src/runner.rs b/homestar-runtime/src/runner.rs
@@ -40,7 +40,7 @@ use tokio::{
     time,
 };
 use tokio_util::time::{delay_queue, DelayQueue};
-use tracing::{debug, error, info, warn};
+use tracing::{debug, error, info, info_span, instrument, warn, Instrument};
 
 mod error;
 pub(crate) mod file;
@@ -702,6 +702,7 @@ impl Runner {
         }
     }
 
+    #[instrument(skip_all)]
     async fn run_worker<S: Into<FastStr>>(
         &self,
         workflow: Workflow<'static, Arg>,
@@ -767,9 +768,11 @@ impl Runner {
             async move { Fetch::get_resources(rscs, workflow_settings).await }.boxed()
         };
 
-        let handle = self
-            .runtime
-            .spawn(worker.run(self.running_tasks(), fetch_fn));
+        let handle = self.runtime.spawn(
+            worker
+                .run(self.running_tasks(), fetch_fn)
+                .instrument(info_span!("run").or_current()),
+        );
 
         // Add Cid to expirations timing wheel
         let delay_key = self
@@ -790,6 +793,20 @@ impl Runner {
             .collect();
         let replayed_receipt_info = find_receipt_info_by_pointers(&receipt_pointers, db)?;
 
+        // Log replayed receipts if any
+        if !replayed_receipt_info.is_empty() {
+            info!(
+                subject = "workflow.receipts",
+                category = "workflow",
+                receipt_cids = replayed_receipt_info
+                    .iter()
+                    .map(|info| info.0.to_string())
+                    .collect::<Vec<String>>()
+                    .join(","),
+                "replaying receipts",
+            );
+        };
+
         Ok(WorkflowData {
             info: initial_info,
             name: workflow_name,

diff --git a/homestar-runtime/src/worker.rs b/homestar-runtime/src/worker.rs
@@ -459,6 +459,13 @@ where
                     "committed to database"
                 );
 
+                info!(
+                    subject = "worker.receipt",
+                    category = "worker.run",
+                    receipt_cid = stored_receipt.cid().to_string(),
+                    "computed receipt"
+                );
+
                 let _ = self
                     .event_sender
                     .send_async(Event::CapturedReceipt(Captured::with(