Skip to content

Commit 6d089b3

Browse files
illicitonioncopybara-github
authored andcommitted
Report remote execution messages as events
Currently the message is appended to a spawn's stderr, which pollutes that output. It also means that whether a message is output is gated by the `--output_filter` flag, which is surprising - metadata messages don't feel like "output" in the same way `--output_filter` applies to. Instead, emit the message as a top-level message to the terminal. Closes #18757. PiperOrigin-RevId: 543365674 Change-Id: I9874c8a0946a3156a2c17a2962880184d3aeebe0
1 parent 9081ca0 commit 6d089b3

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import com.google.devtools.build.lib.server.FailureDetails;
6767
import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
6868
import com.google.devtools.build.lib.util.ExitCode;
69-
import com.google.devtools.build.lib.util.io.FileOutErr;
7069
import com.google.devtools.build.lib.vfs.Path;
7170
import com.google.devtools.build.lib.vfs.PathFragment;
7271
import com.google.longrunning.Operation;
@@ -274,7 +273,7 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context)
274273
// It's already late at this stage, but we should at least report once.
275274
reporter.reportExecutingIfNot();
276275

277-
maybePrintExecutionMessages(context, result.getMessage(), result.success());
276+
maybePrintExecutionMessages(spawn, result.getMessage(), result.success());
278277

279278
profileAccounting(result.getExecutionMetadata());
280279
spawnMetricsAccounting(spawnMetrics, result.getExecutionMetadata());
@@ -445,14 +444,16 @@ public boolean handlesCaching() {
445444
return true;
446445
}
447446

448-
private void maybePrintExecutionMessages(
449-
SpawnExecutionContext context, String message, boolean success) {
450-
FileOutErr outErr = context.getFileOutErr();
447+
private void maybePrintExecutionMessages(Spawn spawn, String message, boolean success) {
451448
boolean printMessage =
452449
remoteOptions.remotePrintExecutionMessages.shouldPrintMessages(success)
453450
&& !message.isEmpty();
454451
if (printMessage) {
455-
outErr.printErr(message + "\n");
452+
report(
453+
Event.info(
454+
String.format(
455+
"Remote execution message for %s %s: %s",
456+
spawn.getMnemonic(), spawn.getTargetLabel(), message)));
456457
}
457458
}
458459

@@ -533,7 +534,8 @@ private SpawnResult handleError(
533534
}
534535
}
535536
if (e.isExecutionTimeout()) {
536-
maybePrintExecutionMessages(context, e.getResponse().getMessage(), /* success = */ false);
537+
maybePrintExecutionMessages(
538+
action.getSpawn(), e.getResponse().getMessage(), /* success= */ false);
537539
return new SpawnResult.Builder()
538540
.setRunnerName(getName())
539541
.setStatus(Status.TIMEOUT)

0 commit comments

Comments
 (0)