Skip to content

Commit

Permalink
add page name to crashes (#65504)
Browse files Browse the repository at this point in the history
### What?

helps in finding the page name on turbopack crashes
  • Loading branch information
sokra committed May 8, 2024
1 parent 0bc4291 commit a3ee23b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 7 additions & 5 deletions packages/next-swc/crates/next-api/src/app.rs
Expand Up @@ -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 {
Expand Down Expand Up @@ -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]
Expand Down
5 changes: 3 additions & 2 deletions packages/next-swc/crates/next-api/src/pages.rs
Expand Up @@ -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)
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit a3ee23b

Please sign in to comment.