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: 306429419
diff --git a/src/main/java/com/google/devtools/build/lib/remote/BUILD b/src/main/java/com/google/devtools/build/lib/remote/BUILD
index 6bc20f7..7185151 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -70,6 +70,7 @@
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/common/options",
"//third_party:auth",
+ "//third_party:flogger",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:netty",
diff --git a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
index 90c9e45..711cdd1 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
@@ -27,6 +27,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
+import com.google.common.flogger.GoogleLogger;
import com.google.common.hash.HashCode;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -56,8 +57,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
@@ -71,7 +70,7 @@
*/
class ByteStreamUploader extends AbstractReferenceCounted {
- private static final Logger logger = Logger.getLogger(ByteStreamUploader.class.getName());
+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
private final String instanceName;
private final ReferenceCountedChannel channel;
@@ -543,7 +542,7 @@
// This exception indicates that closing the underlying input stream failed.
// We don't expect this to ever happen, but don't want to swallow the exception
// completely.
- logger.log(Level.WARNING, "Chunker failed closing data source.", e1);
+ logger.atWarning().withCause(e1).log("Chunker failed closing data source.");
} finally {
call.cancel("Failed to read next chunk.", e);
}
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionInputFetcher.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionInputFetcher.java
index 72c6d54..b47b728 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionInputFetcher.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionInputFetcher.java
@@ -17,6 +17,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.GoogleLogger;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -41,8 +42,6 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.annotation.concurrent.GuardedBy;
/**
@@ -53,7 +52,7 @@
*/
class RemoteActionInputFetcher implements ActionInputPrefetcher {
- private static final Logger logger = Logger.getLogger(RemoteActionInputFetcher.class.getName());
+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
private final Object lock = new Object();
@@ -191,7 +190,7 @@
try {
path.chmod(0755);
} catch (IOException e) {
- logger.log(Level.WARNING, "Failed to chmod 755 on " + path, e);
+ logger.atWarning().withCause(e).log("Failed to chmod 755 on %s", path);
}
}
@@ -203,10 +202,8 @@
try {
path.delete();
} catch (IOException e) {
- logger.log(
- Level.WARNING,
- "Failed to delete output file after incomplete download: " + path,
- e);
+ logger.atWarning().withCause(e).log(
+ "Failed to delete output file after incomplete download: %s", path);
}
}
},
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
index d8aaf0b..770e7db 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -21,6 +21,7 @@
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.GoogleLogger;
import com.google.common.util.concurrent.ListeningScheduledExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.devtools.build.lib.actions.ActionInput;
@@ -79,13 +80,11 @@
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/** RemoteModule provides distributed cache and remote execution for Bazel. */
public final class RemoteModule extends BlazeModule {
- private static final Logger logger = Logger.getLogger(RemoteModule.class.getName());
+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
private AsynchronousFileOutputStream rpcLogFile;
@@ -514,7 +513,7 @@
try {
closeRpcLogFile();
} catch (IOException e) {
- logger.log(Level.WARNING, "Partially wrote rpc log file", e);
+ logger.atWarning().withCause(e).log("Partially wrote rpc log file");
failure = e;
}
@@ -551,10 +550,8 @@
try {
file.delete();
} catch (IOException e) {
- logger.log(
- Level.SEVERE,
- String.format("Failed to delete remote output '%s' from the " + "output base.", file),
- e);
+ logger.atSevere().withCause(e).log(
+ "Failed to delete remote output '%s' from the output base.", file);
deletionFailure = e;
}
}
