commit af4a0ae4c4fc9c40d44d6c7b446de8944816715a
author Christian Aistleitner <christian@quelltextlich.at> Mon Jun 22 22:27:24 2020 +0200
committer Christian Aistleitner <christian@quelltextlich.at> Mon Jun 22 23:34:06 2020 +0200
tree b98c4f83701ad2716ab0302c14c2bd6053d21c4a
parent bb689908f71a4c672ecf40661ed4856bec2c6740

Add logging to dependency detection

Change-Id: Ie755b88e18d1b2a5135ac678fc203b6f6503b9d4

src/main/java/com/googlesource/gerrit/plugins/zuul/GetCrd.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/zuul/GetCrd.java b/src/main/java/com/googlesource/gerrit/plugins/zuul/GetCrd.java
index e23a117..91f0fdd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/zuul/GetCrd.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/zuul/GetCrd.java
@@ -14,6 +14,7 @@
 
 package com.googlesource.gerrit.plugins.zuul;
 
+import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.entities.Change;
 import com.google.gerrit.entities.Project;
 import com.google.gerrit.extensions.common.ChangeInfo;
@@ -42,6 +43,8 @@
 
 @Singleton
 public class GetCrd implements RestReadView<RevisionResource> {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   private final ChangesCollection changes;
   private final GitRepositoryManager repoManager;
 
@@ -60,6 +63,8 @@
     out.dependsOn = new ArrayList<>();
     out.neededBy = new ArrayList<>();
 
+    Change.Key chgKey = rsrc.getChange().getKey();
+
     // get depends on info
     Project.NameKey p = rsrc.getChange().getProject();
     try (Repository repo = repoManager.openRepository(p);
@@ -70,12 +75,13 @@
       Pattern pattern = Pattern.compile("[Dd]epends-[Oo]n:? (I[0-9a-f]{8,40})", Pattern.DOTALL);
       Matcher matcher = pattern.matcher(commitMsg);
       while (matcher.find()) {
-        out.dependsOn.add(matcher.group(1));
+        String changeId = matcher.group(1);
+        logger.atFinest().log("Change %s depends on change %s", chgKey, changeId);
+        out.dependsOn.add(changeId);
       }
     }
 
     // get needed by info
-    Change.Key chgKey = rsrc.getChange().getKey();
     QueryChanges query = changes.list();
     String neededByQuery = "message:" + chgKey + " -change:" + chgKey;
     query.addQuery(neededByQuery);
@@ -83,10 +89,14 @@
     List<ChangeInfo> changes = (List<ChangeInfo>) response.value();
     // check for dependency cycles
     for (ChangeInfo change : changes) {
-      if (out.dependsOn.contains(change.changeId)) {
+      String changeId = change.changeId;
+      logger.atFinest().log("Change %s needed by %s", chgKey, changeId);
+      if (out.dependsOn.contains(changeId)) {
+        logger.atFiner().log(
+            "Detected dependency cycle between changes %s and %s", chgKey, changeId);
         out.cycle = true;
       }
-      out.neededBy.add(change.changeId);
+      out.neededBy.add(changeId);
     }
 
     return Response.ok(out);