From d181eb12f20b4cd8b6e5f990d0d61b21111d8de2 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Wed, 4 Dec 2024 13:39:36 +0100 Subject: [PATCH] Revert suppressed logging This actually hides an issue with the tracing filter fixed in https://github.com/airlift/airlift/pull/1333 --- core/docker/default/etc/log.properties | 5 ----- .../java/io/trino/server/testing/TestingTrinoServer.java | 1 - .../io/trino/tests/product/launcher/env/common/Standard.java | 1 - .../docker/trino-product-tests/conf/trino/etc/log.properties | 4 ---- 4 files changed, 11 deletions(-) delete mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/log.properties diff --git a/core/docker/default/etc/log.properties b/core/docker/default/etc/log.properties index 41e84bfcaf8c..abee45ebcde7 100644 --- a/core/docker/default/etc/log.properties +++ b/core/docker/default/etc/log.properties @@ -1,7 +1,2 @@ # 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/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java b/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java index 0bb36aaea15a..9d0f010c604e 100644 --- a/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java +++ b/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java @@ -158,7 +158,6 @@ public class TestingTrinoServer Logging logging = Logging.initialize(); logging.setLevel("io.trino.event.QueryMonitor", Level.ERROR); logging.setLevel("org.eclipse.jetty", Level.ERROR); - logging.setLevel("org.glassfish.jersey.server.ServerRuntime$Responder", Level.OFF); logging.setLevel("io.airlift.concurrent.BoundedExecutor", Level.OFF); // Trino server behavior does not depend on locale settings. 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 dc298cac421e..0af233ec6868 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 @@ -196,7 +196,6 @@ 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/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 deleted file mode 100644 index c7be06d70274..000000000000 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/trino/etc/log.properties +++ /dev/null @@ -1,4 +0,0 @@ -# Reduce levels of some known noisy loggers -org.eclipse.jetty=ERROR -org.glassfish.jersey.server.ServerRuntime$Responder=OFF -io.airlift.concurrent.BoundedExecutor=OFF