private static Profiler startActivityProfiler(CeTask task) {
Profiler profiler = Profiler.create(LOG);
- addContext(profiler, task);
+ addContext(profiler, task, null);
return profiler.startInfo("Execute task");
}
private static void stopActivityProfiler(Profiler profiler, CeTask task, CeActivityDto.Status status) {
- addContext(profiler, task);
- if (status == CeActivityDto.Status.FAILED) {
- profiler.stopError("Executed task");
- } else {
- profiler.stopInfo("Executed task");
- }
+ addContext(profiler, task, status);
+ profiler.stopInfo("Executed task");
}
- private static void addContext(Profiler profiler, CeTask task) {
+ private static void addContext(Profiler profiler, CeTask task, @Nullable CeActivityDto.Status status) {
profiler
.logTimeLast(true)
.addContext("project", task.getComponentKey())
if (submitterLogin != null) {
profiler.addContext("submitter", submitterLogin);
}
+ if (status != null) {
+ profiler.addContext("status", status.name());
+ }
}
}
verifyWorkerUuid();
List<String> logs = logTester.logs(LoggerLevel.INFO);
- assertThat(logs).hasSize(1);
+ assertThat(logs).hasSize(2);
assertThat(logs.get(0)).doesNotContain(" | submitter=");
+ assertThat(logs.get(1)).doesNotContain(" | submitter=");
logs = logTester.logs(LoggerLevel.ERROR);
- assertThat(logs).hasSize(2);
- for (int i = 0; i < 2; i++) {
- assertThat(logs.get(i)).doesNotContain(" | submitter=");
- }
+ assertThat(logs).hasSize(1);
+ assertThat(logs.iterator().next()).doesNotContain(" | submitter=");
assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
}
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
assertThat(logs.get(0)).contains(" | submitter=FooBar");
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=SUCCESS | time=");
assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
}
verifyWorkerUuid();
List<String> logs = logTester.logs(LoggerLevel.INFO);
- assertThat(logs).hasSize(1);
- assertThat(logs.iterator().next()).contains(" | submitter=FooBar");
- logs = logTester.logs(LoggerLevel.ERROR);
assertThat(logs).hasSize(2);
+ assertThat(logs.get(0)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ logs = logTester.logs(LoggerLevel.ERROR);
+ assertThat(logs).hasSize(1);
assertThat(logs.get(0)).isEqualTo("Failed to execute task " + ceTask.getUuid());
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
}
@Test
List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
assertThat(logs.get(0)).contains(" | submitter=FooBar");
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=SUCCESS | time=");
assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
}
verifyWorkerUuid();
List<String> logs = logTester.logs(LoggerLevel.INFO);
- assertThat(logs).hasSize(1);
- assertThat(logs.iterator().next()).contains(" | submitter=FooBar");
- logs = logTester.logs(LoggerLevel.ERROR);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).isEqualTo("Failed to execute task " + ceTask.getUuid());
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
+ assertThat(logs.get(0)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ logs = logTester.logs(LoggerLevel.ERROR);
+ assertThat(logs).hasSize(1);
+ assertThat(logs.iterator().next()).isEqualTo("Failed to execute task " + ceTask.getUuid());
assertThat(logTester.logs(LoggerLevel.DEBUG)).isEmpty();
}
underTest.call();
- List<String> logs = logTester.logs(LoggerLevel.ERROR);
+ List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
- assertThat(logs.get(0)).isEqualTo("Failed to execute task " + ceTask.getUuid());
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
+ assertThat(logs.get(0)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ logs = logTester.logs(LoggerLevel.ERROR);
+ assertThat(logs).hasSize(1);
+ assertThat(logs.iterator().next()).isEqualTo("Failed to execute task " + ceTask.getUuid());
}
@Test
underTest.call();
- List<String> logs = logTester.logs(LoggerLevel.ERROR);
- assertThat(logs).hasSize(1);
- assertThat(logs.get(0)).contains(" | submitter=FooBar | time=");
+ List<String> logs = logTester.logs(LoggerLevel.INFO);
+ assertThat(logs).hasSize(2);
+ assertThat(logs.get(1)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
}
@Test
underTest.call();
- List<String> logs = logTester.logs(LoggerLevel.ERROR);
- assertThat(logs).hasSize(3);
+ List<String> logs = logTester.logs(LoggerLevel.INFO);
+ assertThat(logs).hasSize(2);
+ assertThat(logs.get(0)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ logs = logTester.logs(LoggerLevel.ERROR);
+ assertThat(logs).hasSize(2);
assertThat(logs.get(0)).isEqualTo("Failed to execute task " + ceTask.getUuid());
assertThat(logs.get(1)).isEqualTo("Failed to finalize task with uuid '" + ceTask.getUuid() + "' and persist its state to db");
- assertThat(logs.get(2)).contains(" | submitter=FooBar | time=");
}
@Test
underTest.call();
- List<String> logs = logTester.logs(LoggerLevel.ERROR);
+ List<String> logs = logTester.logs(LoggerLevel.INFO);
assertThat(logs).hasSize(2);
+ assertThat(logs.get(0)).contains(" | submitter=FooBar");
+ assertThat(logs.get(1)).contains(" | submitter=FooBar | status=FAILED | time=");
+ logs = logTester.logs(LoggerLevel.ERROR);
+ assertThat(logs).hasSize(1);
assertThat(logs.get(0)).isEqualTo("Failed to finalize task with uuid '" + ceTask.getUuid() + "' and persist its state to db. " +
"Task failed with MessageException \"" + ex.getMessage() + "\"");
- assertThat(logs.get(1)).contains(" | submitter=FooBar | time=");
}
private Thread createThreadNameVerifyingThread(String threadName) {