Skip to content

Add docker. prefix to container logger names, to enable log level to be set across all loggers #3018

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

Closed
vcvitaly wants to merge 4 commits into from
Closed

Add docker. prefix to container logger names, to enable log level to be set across all loggers #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44a9093
Add `docker.` prefix to container logger names (#3016)
Oct 16, 2020
ecf0d7a
Update logger name used by containers
Nov 7, 2022
56d856c
fix formatting
Nov 7, 2022
6ed6bee
remove unnecessary logger from logbacks
Nov 8, 2022
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
6 changes: 1 addition & 5 deletions core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ public static Logger getLogger(String dockerImageName) {
abbreviatedName = dockerImageName;
}

if ("UTF-8".equals(System.getProperty("file.encoding"))) {
return LoggerFactory.getLogger("\uD83D\uDC33 [" + abbreviatedName + "]");
} else {
return LoggerFactory.getLogger("docker[" + abbreviatedName + "]");
}
return LoggerFactory.getLogger("org.testcontainers.docker." + abbreviatedName);
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return LoggerFactory.getLogger("org.testcontainers.docker." + abbreviatedName);
return LoggerFactory.getLogger("tc." + abbreviatedName);

}
}
34 changes: 34 additions & 0 deletions core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package org.testcontainers.utility;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;

public class DockerLoggerFactoryTest {

private static final Logger LOGGER = (Logger) DockerLoggerFactory.getLogger("dockerImageName");

@Test
public void debugIsNotSwallowedForContainerLogs() {
// Arrange
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Arrange

ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
listAppender.start();
LOGGER.addAppender(listAppender);

// Act
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Act

LOGGER.debug("some text");

// Assert
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Assert

assertThat(listAppender.list).withFailMessage("Log message has been swallowed").hasSize(1);

ILoggingEvent event = listAppender.list.get(0);

assertThat(event.getFormattedMessage()).isEqualTo("some text");
assertThat(event.getLevel()).isEqualTo(Level.DEBUG);
assertThat(event.getLoggerName()).startsWith("org.testcontainers.docker");
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertThat(event.getLoggerName()).startsWith("org.testcontainers.docker");
assertThat(event.getLoggerName()).startsWith("tc");

}
}
2 changes: 1 addition & 1 deletion modules/orientdb/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<logger name="org.testcontainers" level="DEBUG"/>
<logger name="org.testcontainers.shaded" level="WARN"/>

</configuration>
</configuration>
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we rollback this, please?