Skip to content

Commit 1987af2

Browse files
Googlercopybara-github
Googler
authored and
copybara-github
committed
Automatic code cleanup.
PiperOrigin-RevId: 414481809
1 parent d789eda commit 1987af2

File tree

16 files changed

+25
-25
lines changed

16 files changed

+25
-25
lines changed

‎src/main/java/com/google/devtools/build/lib/analysis/BuildView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public AnalysisResult update(
417417
"Analysis succeeded for only %d of %d top-level targets",
418418
numSuccessful, numTargetsToAnalyze);
419419
eventHandler.handle(Event.info(msg));
420-
logger.atInfo().log(msg);
420+
logger.atInfo().log("%s", msg);
421421
}
422422

423423
AnalysisResult result;

‎src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private void reportError(
163163
// Don't hide unchecked exceptions as part of the error reporting.
164164
Throwables.throwIfUnchecked(exception);
165165

166-
logger.atSevere().withCause(exception).log(msg);
166+
logger.atSevere().withCause(exception).log("%s", msg);
167167
reportCommandLineError(commandLineReporter, exception);
168168
moduleEnvironment.exit(createAbruptExitException(exception, msg, besCode));
169169
}
@@ -254,7 +254,7 @@ private void waitForPreviousInvocation(boolean isShutdown) {
254254
+ "Cancelling and starting a new invocation...",
255255
waitedMillis / 1000, waitedMillis % 1000);
256256
reporter.handle(Event.warn(msg));
257-
logger.atWarning().withCause(exception).log(msg);
257+
logger.atWarning().withCause(exception).log("%s", msg);
258258
cancelCloseFutures = true;
259259
} catch (ExecutionException e) {
260260
String msg;
@@ -274,7 +274,7 @@ private void waitForPreviousInvocation(boolean isShutdown) {
274274
e.getMessage());
275275
}
276276
reporter.handle(Event.warn(msg));
277-
logger.atWarning().withCause(e).log(msg);
277+
logger.atWarning().withCause(e).log("%s", msg);
278278
cancelCloseFutures = true;
279279
} finally {
280280
if (cancelCloseFutures) {
@@ -671,7 +671,7 @@ private BuildEventServiceTransport createBesTransport(
671671
String.format(
672672
"Build Event Service uploads disabled due to a connectivity problem: %s", status);
673673
reporter.handle(Event.warn(message));
674-
logger.atWarning().log(message);
674+
logger.atWarning().log("%s", message);
675675
return null;
676676
}
677677

‎src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceUploader.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ ListenableFuture<Void> getHalfCloseFuture() {
293293

294294
private DetailedExitCode logAndSetException(
295295
String message, BuildProgress.Code bpCode, Throwable cause) {
296-
logger.atSevere().log(message);
296+
logger.atSevere().log("%s", message);
297297
DetailedExitCode detailedExitCode =
298298
DetailedExitCode.of(
299299
FailureDetail.newBuilder()
@@ -490,15 +490,15 @@ private void publishBuildEvents()
490490
String.format(
491491
"Expected ACK with seqNum=%d but received ACK with seqNum=%d",
492492
expected.getSequenceNumber(), actualSeqNum);
493-
logger.atInfo().log(message);
493+
logger.atInfo().log("%s", message);
494494
streamContext.abortStream(Status.FAILED_PRECONDITION.withDescription(message));
495495
}
496496
} else {
497497
String message =
498498
String.format(
499499
"Received ACK (seqNum=%d) when no ACK was expected",
500500
ackEvent.getSequenceNumber());
501-
logger.atInfo().log(message);
501+
logger.atInfo().log("%s", message);
502502
streamContext.abortStream(Status.FAILED_PRECONDITION.withDescription(message));
503503
}
504504
}
@@ -537,7 +537,7 @@ private void publishBuildEvents()
537537
if (!shouldRetryStatus(streamStatus)) {
538538
String message =
539539
String.format("Not retrying publishBuildEvents: status='%s'", streamStatus);
540-
logger.atInfo().log(message);
540+
logger.atInfo().log("%s", message);
541541
throw withFailureDetail(
542542
streamStatus.asException(),
543543
BuildProgress.Code.BES_STREAM_NOT_RETRYING_FAILURE,
@@ -548,7 +548,7 @@ private void publishBuildEvents()
548548
String.format(
549549
"Not retrying publishBuildEvents, no more attempts left: status='%s'",
550550
streamStatus);
551-
logger.atInfo().log(message);
551+
logger.atInfo().log("%s", message);
552552
throw withFailureDetail(
553553
streamStatus.asException(),
554554
BuildProgress.Code.BES_UPLOAD_RETRY_LIMIT_EXCEEDED_FAILURE,
@@ -636,7 +636,7 @@ private void publishLifecycleEvent(PublishLifecycleEventRequest request)
636636
if (!shouldRetryStatus(e.getStatus())) {
637637
String message =
638638
String.format("Not retrying publishLifecycleEvent: status='%s'", e.getStatus());
639-
logger.atInfo().log(message);
639+
logger.atInfo().log("%s", message);
640640
throw withFailureDetail(e, BuildProgress.Code.BES_STREAM_NOT_RETRYING_FAILURE, message);
641641
}
642642

‎src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private void exitFailure(Throwable e) {
186186
.build()),
187187
e));
188188
pendingWrites.clear();
189-
logger.atSevere().withCause(e).log(message);
189+
logger.atSevere().withCause(e).log("%s", message);
190190
}
191191

192192
private static BuildProgress.Code getBuildProgressCode(Throwable e) {

‎src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ private static void logDeleteTreeFailure(
598598
for (Path entry : entries) {
599599
directoryDetails.append(" '").append(entry.getBaseName()).append("'");
600600
}
601-
logger.atWarning().log(directoryDetails.toString());
601+
logger.atWarning().log("%s", directoryDetails);
602602
} catch (IOException e) {
603603
logger.atWarning().withCause(e).log("'%s' exists but could not be read", directory);
604604
}

‎src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private void stepLog(
276276
Level level, @Nullable Throwable cause, @FormatString String fmt, Object... args) {
277277
String msg = String.format(fmt, args);
278278
String toLog = String.format("%s (#%d %s)", msg, id, desc());
279-
logger.at(level).withCause(cause).log(toLog);
279+
logger.at(level).withCause(cause).log("%s", toLog);
280280
}
281281

282282
private String desc() {

‎src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ public void afterCommand() throws AbruptExitException {
820820
failure = e;
821821
failureCode = Code.RPC_LOG_FAILURE;
822822
failureMessage = "Partially wrote rpc log file";
823-
logger.atWarning().withCause(e).log(failureMessage);
823+
logger.atWarning().withCause(e).log("%s", failureMessage);
824824
}
825825

826826
executorService = null;

‎src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ DetailedExitCode parseStarlarkOptions(CommandEnvironment env, ExtendedEventHandl
274274
StarlarkOptionsParser.newStarlarkOptionsParser(env, optionsParser).parse(eventHandler);
275275
} catch (OptionsParsingException e) {
276276
String logMessage = "Error parsing Starlark options";
277-
logger.atInfo().withCause(e).log(logMessage);
277+
logger.atInfo().withCause(e).log("%s", logMessage);
278278
return processOptionsParsingException(
279279
eventHandler, e, logMessage, Code.STARLARK_OPTIONS_PARSE_FAILURE);
280280
}
@@ -343,7 +343,7 @@ DetailedExitCode parseOptions(List<String> args, ExtendedEventHandler eventHandl
343343
}
344344
} catch (OptionsParsingException e) {
345345
String logMessage = "Error parsing options";
346-
logger.atInfo().withCause(e).log(logMessage);
346+
logger.atInfo().withCause(e).log("%s", logMessage);
347347
return processOptionsParsingException(
348348
eventHandler, e, logMessage, Code.OPTIONS_PARSE_FAILURE);
349349
} catch (InterruptedException e) {

‎src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ private static int batchMain(Iterable<BlazeModule> modules, String[] args) {
947947

948948
try {
949949
logger.atInfo().log(
950-
SafeRequestLogging.getRequestLogString(commandLineOptions.getOtherArgs()));
950+
"%s", SafeRequestLogging.getRequestLogString(commandLineOptions.getOtherArgs()));
951951
BlazeCommandResult result =
952952
dispatcher.exec(
953953
policy,

‎src/main/java/com/google/devtools/build/lib/runtime/BuildSummaryStatsModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void buildComplete(BuildCompleteEvent event) {
138138
event.getResult().getBuildToolLogCollection()
139139
.addDirectValue(
140140
"critical path", criticalPath.toString().getBytes(StandardCharsets.UTF_8));
141-
logger.atInfo().log(criticalPath.toString());
141+
logger.atInfo().log("%s", criticalPath);
142142
logger.atInfo().log(
143143
"Slowest actions:\n %s",
144144
Joiner.on("\n ").join(criticalPathComputer.getSlowestComponents()));

0 commit comments

Comments
 (0)