Skip to content

Commit e9ad7a8

Browse files
SalmaAfifiSalmaAfifi
committed
Replaced String concatenation in log messages with parameterized messages
1 parent d2008bd commit e9ad7a8

16 files changed

+73
-82
lines changed

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/DataDroppedPayloadSetter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ protected void setPayload(final long intervalSecs) {
7979
if (dropped != null)
8080
totalDropped += dropped.value();
8181
else
82-
logger.warn("Unexpected to get null dropped counter for metric " + m.getMetricGroupId().id());
82+
logger.warn("Unexpected to get null dropped counter for metric {}", m.getMetricGroupId().id());
8383
if (onNext != null)
8484
totalOnNext += onNext.value();
8585
else
86-
logger.warn("Unexpected to get null onNext counter for metric " + m.getMetricGroupId().id());
86+
logger.warn("Unexpected to get null onNext counter for metric {}", m.getMetricGroupId().id());
8787
}
8888
final StatusPayloads.DataDropCounts dataDrop = new StatusPayloads.DataDropCounts(totalOnNext, totalDropped);
8989
try {
9090
heartbeat.addSingleUsePayload("" + StatusPayloads.Type.IncomingDataDrop, objectMapper.writeValueAsString(dataDrop));
9191
} catch (JsonProcessingException e) {
92-
logger.warn("Error writing json for dataDrop payload: " + e.getMessage());
92+
logger.warn("Error writing json for dataDrop payload: {}", e.getMessage());
9393
}
9494
dropCountGauge.set(dataDrop.getDroppedCount());
9595
onNextCountGauge.set(dataDrop.getOnNextCount());

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/DownloadJob.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public static void main(String[] args) throws MalformedURLException {
4949
System.exit(1);
5050
}
5151

52-
logger.info("parameters, jobArtifactUrl: " + args[0]);
53-
logger.info("parameters, jobName: " + args[1]);
54-
logger.info("parameters, locationToStore: " + args[2]);
52+
logger.info("parameters, jobArtifactUrl: {}", args[0]);
53+
logger.info("parameters, jobName: {}", args[1]);
54+
logger.info("parameters, locationToStore: {}", args[2]);
5555

