Better table output, step labels

Author: smklein

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -2626,17 +2626,33 @@ fn print_task_support_bundle_collector(details: &serde_json::Value) {
                     "      Bundle was able to list service processors: {listed_sps}"
                 );
 
+                #[derive(Tabled)]
+                #[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
+                struct StepRow {
+                    step_name: String,
+                    start_time: String,
+                    duration: String,
+                    status: String,
+                }
+
                 steps.sort_unstable_by_key(|s| s.start);
-                for step in steps {
-                    let duration = (step.end - step.start)
-                        .to_std()
-                        .unwrap_or(Duration::from_millis(0));
-                    println!(
-                        "      Step {} ({}ms): {}",
-                        step.name,
-                        duration.as_millis(),
-                        step.status
-                    );
+                let rows: Vec<StepRow> = steps
+                    .into_iter()
+                    .map(|step| {
+                        let duration = (step.end - step.start)
+                            .to_std()
+                            .unwrap_or(Duration::from_millis(0));
+                        StepRow {
+                            step_name: step.name,
+                            start_time: step.start.to_rfc3339(),
+                            duration: format!("{:.3}s", duration.as_secs_f64()),
+                            status: step.status.to_string(),
+                        }
+                    })
+                    .collect();
+
+                if !rows.is_empty() {
+                    println!("\n{}", tabled::Table::new(rows));
                 }
                 println!(
                     "      Bundle was activated in the database: {activated_in_db_ok}"

nexus/src/app/background/tasks/support_bundle_collector.rs

@@ -1117,7 +1117,7 @@ impl BundleCollection {
         let mut extra_steps: Vec<CollectionStep> = vec![];
         for sp in get_available_sps(&mgs_client).await? {
             extra_steps.push(CollectionStep::new(
-                "SP dump",
+                format!("SP dump for {:?}", sp),
                 Box::new({
                     let mgs_client = mgs_client.clone();
                     move |collection, dir| {
@@ -1273,7 +1273,7 @@ impl BundleCollection {
             }
 
             extra_steps.push(CollectionStep::new(
-                "sled data",
+                format!("sled data for sled {}", sled.id()),
                 Box::new({
                     let sled = sled.clone();
                     move |collection, dir| {

nexus/tests/integration_tests/support_bundles.rs

@@ -500,6 +500,17 @@ async fn test_support_bundle_lifecycle(cptestctx: &ControlPlaneTestContext) {
             errors: Vec::new()
         })
     );
+
+    // Verify that steps were recorded with reasonable timing data
+    assert!(!report.steps.is_empty(), "Should have recorded some steps");
+    for step in &report.steps {
+        assert!(
+            step.end >= step.start,
+            "Step '{}' end time should be >= start time",
+            step.name
+        );
+    }
+
     let bundle = bundle_get(&client, bundle.id).await.unwrap();
     assert_eq!(bundle.state, SupportBundleState::Active);
 
@@ -601,6 +612,17 @@ async fn test_support_bundle_range_requests(
             errors: Vec::new()
         })
     );
+
+    // Verify that steps were recorded with reasonable timing data
+    assert!(!report.steps.is_empty(), "Should have recorded some steps");
+    for step in &report.steps {
+        assert!(
+            step.end >= step.start,
+            "Step '{}' end time should be >= start time",
+            step.name
+        );
+    }
+
     let bundle = bundle_get(&client, bundle.id).await.unwrap();
     assert_eq!(bundle.state, SupportBundleState::Active);