Capture log file mtimes in support bundles

Currently the mtime for log files captured in support bundles is always
set as the default value of 1980-01-01T00:00. To more easily sort files
by time, it would be convenient to capture their actual mtimes in the
bundle zip.

Attempt to get the mtime for logs captured by `sled-diagnostics`,
falling back on the default if this fails, and copy the mtime into the
final bundle zip in nexus.

Author: wfchandler

Cargo.lock

@@ -143,7 +143,7 @@ update-common.workspace = true
 update-engine.workspace = true
 omicron-workspace-hack.workspace = true
 omicron-uuid-kinds.workspace = true
-zip.workspace = true
+zip = { workspace = true, features = ["chrono"] }
 
 [dev-dependencies]
 async-bb8-diesel.workspace = true

nexus/Cargo.toml

@@ -1158,10 +1158,15 @@ fn recursively_add_directory_to_zipfile(
 
         let file_type = entry.file_type()?;
         if file_type.is_file() {
+            let src = entry.path();
+            let mtime: chrono::DateTime<chrono::Utc> =
+                src.metadata().and_then(|s| s.modified())?.into();
+            let zip_time = zip::DateTime::try_from(mtime.naive_utc())?;
+
             let opts = FullFileOptions::default()
+                .last_modified_time(zip_time)
                 .compression_method(zip::CompressionMethod::Deflated)
                 .large_file(true);
-            let src = entry.path();
 
             zip.start_file_from_path(dst, opts)?;
             let mut file = std::fs::File::open(&src)?;

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

@@ -10,6 +10,7 @@ workspace = true
 anyhow.workspace = true
 camino.workspace = true
 cfg-if.workspace = true
+chrono.workspace = true
 fs-err = { workspace = true, features = ["tokio"] }
 futures.workspace = true
 illumos-utils.workspace = true
@@ -25,7 +26,7 @@ serde.workspace = true
 slog.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
-zip = { workspace = true, features = ["zstd"] }
+zip = { workspace = true, features = ["chrono","zstd"] }
 
 [dev-dependencies]
 omicron-common.workspace = true

sled-diagnostics/Cargo.toml

@@ -10,6 +10,7 @@ use std::{
     sync::LazyLock,
 };
 
+use anyhow::Context;
 use camino::{Utf8Path, Utf8PathBuf};
 use fs_err::File;
 use illumos_utils::zfs::{
@@ -715,10 +716,24 @@ fn write_log_to_zip<W: Write + Seek>(
     };
 
     let mut src = File::open(&snapshot_logfile)?;
+
+    let mtime = get_log_mtime(snapshot_logfile)
+        .inspect_err(|e| {
+            warn!(
+                logger,
+                "sled-diagnostics unable to get mtime for logfile";
+                "error" => %e,
+                "logfile" => %snapshot_logfile,
+            );
+        })
+        .ok()
+        .unwrap_or_else(zip::DateTime::default_for_write);
+
     let zip_path = format!("{service}/{logtype}/{log_name}");
     zip.start_file_from_path(
         zip_path,
         FullFileOptions::default()
+            .last_modified_time(mtime)
             .compression_method(zip::CompressionMethod::Zstd)
             .compression_level(Some(3))
             // NB: From the docs
@@ -746,6 +761,17 @@ fn write_log_to_zip<W: Write + Seek>(
     Ok(())
 }
 
+fn get_log_mtime(log_path: &Utf8Path) -> anyhow::Result<zip::DateTime> {
+    let mtime = log_path
+        .metadata()
+        .and_then(|s| s.modified())
+        .context("failed to stat path")?;
+
+    let datetime: chrono::DateTime<chrono::Utc> = mtime.into();
+    zip::DateTime::try_from(datetime.naive_utc())
+        .context("failed to convert file mtime to zip-compatible time")
+}
+
 /// A log file that is found in oxlog's "extra" bucket of service logs.
 #[derive(Debug, PartialEq)]
 enum ExtraLogKind<'a> {
@@ -1202,6 +1228,12 @@ mod illumos_tests {
             let mut logfile_handle =
                 fs_err::tokio::File::create_new(&logfile).await.unwrap();
             logfile_handle.write_all(data.as_bytes()).await.unwrap();
+
+            // 2025-10-15T00:00:00
+            let mtime = std::time::SystemTime::UNIX_EPOCH
+                + std::time::Duration::from_secs(1760486400);
+            let std_file = logfile_handle.into_std().await.into_file();
+            std_file.set_modified(mtime).unwrap();
         }
 
         // Populate some file with similar names that should be skipped over
@@ -1237,12 +1269,20 @@ mod illumos_tests {
 
             zip.finish().unwrap();
 
-            // Confirm the zip has our file and data
+            let expected_zip_mtime =
+                zip::DateTime::from_date_and_time(2025, 10, 15, 0, 0, 0)
+                    .unwrap();
+
+            // Confirm the zip has our file and data with the right mtime
             let mut archive =
                 ZipArchive::new(File::open(zipfile_path).unwrap()).unwrap();
             for (name, data) in logfile_to_data {
                 let mut file_in_zip =
                     archive.by_name(&format!("mg-ddm/current/{name}")).unwrap();
+
+                let mtime = file_in_zip.last_modified().unwrap();
+                assert_eq!(mtime, expected_zip_mtime, "file mtime matches");
+
                 let mut contents = String::new();
                 file_in_zip.read_to_string(&mut contents).unwrap();
 

sled-diagnostics/src/logs.rs

@@ -150,7 +150,7 @@ x509-cert = { version = "0.2.5" }
 zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.27", default-features = false, features = ["derive", "simd"] }
 zerocopy-ca01ad9e24f5d932 = { package = "zerocopy", version = "0.7.35", features = ["derive", "simd"] }
 zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
-zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "deflate", "zstd"] }
+zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "chrono", "deflate", "zstd"] }
 zip-3b31131e45eafb45 = { package = "zip", version = "0.6.6", default-features = false, features = ["bzip2", "deflate"] }
 
 [build-dependencies]
@@ -291,7 +291,7 @@ x509-cert = { version = "0.2.5" }
 zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.27", default-features = false, features = ["derive", "simd"] }
 zerocopy-ca01ad9e24f5d932 = { package = "zerocopy", version = "0.7.35", features = ["derive", "simd"] }
 zeroize = { version = "1.8.1", features = ["std", "zeroize_derive"] }
-zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "deflate", "zstd"] }
+zip-164d15cefe24d7eb = { package = "zip", version = "4.2.0", default-features = false, features = ["bzip2", "chrono", "deflate", "zstd"] }
 zip-3b31131e45eafb45 = { package = "zip", version = "0.6.6", default-features = false, features = ["bzip2", "deflate"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]