From a3ee23ba52936ed9d02743962740097c7784e20c Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Wed, 8 May 2024 17:31:45 +0200
Subject: [PATCH] add page name to crashes (#65504)

### What?

helps in finding the page name on turbopack crashes
---
 packages/next-swc/crates/next-api/src/app.rs   | 12 +++++++-----
 packages/next-swc/crates/next-api/src/pages.rs |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/next-swc/crates/next-api/src/app.rs b/packages/next-swc/crates/next-api/src/app.rs
index 61515c5c4f35..241fd393cd25 100644
--- a/packages/next-swc/crates/next-api/src/app.rs
+++ b/packages/next-swc/crates/next-api/src/app.rs
@@ -1250,24 +1250,25 @@ impl Endpoint for AppEndpoint {
     #[turbo_tasks::function]
     async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> {
         let this = self.await?;
+        let page_name = this.page.to_string();
         let span = match this.ty {
             AppEndpointType::Page {
                 ty: AppPageEndpointType::Html,
                 ..
             } => {
-                tracing::info_span!("app endpoint HTML", name = display(&this.page))
+                tracing::info_span!("app endpoint HTML", name = page_name)
             }
             AppEndpointType::Page {
                 ty: AppPageEndpointType::Rsc,
                 ..
             } => {
-                tracing::info_span!("app endpoint RSC", name = display(&this.page))
+                tracing::info_span!("app endpoint RSC", name = page_name)
             }
             AppEndpointType::Route { .. } => {
-                tracing::info_span!("app endpoint route", name = display(&this.page))
+                tracing::info_span!("app endpoint route", name = page_name)
             }
             AppEndpointType::Metadata { .. } => {
-                tracing::info_span!("app endpoint metadata", name = display(&this.page))
+                tracing::info_span!("app endpoint metadata", name = page_name)
             }
         };
         async move {
@@ -1309,10 +1310,11 @@ impl Endpoint for AppEndpoint {
                     client_paths,
                 },
             };
-            Ok(written_endpoint.cell())
+            anyhow::Ok(written_endpoint.cell())
         }
         .instrument(span)
         .await
+        .with_context(|| format!("Failed to write app endpoint {}", page_name))
     }
 
     #[turbo_tasks::function]
diff --git a/packages/next-swc/crates/next-api/src/pages.rs b/packages/next-swc/crates/next-api/src/pages.rs
index e4e7595cc2bb..fa630c16092b 100644
--- a/packages/next-swc/crates/next-api/src/pages.rs
+++ b/packages/next-swc/crates/next-api/src/pages.rs
@@ -1144,8 +1144,8 @@ impl Endpoint for PageEndpoint {
     #[turbo_tasks::function]
     async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> {
         let this = self.await?;
+        let original_name = this.original_name.await?;
         let span = {
-            let original_name = this.original_name.await?;
             match this.ty {
                 PageEndpointType::Html => {
                     tracing::info_span!("page endpoint HTML", name = *original_name)
@@ -1198,10 +1198,11 @@ impl Endpoint for PageEndpoint {
                 },
             };
 
-            Ok(written_endpoint.cell())
+            anyhow::Ok(written_endpoint.cell())
         }
         .instrument(span)
         .await
+        .with_context(|| format!("Failed to write page endpoint {}", *original_name))
     }
 
     #[turbo_tasks::function]