commit fa09827261bbde4e01bd0ff4c81b54772939ddc8
author Edwin Kempin <ekempin@google.com> Wed Jun 07 09:41:52 2023 +0000
committer Edwin Kempin <ekempin@google.com> Wed Jun 07 09:41:52 2023 +0000
tree 6519744a54bc5c335209b5d39ac6afd86b24e652
parent ec42f2172c760a488b50c2795c7f6ab28b88e3f8

Include view name into log that records internal server errors

The view name is used for the metric that counts internal server errors.
Including the view name into the log that records internal server errors
makes it easier to find the corresponding logs for errors that show up
in the metric.

Release-Notes: skip
Change-Id: I2e7913c28158c26fb2878c46f188eaac13d8a04d
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 4e11346..4ea0492 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -733,7 +733,8 @@
             if (status.isPresent()) {
               responseBytes = reply(req, res, e, status.get(), getUserMessages(e));
             } else {
-              responseBytes = replyInternalServerError(req, res, e, getUserMessages(e));
+              responseBytes =
+                  replyInternalServerError(req, res, e, getViewName(viewData), getUserMessages(e));
             }
           }
         }
@@ -1787,11 +1788,12 @@
       HttpServletRequest req,
       HttpServletResponse res,
       Throwable err,
+      String viewName,
       ImmutableList<String> userMessages)
       throws IOException {
     logger.atSevere().withCause(err).log(
-        "Error in %s %s: %s",
-        req.getMethod(), uriForLogging(req), globals.retryHelper.formatCause(err));
+        "Error in %s %s (view: %s): %s",
+        req.getMethod(), uriForLogging(req), viewName, globals.retryHelper.formatCause(err));
 
     StringBuilder msg = new StringBuilder("Internal server error");
     if (!userMessages.isEmpty()) {