diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/LoggingConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/LoggingConfigurer.java index 5c63b6f8ef..f629901ab2 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/LoggingConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/LoggingConfigurer.java @@ -27,15 +27,7 @@ final class LoggingConfigurer { if (isDebugMode()) { setSystemPropertyDefault(SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY, "DEBUG"); - // suppress a couple of verbose ClassNotFoundException stack traces logged at debug level - setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "io.perfmark.PerfMark", "INFO"); - setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "io.grpc.Context", "INFO"); - setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "io.grpc.internal.ServerImplBuilder", "INFO"); - setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "io.grpc.ManagedChannelRegistry", "INFO"); - setSystemPropertyDefault( - SIMPLE_LOGGER_PREFIX + "io.netty.util.internal.NativeLibraryLoader", "INFO"); - setSystemPropertyDefault( - SIMPLE_LOGGER_PREFIX + "io.grpc.internal.ManagedChannelImplBuilder", "INFO"); + setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "okhttp3.internal.http2", "INFO"); } else { // by default muzzle warnings are turned off setSystemPropertyDefault(SIMPLE_LOGGER_PREFIX + "muzzleMatcher", "OFF"); diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java index fe70c467e3..9ef4cc4ec0 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java @@ -21,8 +21,8 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; public class LinuxTestContainerManager extends AbstractTestContainerManager { - private static final Logger logger = LoggerFactory.getLogger(LinuxTestContainerManager.class); private static final Logger backendLogger = LoggerFactory.getLogger("Backend"); + private static final Logger appLogger = LoggerFactory.getLogger("App"); private final Network network = Network.newNetwork(); private GenericContainer backend = null; @@ -79,7 +79,7 @@ public class LinuxTestContainerManager extends AbstractTestContainerManager { .withExposedPorts(TARGET_PORT) .withNetwork(network) .withLogConsumer(output) - .withLogConsumer(new Slf4jLogConsumer(logger)) + .withLogConsumer(new Slf4jLogConsumer(appLogger)) .withCopyFileToContainer( MountableFile.forHostPath(agentPath), "/" + TARGET_AGENT_FILENAME) .withEnv(getAgentEnvironment(jvmArgsEnvVarName)) diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java index 627b73f752..20e3711c59 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java @@ -53,6 +53,7 @@ import org.testcontainers.containers.output.OutputFrame; public class WindowsTestContainerManager extends AbstractTestContainerManager { private static final Logger logger = LoggerFactory.getLogger(WindowsTestContainerManager.class); private static final Logger backendLogger = LoggerFactory.getLogger("Backend"); + private static final Logger appLogger = LoggerFactory.getLogger("App"); private static final String NPIPE_URI = "npipe:////./pipe/docker_engine"; @@ -179,7 +180,7 @@ public class WindowsTestContainerManager extends AbstractTestContainerManager { }, createTargetWaiter(waitStrategy), /* inspect= */ true, - logger); + appLogger); return null; } diff --git a/smoke-tests/src/test/resources/logback-test.xml b/smoke-tests/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..55a193c3f3 --- /dev/null +++ b/smoke-tests/src/test/resources/logback-test.xml @@ -0,0 +1,34 @@ + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + + diff --git a/smoke-tests/src/test/resources/logback.xml b/smoke-tests/src/test/resources/logback.xml deleted file mode 100644 index 4dff78d129..0000000000 --- a/smoke-tests/src/test/resources/logback.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - %d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - - - diff --git a/testing-common/src/main/resources/logback.xml b/testing-common/src/main/resources/logback.xml index cdd4533a10..2605b85855 100644 --- a/testing-common/src/main/resources/logback.xml +++ b/testing-common/src/main/resources/logback.xml @@ -2,11 +2,11 @@ - - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + +