Automatic code cleanup.
PiperOrigin-RevId: 414481809
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index a7aa7ee..4b4678c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -417,7 +417,7 @@
"Analysis succeeded for only %d of %d top-level targets",
numSuccessful, numTargetsToAnalyze);
eventHandler.handle(Event.info(msg));
- logger.atInfo().log(msg);
+ logger.atInfo().log("%s", msg);
}
AnalysisResult result;
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
index 18f471e..acfe25f 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
@@ -163,7 +163,7 @@
// Don't hide unchecked exceptions as part of the error reporting.
Throwables.throwIfUnchecked(exception);
- logger.atSevere().withCause(exception).log(msg);
+ logger.atSevere().withCause(exception).log("%s", msg);
reportCommandLineError(commandLineReporter, exception);
moduleEnvironment.exit(createAbruptExitException(exception, msg, besCode));
}
@@ -254,7 +254,7 @@
+ "Cancelling and starting a new invocation...",
waitedMillis / 1000, waitedMillis % 1000);
reporter.handle(Event.warn(msg));
- logger.atWarning().withCause(exception).log(msg);
+ logger.atWarning().withCause(exception).log("%s", msg);
cancelCloseFutures = true;
} catch (ExecutionException e) {
String msg;
@@ -274,7 +274,7 @@
e.getMessage());
}
reporter.handle(Event.warn(msg));
- logger.atWarning().withCause(e).log(msg);
+ logger.atWarning().withCause(e).log("%s", msg);
cancelCloseFutures = true;
} finally {
if (cancelCloseFutures) {
@@ -671,7 +671,7 @@
String.format(
"Build Event Service uploads disabled due to a connectivity problem: %s", status);
reporter.handle(Event.warn(message));
- logger.atWarning().log(message);
+ logger.atWarning().log("%s", message);
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceUploader.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceUploader.java
index 748a674..16b9e9e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceUploader.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceUploader.java
@@ -293,7 +293,7 @@
private DetailedExitCode logAndSetException(
String message, BuildProgress.Code bpCode, Throwable cause) {
- logger.atSevere().log(message);
+ logger.atSevere().log("%s", message);
DetailedExitCode detailedExitCode =
DetailedExitCode.of(
FailureDetail.newBuilder()
@@ -490,7 +490,7 @@
String.format(
"Expected ACK with seqNum=%d but received ACK with seqNum=%d",
expected.getSequenceNumber(), actualSeqNum);
- logger.atInfo().log(message);
+ logger.atInfo().log("%s", message);
streamContext.abortStream(Status.FAILED_PRECONDITION.withDescription(message));
}
} else {
@@ -498,7 +498,7 @@
String.format(
"Received ACK (seqNum=%d) when no ACK was expected",
ackEvent.getSequenceNumber());
- logger.atInfo().log(message);
+ logger.atInfo().log("%s", message);
streamContext.abortStream(Status.FAILED_PRECONDITION.withDescription(message));
}
}
@@ -537,7 +537,7 @@
if (!shouldRetryStatus(streamStatus)) {
String message =
String.format("Not retrying publishBuildEvents: status='%s'", streamStatus);
- logger.atInfo().log(message);
+ logger.atInfo().log("%s", message);
throw withFailureDetail(
streamStatus.asException(),
BuildProgress.Code.BES_STREAM_NOT_RETRYING_FAILURE,
@@ -548,7 +548,7 @@
String.format(
"Not retrying publishBuildEvents, no more attempts left: status='%s'",
streamStatus);
- logger.atInfo().log(message);
+ logger.atInfo().log("%s", message);
throw withFailureDetail(
streamStatus.asException(),
BuildProgress.Code.BES_UPLOAD_RETRY_LIMIT_EXCEEDED_FAILURE,
@@ -636,7 +636,7 @@
if (!shouldRetryStatus(e.getStatus())) {
String message =
String.format("Not retrying publishLifecycleEvent: status='%s'", e.getStatus());
- logger.atInfo().log(message);
+ logger.atInfo().log("%s", message);
throw withFailureDetail(e, BuildProgress.Code.BES_STREAM_NOT_RETRYING_FAILURE, message);
}
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java
index 01ab3d1..7bc427d 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java
@@ -186,7 +186,7 @@
.build()),
e));
pendingWrites.clear();
- logger.atSevere().withCause(e).log(message);
+ logger.atSevere().withCause(e).log("%s", message);
}
private static BuildProgress.Code getBuildProgressCode(Throwable e) {
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index b8ace26..a1927de 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -598,7 +598,7 @@
for (Path entry : entries) {
directoryDetails.append(" '").append(entry.getBaseName()).append("'");
}
- logger.atWarning().log(directoryDetails.toString());
+ logger.atWarning().log("%s", directoryDetails);
} catch (IOException e) {
logger.atWarning().withCause(e).log("'%s' exists but could not be read", directory);
}
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 7decb93..62c09fc 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
@@ -276,7 +276,7 @@
Level level, @Nullable Throwable cause, @FormatString String fmt, Object... args) {
String msg = String.format(fmt, args);
String toLog = String.format("%s (#%d %s)", msg, id, desc());
- logger.at(level).withCause(cause).log(toLog);
+ logger.at(level).withCause(cause).log("%s", toLog);
}
private String desc() {
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 5b857ca..ad916d4 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
@@ -820,7 +820,7 @@
failure = e;
failureCode = Code.RPC_LOG_FAILURE;
failureMessage = "Partially wrote rpc log file";
- logger.atWarning().withCause(e).log(failureMessage);
+ logger.atWarning().withCause(e).log("%s", failureMessage);
}
executorService = null;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java
index 57ad028..bbf7abb 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java
@@ -274,7 +274,7 @@
StarlarkOptionsParser.newStarlarkOptionsParser(env, optionsParser).parse(eventHandler);
} catch (OptionsParsingException e) {
String logMessage = "Error parsing Starlark options";
- logger.atInfo().withCause(e).log(logMessage);
+ logger.atInfo().withCause(e).log("%s", logMessage);
return processOptionsParsingException(
eventHandler, e, logMessage, Code.STARLARK_OPTIONS_PARSE_FAILURE);
}
@@ -343,7 +343,7 @@
}
} catch (OptionsParsingException e) {
String logMessage = "Error parsing options";
- logger.atInfo().withCause(e).log(logMessage);
+ logger.atInfo().withCause(e).log("%s", logMessage);
return processOptionsParsingException(
eventHandler, e, logMessage, Code.OPTIONS_PARSE_FAILURE);
} catch (InterruptedException e) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 5ac1509..50d7f1b 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -947,7 +947,7 @@
try {
logger.atInfo().log(
- SafeRequestLogging.getRequestLogString(commandLineOptions.getOtherArgs()));
+ "%s", SafeRequestLogging.getRequestLogString(commandLineOptions.getOtherArgs()));
BlazeCommandResult result =
dispatcher.exec(
policy,
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
index daad07a..355e3c7 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java
@@ -138,7 +138,7 @@
event.getResult().getBuildToolLogCollection()
.addDirectValue(
"critical path", criticalPath.toString().getBytes(StandardCharsets.UTF_8));
- logger.atInfo().log(criticalPath.toString());
+ logger.atInfo().log("%s", criticalPath);
logger.atInfo().log(
"Slowest actions:\n %s",
Joiner.on("\n ").join(criticalPathComputer.getSlowestComponents()));
diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
index 5a9df0b..9f73f5a 100644
--- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
@@ -545,7 +545,7 @@
.collect(ImmutableList.toImmutableList());
InvocationPolicy policy = InvocationPolicyParser.parsePolicy(request.getInvocationPolicy());
- logger.atInfo().log(SafeRequestLogging.getRequestLogString(args));
+ logger.atInfo().log("%s", SafeRequestLogging.getRequestLogString(args));
result =
dispatcher.exec(
policy,
diff --git a/src/main/java/com/google/devtools/build/lib/server/ShutdownHooks.java b/src/main/java/com/google/devtools/build/lib/server/ShutdownHooks.java
index a9b3b22..c499d93 100644
--- a/src/main/java/com/google/devtools/build/lib/server/ShutdownHooks.java
+++ b/src/main/java/com/google/devtools/build/lib/server/ShutdownHooks.java
@@ -84,6 +84,6 @@
printErr.println("=======[BAZEL SERVER: ENCOUNTERED IO EXCEPTION]=======");
e.printStackTrace(printErr);
printErr.println("=====================================================");
- logger.atSevere().log(err.toString());
+ logger.atSevere().log("%s", err);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 7ca600c..6afcdba 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -410,7 +410,7 @@
}
private static void processInput(InputStream stdinInput, Subprocess process) {
- logger.atFiner().log(stdinInput.toString());
+ logger.atFiner().log("%s", stdinInput);
try (OutputStream out = process.getOutputStream()) {
ByteStreams.copy(stdinInput, out);
} catch (IOException ioe) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index f45625a..c32e1f0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -651,7 +651,7 @@
}
}
- logger.atInfo().log(result.toString());
+ logger.atInfo().log("%s", result);
}
private static int getNumberOfModifiedFiles(Iterable<SkyKey> modifiedValues) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRunner.java b/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRunner.java
index c2c171c..aef4a80 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRunner.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit/DesugarRunner.java
@@ -267,7 +267,7 @@
@Override
public void evaluate() throws Throwable {
- logger.atWarning().log(reason);
+ logger.atWarning().log("%s", reason);
}
@Override
diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
index f034870..c1e23f4 100644
--- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
@@ -331,7 +331,7 @@
String.format(
"Command:\n%s\nexceeded deadline of %f seconds.",
Arrays.toString(command.getArgumentsList().toArray()), timeoutMillis / 1000.0);
- logger.atWarning().log(errMessage);
+ logger.atWarning().log("%s", errMessage);
errStatus =
Status.newBuilder()
.setCode(Code.DEADLINE_EXCEEDED.getNumber())
