commit 20b6b6084d7c2530566532db963be5609dc6e57d
author Jacek Centkowski <geminica.programs@gmail.com> Sat Mar 25 16:17:52 2023 +0100
committer Jacek Centkowski <geminica.programs@gmail.com> Wed Apr 19 07:15:09 2023 +0200
tree e02f4c2a1023e7ff86085be77f6fdcb927d71543
parent 34901acf79442d7d5f371f512d3f7fd98d9e3694

OwnersSubmitRequirement: review logs

Go over each logging statement in the class in question and:
* ensure that it is being logged at the desired level
* ensure that it contains enough info to track the problem
* ensure that it is consistent with the other messages

Bug: Issue 15556
Change-Id: Ia2b5b5155e3747b3a31138f998749d2d0e659c65

owners/src/main/java/com/googlesource/gerrit/owners/OwnersSubmitRequirement.java

diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersSubmitRequirement.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersSubmitRequirement.java
index 35201fa..37f97b8 100644
--- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersSubmitRequirement.java
+++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersSubmitRequirement.java
@@ -104,16 +104,21 @@
     requireNonNull(cd, "changeData");
 
     Change change = cd.change();
+    Project.NameKey project = cd.project();
+    int changeId = cd.getId().get();
     if (change.isClosed()) {
-      logger.atInfo().log("Change is closed therefore OWNERS file based requirement is skipped.");
+      logger.atFine().log(
+          "Project '%s': change #%d is closed therefore OWNERS submit requirements are skipped.",
+          project, changeId);
       return Optional.empty();
     }
 
-    Project.NameKey project = cd.project();
     ProjectState projectState = projectCache.get(project).orElseThrow(illegalState(project));
     if (projectState.hasPrologRules()) {
       logger.atInfo().atMostEvery(1, TimeUnit.DAYS).log(
-          "Project has prolog rules enabled. It may interfere with submit requirement evaluation.");
+          "Project '%s' has prolog rules enabled. "
+              + "It may interfere with the OWNERS submit requirements evaluation.",
+          project);
     }
 
     String branch = change.getDest().branch();
@@ -135,7 +140,10 @@
 
       Map<String, Set<Id>> fileOwners = pathOwners.getFileOwners();
       if (fileOwners.isEmpty()) {
-        logger.atInfo().log("Change has no file owners defined. Skipping submit requirement.");
+        logger.atFinest().log(
+            "Project '%s': change #%d has no OWNERS submit requirements defined. "
+                + "Skipping submit requirements.",
+            project, changeId);
         return Optional.empty();
       }
 
@@ -171,12 +179,19 @@
                       "Missing approvals for path(s): [%s]",
                       Joiner.on(", ").join(missingApprovals))));
     } catch (IOException e) {
-      logger.atSevere().withCause(e).log("TODO: handle exceptions");
-      throw new IllegalStateException(
-          "Unable to open repository while evaluating owners requirement", e);
+      String msg =
+          String.format(
+              "Project '%s': repository cannot be opened to evaluate OWNERS submit requirements.",
+              project);
+      logger.atSevere().withCause(e).log(msg);
+      throw new IllegalStateException(msg, e);
     } catch (DiffNotAvailableException e) {
-      logger.atSevere().withCause(e).log("TODO: handle exceptions");
-      throw new IllegalStateException("Unable to get diff while evaluating owners requirement", e);
+      String msg =
+          String.format(
+              "Project '%s' change #%d: unable to get diff to evaluate OWNERS submit requirements.",
+              project, changeId);
+      logger.atSevere().withCause(e).log(msg);
+      throw new IllegalStateException(msg, e);
     }
   }