Add tc. prefix to container logger names (#6781)

Co-authored-by: Vitalii Chura <[email protected]>

Fixes #3016

Author: eddumelendez

core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java

@@ -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("tc." + abbreviatedName);
     }
 }

core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java

@@ -0,0 +1,31 @@
+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() {
+        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+        listAppender.start();
+        LOGGER.addAppender(listAppender);
+
+        LOGGER.debug("some text");
+
+        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("tc");
+    }
+}

core/src/test/resources/logback-test.xml

@@ -13,6 +13,7 @@
     </root>
 
     <logger name="org.testcontainers" level="INFO"/>
+    <logger name="tc.dockerImageName" level="DEBUG"/>
 
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="org.zeroturnaround.exec" level="WARN"/>

docs/supported_docker_environment/logging_config.md

@@ -17,6 +17,8 @@ should be included in your classpath to show a reasonable level of log output:
     </root>
 
     <logger name="org.testcontainers" level="INFO"/>
+    <!-- The following logger can be used for containers logs since 1.18.0 -->
+    <logger name="tc" level="INFO"/>
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
 </configuration>