Skip to content

Serialize thread name for JUL if record is from current thread #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2020
Merged

Serialize thread name for JUL if record is from current thread #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ecs-logging-core/src/test/java/co/elastic/logging/AbstractEcsLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void testMetadata() throws Exception {
assertThat(getLastLogLine().get("process.thread.name").textValue()).isEqualTo(Thread.currentThread().getName());
assertThat(getLastLogLine().get("service.name").textValue()).isEqualTo("test");
assertThat(Instant.parse(getLastLogLine().get("@timestamp").textValue())).isCloseTo(Instant.now(), within(1, ChronoUnit.MINUTES));
assertThat(getLastLogLine().get("log.level").textValue()).isEqualTo("DEBUG");
assertThat(getLastLogLine().get("log.level").textValue()).isIn("DEBUG", "FINE");
assertThat(getLastLogLine().get("log.logger")).isNotNull();
assertThat(getLastLogLine().get("event.dataset").textValue()).isEqualTo("testdataset.log");
}
Expand Down
6 changes: 5 additions & 1 deletion jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ public String format(final LogRecord record) {
EcsJsonSerializer.serializeMDC(builder, mdcSupplier.getMDC());
EcsJsonSerializer.serializeServiceName(builder, serviceName);
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);
EcsJsonSerializer.serializeThreadId(builder, record.getThreadID());
if (Thread.currentThread().getId() == record.getThreadID()) {
EcsJsonSerializer.serializeThreadName(builder, Thread.currentThread().getName());
} else {
EcsJsonSerializer.serializeThreadId(builder, record.getThreadID());
}
EcsJsonSerializer.serializeLoggerName(builder, record.getLoggerName());
if (includeOrigin && record.getSourceClassName() != null && record.getSourceMethodName() != null) {
EcsJsonSerializer.serializeOrigin(builder, buildFileName(record.getSourceClassName()), record.getSourceMethodName(), -1);
Expand Down
13 changes: 1 addition & 12 deletions jul-ecs-formatter/src/test/java/co/elastic/logging/jul/JulLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,7 @@ void testLogException() throws Exception {
.collect(Collectors.joining("\n", "", "\n"));
assertThat(stackTrace).contains("at co.elastic.logging.jul.JulLoggingTest.testLogException");
}

@Test
void testMetadata() throws Exception {
debug("test");
assertThat(getLastLogLine().get("process.thread.id").longValue()).isEqualTo(Thread.currentThread().getId());
assertThat(getLastLogLine().get("service.name").textValue()).isEqualTo("test");
assertThat(Instant.parse(getLastLogLine().get("@timestamp").textValue())).isCloseTo(Instant.now(), within(1, ChronoUnit.MINUTES));
assertThat(getLastLogLine().get("log.level").textValue()).isEqualTo("FINE");
assertThat(getLastLogLine().get("log.logger")).isNotNull();
assertThat(getLastLogLine().get("event.dataset").textValue()).isEqualTo("testdataset.log");
}


@Test
void testLogOrigin() throws Exception {
debug("test");
Expand Down