Skip to content

fix: lazy debug logging for GenericContainer #11982

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

Open
BrunosGits wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −24
Open

fix: lazy debug logging for GenericContainer #11982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
310ef8b
fix: avoid getDockerImageName() in debug logging when disabled
BrunosGits Aug 26, 2026
02d76ab
fix: address review feedback for lazy debug logging
BrunosGits Aug 27, 2026
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
26 changes: 15 additions & 11 deletions core/src/main/java/org/testcontainers/containers/GenericContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,19 +325,23 @@ protected void doStart() {

configure();

logger().debug("Starting container: {}", getDockerImageName());
if (logger().isDebugEnabled()) {
logger().debug("Starting container: {}", getDockerImageName());
}

AtomicInteger attempt = new AtomicInteger(0);
Unreliables.retryUntilSuccess(
startupAttempts,
() -> {
logger()
.debug(
"Trying to start container: {} (attempt {}/{})",
getDockerImageName(),
attempt.incrementAndGet(),
startupAttempts
);
if (logger().isDebugEnabled()) {
logger()
.debug(
"Trying to start container: {} (attempt {}/{})",
getDockerImageName(),
attempt.incrementAndGet(),
startupAttempts
);
}
tryStart();
return true;
}
Expand Down Expand Up @@ -658,12 +662,12 @@ public void stop() {
}

/**
* Provide a logger that references the docker image name.
* Provide the shared logger for generic container lifecycle messages.
*
* @return a logger that references the docker image name
* @return the shared generic container logger
*/
protected Logger logger() {
return DockerLoggerFactory.getLogger(this.getDockerImageName());
return DockerLoggerFactory.getLogger("genericcontainer");
}

/**
Expand Down
29 changes: 16 additions & 13 deletions core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,19 +216,22 @@ void testArchitectureCheck() {
ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
listAppender.start();
logger.addAppender(listAppender);

container.start();

String regexMatch = "The architecture '\\S+' for image .*";
assertThat(listAppender.list)
.describedAs(
"Received log list does not have a message matching '" +
regexMatch +
"': " +
listAppender.list.toString()
)
.filteredOn(event -> event.getMessage().matches(regexMatch))
.isNotEmpty();
try {
container.start();

String regexMatch = "The architecture '\\S+' for image .*";
assertThat(listAppender.list)
.describedAs(
"Received log list does not have a message matching '" +
regexMatch +
"': " +
listAppender.list.toString()
)
.filteredOn(event -> event.getMessage().matches(regexMatch))
.isNotEmpty();
} finally {
logger.detachAppender(listAppender);
}
}
}

Expand Down