Merge pull request #2145 from Urgau/gha-logs-report-client-side-errors

Urgau · web-flow · commit 142d2f283a06 · 2025-08-08T18:49:36.000Z
Report client side errors to the user in our GHA logs viewer
diff --git a/src/gha_logs.rs b/src/gha_logs.rs
@@ -1,5 +1,6 @@
 use crate::github::{self, WorkflowRunJob};
 use crate::handlers::Context;
+use crate::interactions::REPORT_TO;
 use crate::utils::AppError;
 use anyhow::Context as _;
 use axum::extract::{Path, State};
@@ -272,6 +273,8 @@ body {{
     </style>
     <script type="module" nonce="{nonce}">
         import {{ AnsiUp }} from '{ANSI_UP_URL}'
+        
+        try {{
 
         const logs = {logs};
         const tree_roots = {tree_roots};
@@ -348,6 +351,11 @@ body {{
                 inline: hasSmallViewport ? 'start' : 'center'
             }});
         }}
+
+        }} catch (e) {{
+           console.error(e);
+           document.body.innerText = `Something went wrong: ${{e}}\n\n{REPORT_TO}`;
+        }}
     </script>
 </head>
 <body>
diff --git a/src/interactions.rs b/src/interactions.rs
@@ -8,6 +8,9 @@ use crate::{
 };
 use std::fmt::Write;
 
+pub const REPORT_TO: &str = "Please file an issue on GitHub at [triagebot](https://github.com/rust-lang/triagebot) if there's \
+            a problem with this bot, or reach out on [#triagebot](https://rust-lang.zulipchat.com/#narrow/channel/224082-triagebot) on Zulip.";
+
 pub struct ErrorComment<'a> {
     issue: &'a Issue,
     message: String,
@@ -28,11 +31,7 @@ impl<'a> ErrorComment<'a> {
         let mut body = String::new();
         writeln!(body, "**Error**: {message}")?;
         writeln!(body)?;
-        writeln!(
-            body,
-            "Please file an issue on GitHub at [triagebot](https://github.com/rust-lang/triagebot) if there's \
-            a problem with this bot, or reach out on [#t-infra](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra) on Zulip."
-        )?;
+        writeln!(body, "{REPORT_TO}")?;
         Ok(body)
     }
 
diff --git a/src/utils.rs b/src/utils.rs
@@ -1,3 +1,5 @@
+use crate::interactions::REPORT_TO;
+
 use axum::{
     http::StatusCode,
     response::{IntoResponse, Response},
@@ -20,7 +22,7 @@ impl IntoResponse for AppError {
         tracing::error!("{:?}", &self.0);
         (
             StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Something went wrong: {}", self.0),
+            format!("Something went wrong: {}\n\n{REPORT_TO}", self.0),
         )
             .into_response()
     }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+use crate::interactions::REPORT_TO;`
	`2`	`+`
`1`	`3`	`use axum::{`
`2`	`4`	`http::StatusCode,`
`3`	`5`	`response::{IntoResponse, Response},`
`@@ -20,7 +22,7 @@ impl IntoResponse for AppError {`
`20`	`22`	`tracing::error!("{:?}", &self.0);`
`21`	`23`	`(`
`22`	`24`	`StatusCode::INTERNAL_SERVER_ERROR,`
`23`		`- format!("Something went wrong: {}", self.0),`
	`25`	`+ format!("Something went wrong: {}\n\n{REPORT_TO}", self.0),`
`24`	`26`	`)`
`25`	`27`	`.into_response()`
`26`	`28`	`}`