From 82f3778558d080e6e371fb35ba5ae9037c69e390 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Mon, 11 Aug 2025 15:32:43 -0700
Subject: [PATCH] Add a few more events to the structured logger

---
 packages/cli/src/build/request.rs | 36 +++++++++++++++++++++++++++++--
 packages/cli/src/cli/run.rs       |  7 +++++-
 packages/cli/src/wasm_opt.rs      |  1 +
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/build/request.rs b/packages/cli/src/build/request.rs
index 07a7a1723..5900c1277 100644
--- a/packages/cli/src/build/request.rs
+++ b/packages/cli/src/build/request.rs
@@ -834,6 +834,8 @@ impl BuildRequest {
     }
 
     pub(crate) async fn build(&self, ctx: &BuildContext) -> Result<BuildArtifacts> {
+        let time_start = SystemTime::now();
+
         // If we forget to do this, then we won't get the linker args since rust skips the full build
         // We need to make sure to not react to this though, so the filemap must cache it
         _ = self.bust_fingerprint(ctx);
@@ -887,6 +889,28 @@ impl BuildRequest {
             artifacts.patch_cache = Some(Arc::new(self.create_patch_cache(&artifacts.exe).await?));
         }
 
+        // Calculate some final metadata for logging
+        let time_taken = SystemTime::now()
+            .duration_since(time_start)
+            .map(|d| d.as_millis())
+            .unwrap_or_default();
+        tracing::debug!(
+            telemetry = %serde_json::json!({
+                "event": "build_and_bundle_complete",
+                "time_taken": time_taken,
+                "mode": match ctx.mode {
+                    BuildMode::Base { .. } => "base",
+                    BuildMode::Fat => "fat",
+                    BuildMode::Thin { .. } => "thin",
+                },
+                "blah": 123,
+                "triple": self.triple.to_string(),
+                "format": self.bundle.to_string(),
+                "num_dependencies": self.workspace.krates.len(),
+            }),
+            "Build completed in {time_taken}ms",
+        );
+
         Ok(artifacts)
     }
 
@@ -1511,7 +1535,11 @@ impl BuildRequest {
         if !res.stderr.is_empty() {
             let errs = String::from_utf8_lossy(&res.stderr);
             if !self.patch_exe(artifacts.time_start).exists() || !res.status.success() {
-                tracing::error!("Failed to generate patch: {}", errs.trim());
+                tracing::error!(
+                    telemetry = %serde_json::json!({ "event": "hotpatch_linker_failed" }),
+                    "Failed to generate patch: {}",
+                    errs.trim()
+                );
             } else {
                 tracing::trace!("Linker output during thin linking: {}", errs.trim());
             }
@@ -2029,7 +2057,11 @@ impl BuildRequest {
         if !res.stderr.is_empty() {
             let errs = String::from_utf8_lossy(&res.stderr);
             if !res.status.success() {
-                tracing::error!("Failed to generate fat binary: {}", errs.trim());
+                tracing::error!(
+                    telemetry = %serde_json::json!({ "event": "hotpatch_fat_binary_generation_failed" }),
+                    "Failed to generate fat binary: {}",
+                    errs.trim()
+                );
             } else {
                 tracing::trace!("Warnings during fat linking: {}", errs.trim());
             }
diff --git a/packages/cli/src/cli/run.rs b/packages/cli/src/cli/run.rs
index 525ce4caf..61bd68ec0 100644
--- a/packages/cli/src/cli/run.rs
+++ b/packages/cli/src/cli/run.rs
@@ -57,7 +57,12 @@ impl RunArgs {
                             _ = builder
                                 .open(&bundle, &mut devserver)
                                 .await
-                                .inspect_err(|e| tracing::error!("Failed to open app: {}", e));
+                                .inspect_err(|e| {
+                                    tracing::error!(
+                                        telemetry = %serde_json::json!({ "event": "failed_to_open_app_run" }),
+                                        "Failed to open app: {e}"
+                                    );
+                                });
 
                             if bundle_format == BundleFormat::Web {
                                 tracing::info!(
diff --git a/packages/cli/src/wasm_opt.rs b/packages/cli/src/wasm_opt.rs
index e8d7d5330..cc307f07f 100644
--- a/packages/cli/src/wasm_opt.rs
+++ b/packages/cli/src/wasm_opt.rs
@@ -111,6 +111,7 @@ impl WasmOpt {
         if !res.status.success() {
             let err = String::from_utf8_lossy(&res.stderr);
             tracing::error!(
+                telemetry = %serde_json::json!({ "event": "wasm_opt_failed" }),
                 "wasm-opt failed with status code {}\nstderr: {}\nstdout: {}",
                 res.status,
                 err,