5656
new DownloadJob(new URL(args[0]), args[1], args[2]).execute();
5757
}
@@ -63,7 +63,7 @@ public void execute() {
6363
Path path = Paths.get(locationToStore, jobName,
6464
"lib");
6565

66-
logger.info("Started writing job to tmp directory: " + path);
66+
logger.info("Started writing job to tmp directory: {}", path);
6767
// download file to /tmp, then add file location
6868
try (InputStream is = jobArtifactUrl.openStream()) {
6969
Files.createDirectories(path);
@@ -75,9 +75,9 @@ public void execute() {
7575
}
7676
}
7777
} catch (IOException e1) {
78-
logger.error("Failed to write job to local store at path: " + path, e1);
78+
logger.error("Failed to write job to local store at path: {}", path, e1);
7979
throw new RuntimeException(e1);
8080
}
81-
logger.info("Finished writing job to tmp directory: " + path);
81+
logger.info("Finished writing job to tmp directory: {}", path);
8282
}
8383
}

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/ExecuteStageRequestService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public Observable<ExecutionDetails> call(TrackedExecuteStageRequest executeReque
9494

9595
cl = userCodeClassLoader.asClassLoader();
9696
if (jobProviderClass.isPresent()) {
97-
logger.info("loading job main class " + jobProviderClass.get());
97+
logger.info("loading job main class {}", jobProviderClass.get());
9898
final MantisJobProvider jobProvider = InstantiationUtil.instantiate(
9999
jobProviderClass.get(), MantisJobProvider.class, cl);
100100
mantisJob = jobProvider.getJobInstance();
@@ -139,7 +139,7 @@ public void onError(Throwable e) {
139139

140140
@Override
141141
public void onNext(final ExecutionDetails executionDetails) {
142-
logger.info("Executing stage for job ID: " + executionDetails.getExecuteStageRequest().getRequest().getJobId());
142+
logger.info("Executing stage for job ID: {}", executionDetails.getExecuteStageRequest().getRequest().getJobId());
143143
Thread t = new Thread("mantis-worker-thread-" + executionDetails.getExecuteStageRequest().getRequest().getJobId()) {
144144
@Override
145145
public void run() {

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/Heartbeat.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Heartbeat {
5757
}
5858

5959
void setPayload(String name, String value) {
60-
logger.info("Setting payload " + name);
60+
logger.info("Setting payload {}", name);
6161
if (name != null && !name.isEmpty() && value != null)
6262
payloads.put(name, value);
6363
}
@@ -73,9 +73,9 @@ void addSingleUsePayload(String name, String value) {
7373

7474
Status getCurrentHeartbeatStatus() {
7575
List<Status.Payload> payloadList = new ArrayList<>();
76-
logger.debug("#Payloads = " + payloads.size());
76+
logger.debug("#Payloads = {}", payloads.size());
7777
for (Map.Entry<String, String> entry : payloads.entrySet()) {
78-
logger.debug("Adding payload " + entry.getKey() + " with value " + entry.getValue());
78+
logger.debug("Adding payload {} with value {}", entry.getKey(), entry.getValue());
7979
payloadList.add(new Status.Payload(entry.getKey(), entry.getValue()));
8080
}
8181
List<PayloadPair> singleUsePlds = new ArrayList<>();

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/MantisWorker.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public static void main(String[] args) {
237237
worker.start();
238238
} catch (Exception e) {
239239
// unexpected to get runtime exception, will exit
240-
logger.error("Unexpected error: " + e.getMessage(), e);
240+
logger.error("Unexpected error: {}", e.getMessage(), e);
241241
System.exit(2);
242242
}
243243
}
@@ -259,14 +259,14 @@ public void startUp() {
259259
logger.info("Starting Mantis Worker");
260260
RxNetty.useMetricListenersFactory(new MantisNettyEventsListenerFactory());
261261
for (Service service : mantisServices) {
262-
logger.info("Starting service: " + service);
262+
logger.info("Starting service: {}", service);
263263
try {
264264
service.start();
265265
} catch (Throwable e) {
266-
logger.error(String.format("Failed to start service %s: %s", service, e.getMessage()), e);
266+
logger.error("Failed to start service {}: {}", service, e.getMessage(), e);
267267
throw e;
268268
}
269-
logger.info("Started service: " + service);
269+
logger.info("Started service: {}", service);
270270
}
271271

272272
logger.info("Started Mantis Worker successfully");

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/ResourceUsagePayloadSetter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void setPayloadAndMetrics() {
145145
try {
146146
heartbeat.addSingleUsePayload("" + StatusPayloads.Type.ResourceUsage, objectMapper.writeValueAsString(usage));
147147
} catch (JsonProcessingException e) {
148-
logger.warn("Error writing json for resourceUsage payload: " + e.getMessage());
148+
logger.warn("Error writing json for resourceUsage payload: {}", e.getMessage());
149149
}
150150
cpuLimitGauge.set(Math.round(usage.getCpuLimit() * 100.0));
151151
cpuUsageCurrGauge.set(Math.round(usage.getCpuUsageCurrent() * 100.0));
@@ -168,7 +168,7 @@ private void setPayloadAndMetrics() {
168168
} catch (Exception e) {
169169
logger.error("Failed to compute resource usage", e);
170170
} finally {
171-
logger.debug("scheduling next metrics report with delay=" + delay);
171+
logger.debug("scheduling next metrics report with delay = {}", delay);
172172
executor.schedule(this::setPayloadAndMetrics, delay, TimeUnit.SECONDS);
173173
}
174174

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/RunningWorker.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ public RunningWorker(Builder builder) {
9090

9191
this.onTerminateCallback = blockUntilTerminate::countDown;
9292
this.onCompleteCallback = () -> {
93-
logger.info("JobId: " + jobId + " stage: " + stageNum + ", completed");
93+
logger.info("JobId: {} stage: {}, completed", jobId, stageNum);
9494
// setup a timeout to call forced exit as sure way to exit
9595
new Thread(() -> {
9696
try {
9797
Thread.sleep(3000);
9898
System.exit(1);
9999
} catch (Exception e) {
100-
logger.error("Ignoring exception during exit: " + e.getMessage(), e);
100+
logger.error("Ignoring exception during exit: {}", e.getMessage(), e);
101101
}
102102
}).start();
103103
signalCompleted();
@@ -110,8 +110,7 @@ private String getWorkerStringPrefix(int stageNum, int index, int number) {
110110
}
111111

112112
public void signalStartedInitiated() {
113-
logger.info("JobId: " + jobId + ", stage: " + stageNum + " workerIndex: " + workerIndex + " workerNumber: " + workerNum + ","
114-
+ " signaling started initiated");
113+
logger.info("JobId: {}, stage: {} workerIndex: {} workerNumber: {}, signaling started initiated", jobId, stageNum, workerIndex, workerNum);
115114
vmTaskStatusObserver.onNext(new VirtualMachineTaskStatus(
116115
new WorkerId(jobId, workerIndex, workerNum).getId(),
117116
VirtualMachineTaskStatus.TYPE.STARTED, jobName + ", " +
@@ -125,16 +124,14 @@ public void signalStartedInitiated() {
125124
}
126125

127126
public void signalStarted() {
128-
logger.info("JobId: " + jobId + ", " + getWorkerStringPrefix(stageNum, workerIndex, workerNum)
129-
+ " signaling started");
127+
logger.info("JobId: {}, {} signaling started", jobId, getWorkerStringPrefix(stageNum, workerIndex, workerNum));
130128
jobStatus.onNext(new Status(jobId, stageNum, workerIndex, workerNum,
131129
TYPE.INFO, getWorkerStringPrefix(stageNum, workerIndex, workerNum) + " running",
132130
MantisJobState.Started));
133131
}
134132

135133
public void signalCompleted() {
136-
logger.info("JobId: " + jobId + ", stage: " + stageNum + " workerIndex: " + workerIndex + " workerNumber: " + workerNum + ","
137-
+ " signaling completed");
134+
logger.info("JobId: {}, stage: {} workerIndex: {} workerNumber: {}, signaling completed", jobId, stageNum, workerIndex, workerNum);
138135
jobStatus.onNext(new Status(jobId, stageNum, workerIndex, workerNum,
139136
TYPE.INFO, getWorkerStringPrefix(stageNum, workerIndex, workerNum) + " completed",
140137
MantisJobState.Completed));
@@ -148,8 +145,7 @@ TYPE.INFO, getWorkerStringPrefix(stageNum, workerIndex, workerNum) + " completed
148145
}
149146

150147
public void signalFailed(Throwable t) {
151-
logger.info("JobId: " + jobId + ", stage: " + stageNum + " workerIndex: " + workerIndex + " workerNumber: " + workerNum + ","
152-
+ " signaling failed");
148+
logger.info("JobId: {}, stage: {} workerIndex: {} workerNumber: {}, signaling failed", jobId, stageNum, workerIndex, workerNum);
153149
logger.error("Worker failure detected, shutting down job", t);
154150
jobStatus.onNext(new Status(jobId, stageNum, workerIndex, workerNum,
155151
TYPE.INFO, getWorkerStringPrefix(stageNum, workerIndex, workerNum) + " failed. error: " + t.getMessage(),

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/VirtualMachineWorkerServiceLocalImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ public void onError(Throwable e) {
129129

130130
@Override
131131
public void onNext(List<Boolean> booleans) {
132-
logger.info("onNext called for request failure handler with items: " +
133-
((booleans == null) ? "-1" : booleans.size()));
132+
logger.info("onNext called for request failure handler with items: {}", (booleans == null) ? "-1" : booleans.size());
134133
if ((booleans == null) || booleans.isEmpty())
135134
errorHandler.call();
136135
}
@@ -158,9 +157,9 @@ public void start() {
158157
vmTaskStatusObservable.subscribe(vmTaskStatus -> {
159158
TYPE type = vmTaskStatus.getType();
160159
if (type == TYPE.COMPLETED) {
161-
logger.info("Got COMPLETED state for " + vmTaskStatus.getTaskId());
160+
logger.info("Got COMPLETED state for {}", vmTaskStatus.getTaskId());
162161
} else if (type == TYPE.STARTED) {
163-
logger.info("Would send RUNNING state to mesos, worker started for " + vmTaskStatus.getTaskId());
162+
logger.info("Would send RUNNING state to mesos, worker started for {}", vmTaskStatus.getTaskId());
164163
}
165164
});
166165
}

‎mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static WorkerMap convertJobSchedulingInfoToWorkerMap(String jobName, String jobI
178178
}
179179
workerMap = new WorkerMap(stageToWorkerInfoMap);
180180
} catch (Exception e) {
181-
logger.warn("Exception converting JobSchedulingInfo " + js + " to worker Map " + e.getMessage());
181+
logger.warn("Exception converting JobSchedulingInfo {} to worker Map {}", js, e.getMessage());
182182
return workerMap;
183183
}
184184
return workerMap;
@@ -316,7 +316,7 @@ public void executeStage(final ExecutionDetails setup) throws IOException {
316316
setupSubscriptionStateHandler(setup.getExecuteStageRequest().getRequest());
317317
}
318318

319-
logger.info("Running worker info: " + rw);
319+
logger.info("Running worker info: {}", rw);
320320

321321
rw.signalStartedInitiated();
322322

@@ -345,7 +345,7 @@ public void executeStage(final ExecutionDetails setup) throws IOException {
345345
rw.signalCompleted();
346346
// wait for completion signal to go to the master and us getting killed. Upon timeout, exit.
347347
try {Thread.sleep(60000);} catch (InterruptedException ie) {
348-
logger.warn("Unexpected exception sleeping: " + ie.getMessage());
348+
logger.warn("Unexpected exception sleeping: {}", ie.getMessage());
349349
}
350350
System.exit(0);
351351
}, createWorkerMapObservable(selfSchedulingInfo, executionRequest.getJobName(), executionRequest.getJobId(), executionRequest.getDurationType()),
@@ -363,7 +363,7 @@ public void executeStage(final ExecutionDetails setup) throws IOException {
363363

364364
// execute stage
365365
if (rw.getStageNum() == 0) {
366-
logger.info("JobId: " + rw.getJobId() + ", executing Job Master");
366+
logger.info("JobId: {}, executing Job Master", rw.getJobId());
367367

368368
final AutoScaleMetricsConfig autoScaleMetricsConfig = new AutoScaleMetricsConfig();
369369

@@ -405,7 +405,7 @@ public void executeStage(final ExecutionDetails setup) throws IOException {
405405
// block until worker terminates
406406
rw.waitUntilTerminate();
407407
} else if (rw.getStageNum() == 1 && rw.getTotalStagesNet() == 1) {
408-
logger.info("JobId: " + rw.getJobId() + ", single stage job, executing entire job");
408+
logger.info("JobId: {}, single stage job, executing entire job", rw.getJobId());
409409
// single stage, execute entire job on this machine
410410
PortSelector portSelector = () -> rw.getPorts().next();
411411
RxMetrics rxMetrics = new RxMetrics();
@@ -419,7 +419,7 @@ public void executeStage(final ExecutionDetails setup) throws IOException {
419419
// block until worker terminates
420420
rw.waitUntilTerminate();
421421
} else {
422-
logger.info("JobId: " + rw.getJobId() + ", executing a multi-stage job, stage: " + rw.getStageNum());
422+
logger.info("JobId: {}, executing a multi-stage job, stage: {}", rw.getJobId(), rw.getStageNum());
423423
if (rw.getStageNum() == 1) {
424424

425425
// execute source stage
@@ -434,13 +434,13 @@ remoteObservableName, numWorkersAtStage(selfSchedulingInfo, rw.getJobId(), rw.ge
434434
closeables.add(StageExecutors.executeSource(rw.getWorkerIndex(), rw.getJob().getSource(),
435435
rw.getStage(), publisher, rw.getContext(), rw.getSourceStageTotalWorkersObservable()));
436436

437-
logger.info("JobId: " + rw.getJobId() + " stage: " + rw.getStageNum() + ", serving remote observable for source with name: " + remoteObservableName);
437+
logger.info("JobId: {} stage: {}, serving remote observable for source with name: {}", rw.getJobId(), rw.getStageNum(), remoteObservableName);
438438
RemoteRxServer server = publisher.getServer();
439439
RxMetrics rxMetrics = server.getMetrics();
440440
MetricsRegistry.getInstance().registerAndGet(rxMetrics.getCountersAndGauges());
441441

442442
signalStarted(rw);
443-
logger.info("JobId: " + rw.getJobId() + " stage: " + rw.getStageNum() + ", blocking until source observable completes");
443+
logger.info("JobId: {} stage: {}, blocking until source observable completes", rw.getJobId(), rw.getStageNum());
444444
server.blockUntilServerShutdown();
445445
} else {
446446
// execute intermediate stage or last stage plus sink
@@ -518,7 +518,7 @@ TYPE.INFO, getWorkerStringPrefix(rw.getStageNum(), rw.getWorkerIndex(), rw.getWo
518518
acceptSchedulingChanges.set(false);
519519
} else {
520520
// intermediate stage
521-
logger.info("JobId: " + rw.getJobId() + ", executing intermediate stage: " + rw.getStageNum());
521+
logger.info("JobId: {}, executing intermediate stage: {}", rw.getJobId(), rw.getStageNum());
522522

523523

524524
int stageNumToExecute = rw.getStageNum();
@@ -532,12 +532,12 @@ TYPE.INFO, getWorkerStringPrefix(rw.getStageNum(), rw.getWorkerIndex(), rw.getWo
532532
rw.getContext()));
533533
RemoteRxServer server = publisher.getServer();
534534

535-
logger.info("JobId: " + jobId + " stage: " + stageNumToExecute + ", serving intermediate remote observable with name: " + remoteObservableName);
535+
logger.info("JobId: {} stage: {}, serving intermediate remote observable with name: {}", jobId, stageNumToExecute, remoteObservableName);
536536
RxMetrics rxMetrics = server.getMetrics();
537537
MetricsRegistry.getInstance().registerAndGet(rxMetrics.getCountersAndGauges());
538538
// send running signal only after server is started
539539
signalStarted(rw);
540-
logger.info("JobId: " + jobId + " stage: " + stageNumToExecute + ", blocking until intermediate observable completes");
540+
logger.info("JobId: {} stage: {}, blocking until intermediate observable completes", jobId, stageNumToExecute);
541541
server.blockUntilServerShutdown();
542542
acceptSchedulingChanges.set(false);
543543
}
@@ -585,11 +585,11 @@ private WorkerConsumer connectToObservableAtPreviousStages(Observable<JobSchedul
585585
List<Endpoint> endpoints = new LinkedList<>();
586586
for (WorkerHost host : assignments.getHosts().values()) {
587587
if (host.getState() == MantisJobState.Started) {
588-
logger.info("Received scheduling update from master, connect request for host: " + host.getHost() + " port: " + host.getPort() + " state: " + host.getState() +
589-
" adding: " + connectionsPerEndpoint + " connections to host");
588+
logger.info("Received scheduling update from master, connect request for host: {} port: {} state: {} adding: {} connections to host",
589+
host.getHost(), host.getPort(), host.getState(), connectionsPerEndpoint);
590590
for (int i = 1; i <= connectionsPerEndpoint; i++) {
591591
final String endpointId = "stage_" + stageNumToExecute + "_index_" + workerIndex + "_partition_" + i;
592-
logger.info("Adding endpoint to endpoint injector to be considered for add, with id: " + endpointId);
592+
logger.info("Adding endpoint to endpoint injector to be considered for add, with id: {}", endpointId);
593593
endpoints.add(new Endpoint(host.getHost(), host.getPort().get(0),
594594
endpointId));
595595
}

0 commit comments

Comments
 (0)