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
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java b/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
index 3abc2bf..fa91564 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
@@ -17,6 +17,7 @@
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
+import com.google.common.flogger.GoogleLogger;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -35,8 +36,6 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/** A {@link QuiescingExecutor} implementation that wraps an {@link ExecutorService}. */
public class AbstractQueueVisitor implements QuiescingExecutor {
@@ -131,7 +130,7 @@
private final ErrorClassifier errorClassifier;
- private static final Logger logger = Logger.getLogger(AbstractQueueVisitor.class.getName());
+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
/**
* Default function for constructing {@link ThreadPoolExecutor}s. The {@link ThreadPoolExecutor}s
@@ -314,7 +313,7 @@
case AS_CRITICAL_AS_POSSIBLE:
case CRITICAL_AND_LOG:
critical = true;
- logger.log(Level.WARNING, "Found critical error in queue visitor", e);
+ logger.atWarning().withCause(e).log("Found critical error in queue visitor");
break;
case CRITICAL:
critical = true;
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/BUILD b/src/main/java/com/google/devtools/build/lib/concurrent/BUILD
index 21a940a..b370069 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/BUILD
@@ -13,6 +13,7 @@
name = "concurrent",
srcs = glob(["*.java"]),
deps = [
+ "//third_party:flogger",
"//third_party:guava",
"//third_party:jsr305",
],
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java b/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
index 0eb74f0..05f3331 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
@@ -14,9 +14,8 @@
package com.google.devtools.build.lib.concurrent;
import com.google.common.base.Preconditions;
+import com.google.common.flogger.GoogleLogger;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
/**
@@ -28,8 +27,7 @@
private final String name;
private AtomicReference<Throwable> errorRef = new AtomicReference<>();
- private static final Logger logger =
- Logger.getLogger(ThrowableRecordingRunnableWrapper.class.getName());
+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
public ThrowableRecordingRunnableWrapper(String name) {
this.name = Preconditions.checkNotNull(name);
@@ -46,7 +44,7 @@
runnable.run();
} catch (Throwable error) {
errorRef.compareAndSet(null, error);
- logger.log(Level.SEVERE, "Error thrown by runnable in " + name, error);
+ logger.atSevere().withCause(error).log("Error thrown by runnable in %s", name);
}
};
}
