LocalSpawnRunner now always logs as itself

PiperOrigin-RevId: 161944209

2 files changed, 18 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
index e77c656a6b..af968ae114 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
@@ -63,7 +63,7 @@ public final class LocalSpawnRunner implements SpawnRunner {
   private static final int LOCAL_EXEC_ERROR = -1;
   private static final int POSIX_TIMEOUT_EXIT_CODE = /*SIGNAL_BASE=*/128 + /*SIGALRM=*/14;
 
-  private final Logger logger;
+  private static final Logger logger = Logger.getLogger(LocalSpawnRunner.class.getName());
 
   private final Path execRoot;
   private final ResourceManager resourceManager;
@@ -86,7 +86,6 @@ public final class LocalSpawnRunner implements SpawnRunner {
   }
 
   public LocalSpawnRunner(
-      Logger logger,
       AtomicInteger execCount,
       Path execRoot,
       ActionInputPrefetcher actionInputPrefetcher,
@@ -96,7 +95,6 @@ public final class LocalSpawnRunner implements SpawnRunner {
       OS localOs,
       String productName,
       LocalEnvProvider localEnvProvider) {
-    this.logger = logger;
     this.execRoot = execRoot;
     this.actionInputPrefetcher = Preconditions.checkNotNull(actionInputPrefetcher);
     this.processWrapper = getProcessWrapper(execRoot, localOs).getPathString();
@@ -117,7 +115,6 @@ public final class LocalSpawnRunner implements SpawnRunner {
       String productName,
       LocalEnvProvider localEnvProvider) {
     this(
-        Logger.getLogger(LocalSpawnRunner.class.getName()),
         new AtomicInteger(),
         execRoot,
         actionInputPrefetcher,
diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
index bfd4d67ebb..6ee2b0f11f 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
@@ -194,14 +194,18 @@ public class LocalSpawnRunnerTest {
   private final SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting();
 
   @Before
-  public final void setup() throws Exception  {
-    logger = Logger.getAnonymousLogger();
+  public final void suppressLogging() {
+    logger = Logger.getLogger(LocalSpawnRunner.class.getName());
     logger.setFilter(new Filter() {
       @Override
       public boolean isLoggable(LogRecord record) {
         return false;
       }
     });
+  }
+
+  @Before
+  public final void setup() throws Exception  {
     fs = new InMemoryFileSystem();
     // Prevent any subprocess execution at all.
     SubprocessBuilder.setSubprocessFactory(new SubprocessInterceptor());
@@ -224,7 +228,7 @@ public class LocalSpawnRunnerTest {
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.localSigkillGraceSeconds = 456;
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     timeoutMillis = 123 * 1000L;
@@ -264,7 +268,7 @@ public class LocalSpawnRunnerTest {
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.localSigkillGraceSeconds = 456;
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, NO_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     timeoutMillis = 123 * 1000L;
@@ -294,7 +298,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr"));
@@ -330,7 +334,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     assertThat(fs.getPath("/out").createDirectory()).isTrue();
@@ -354,7 +358,7 @@ public class LocalSpawnRunnerTest {
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.allowedLocalAction = Pattern.compile("none");
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     outErr = new FileOutErr();
@@ -393,7 +397,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr"));
@@ -416,7 +420,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
+        execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
         USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     timeoutMillis = 123 * 1000L;
@@ -435,7 +439,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
+        execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
         USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     timeoutMillis = 123 * 1000L;
@@ -463,7 +467,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
+        execCount, fs.getPath("/execroot"), mockPrefetcher, options, resourceManager,
         USE_WRAPPER, OS.LINUX, "product-name", LocalEnvProvider.UNMODIFIED);
 
     policy.inputMapping.put(PathFragment.create("relative/path"), null);
@@ -486,7 +490,7 @@ public class LocalSpawnRunnerTest {
 
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.LINUX, "product-name", localEnvProvider);
 
     timeoutMillis = 123 * 1000L;
@@ -507,7 +511,7 @@ public class LocalSpawnRunnerTest {
     LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class);
     options.localSigkillGraceSeconds = 654;
     LocalSpawnRunner runner = new LocalSpawnRunner(
-        logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
+        execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options,
         resourceManager, USE_WRAPPER, OS.WINDOWS, "product-name", LocalEnvProvider.UNMODIFIED);
 
     timeoutMillis = 321 * 1000L;