diff --git a/core/docker/default/etc/log.properties b/core/docker/default/etc/log.properties index abee45ebcde74..41e84bfcaf8c9 100644 --- a/core/docker/default/etc/log.properties +++ b/core/docker/default/etc/log.properties @@ -1,2 +1,7 @@ # Enable verbose logging from Trino #io.trino=DEBUG + +# Reduce levels of some known noisy loggers +org.eclipse.jetty=ERROR +org.glassfish.jersey.server.ServerRuntime$Responder=OFF +io.airlift.concurrent.BoundedExecutor=OFF diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java index 28a03cc726b3a..34bef0e62cfa5 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java @@ -27,7 +27,7 @@ import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_LOGGING_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -64,7 +64,7 @@ public void extendEnvironment(Environment.Builder builder) if (isTrinoContainer(container.getLogicalName())) { MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties")); container - .withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_ETC + "/log.properties"); + .withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_LOGGING_CONFIG); } }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java index b9b34a4f14eae..c97d9f926c9a2 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java @@ -72,6 +72,7 @@ public final class Standard public static final String CONTAINER_CONF_ROOT = "/docker/trino-product-tests/"; public static final String CONTAINER_TRINO_ETC = CONTAINER_CONF_ROOT + "conf/trino/etc"; public static final String CONTAINER_TRINO_JVM_CONFIG = CONTAINER_TRINO_ETC + "/jvm.config"; + public static final String CONTAINER_TRINO_LOGGING_CONFIG = CONTAINER_TRINO_ETC + "/log.properties"; public static final String CONTAINER_TRINO_SECRETS_CONFIG = CONTAINER_TRINO_ETC + "/secrets.toml"; public static final String CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES = CONTAINER_TRINO_ETC + "/access-control.properties"; public static final String CONTAINER_TRINO_CONFIG_PROPERTIES = CONTAINER_TRINO_ETC + "/config.properties"; @@ -195,6 +196,7 @@ public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/trino-product-tests") .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/trino/etc/jvm.config")), CONTAINER_TRINO_JVM_CONFIG) .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/trino/etc/secrets.toml")), CONTAINER_TRINO_SECRETS_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/trino/etc/log.properties")), CONTAINER_TRINO_LOGGING_CONFIG) .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("health-checks/trino-health-check.sh")), CONTAINER_HEALTH_D + "trino-health-check.sh") // the server package is hundreds MB and file system bind is much more efficient .withFileSystemBind(serverPackage.getPath(), "/docker/trino-server.tar.gz", READ_ONLY) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java index dcba1e9d78db1..2b1ba4d7af43d 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java @@ -27,7 +27,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_LOGGING_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -60,7 +60,7 @@ public void extendEnvironment(Environment.Builder builder) CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_TRINO_ETC + "/log.properties"); + CONTAINER_TRINO_LOGGING_CONFIG); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java index 067249a796ce9..b271d94259cf5 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java @@ -29,7 +29,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.common.HttpProxy.PROXY; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_LOGGING_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -67,7 +67,7 @@ public void extendEnvironment(Environment.Builder builder) CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_TRINO_ETC + "/log.properties"); + CONTAINER_TRINO_LOGGING_CONFIG); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java index 788773f68d8af..2547e0ea45082 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java @@ -30,6 +30,7 @@ import static io.trino.tests.product.launcher.env.common.HttpProxy.PROXY; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_LOGGING_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -72,7 +73,7 @@ public void extendEnvironment(Environment.Builder builder) CONTAINER_TRINO_ETC + "/cert/truststore.jks") .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_TRINO_ETC + "/log.properties"); + CONTAINER_TRINO_LOGGING_CONFIG); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java index bc48b3947e82c..4dedc12e4bb37 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java @@ -27,7 +27,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_LOGGING_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -60,7 +60,7 @@ public void extendEnvironment(Environment.Builder builder) CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_TRINO_ETC + "/log.properties"); + CONTAINER_TRINO_LOGGING_CONFIG); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/log.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/log.properties new file mode 100644 index 0000000000000..c7be06d70274e --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/log.properties @@ -0,0 +1,4 @@ +# Reduce levels of some known noisy loggers +org.eclipse.jetty=ERROR +org.glassfish.jersey.server.ServerRuntime$Responder=OFF +io.airlift.concurrent.BoundedExecutor=OFF