commit 91470aef44d460ca6c904f19f3111fc03d7faf2a
author janakr <janakr@google.com> Mon Apr 13 10:58:58 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 13 11:00:59 2020 -0700
tree 1164f41db73e537fb0d6a102ccbf7ad356421a8c
parent d74b0ecd0f619cfcb03c50e0260f0aec8cd6dd85

Migrating to fluent logging (green).

I did some minor clean-ups of the resulting logging statements (mostly moving/adding exceptions as causes that were missed), and a few other drive-bys.

PiperOrigin-RevId: 306265560

src/main/java/com/google/devtools/build/lib/actions/FilesetManifest.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/FilesetManifest.java b/src/main/java/com/google/devtools/build/lib/actions/FilesetManifest.java
index 3d457db..f60f0ed 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FilesetManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FilesetManifest.java
@@ -15,6 +15,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
+import com.google.common.flogger.GoogleLogger;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.IOException;
 import java.util.Collections;
@@ -23,14 +24,13 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 /**
  * Representation of a Fileset manifest.
  */
 public final class FilesetManifest {
-  private static final Logger logger = Logger.getLogger(FilesetManifest.class.getName());
+  private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
 
   /**
    * Mode that determines how to handle relative target paths.
@@ -122,26 +122,22 @@
       } while (++traversals <= MAX_SYMLINK_TRAVERSALS && actual != null && seen.add(actual));
 
       if (traversals >= MAX_SYMLINK_TRAVERSALS) {
-        logger.warning(
-            "Symlink "
-                + location
-                + " is part of a chain of length at least "
-                + traversals
-                + " which exceeds Blaze's maximum allowable symlink chain length");
+        logger.atWarning().log(
+            "Symlink %s is part of a chain of length at least %d"
+                + " which exceeds Blaze's maximum allowable symlink chain length",
+            location, traversals);
       } else if (actual != null) {
         // TODO(b/113128395): throw here.
-        logger.warning("Symlink " + location + " forms a symlink cycle: " + seen);
+        logger.atWarning().log("Symlink %s forms a symlink cycle: %s", location, seen);
       } else if (!entries.containsKey(actualLocation)) {
         // We've found a relative symlink that points out of the fileset. We should really always
         // throw here, but current behavior is that we tolerate such symlinks when they occur in
         // runfiles, which is the only time this code is hit.
         // TODO(b/113128395): throw here.
-        logger.warning(
-            "Symlink "
-                + location
-                + " (transitively) points to "
-                + actualLocation
-                + " that is not in this fileset (or was pruned because of a cycle)");
+        logger.atWarning().log(
+            "Symlink %s (transitively) points to %s"
+                + " that is not in this fileset (or was pruned because of a cycle)",
+            location, actualLocation);
       } else {
         // We have successfully resolved the symlink.
         entries.put(location, entries.get(actualLocation));