From b42b996d832e15f9272d497eb3824d0c15e76162 Mon Sep 17 00:00:00 2001 From: Richard Salac Date: Mon, 20 Jan 2025 15:55:08 +0100 Subject: [PATCH] Fix logback turbofilters configuration Signed-off-by: Richard Salac --- apiml-common/src/main/resources/logback.xml | 2 +- .../product/logging/LogLevelInfoFilter.java | 11 +---------- .../product/logging/LogLevelInfoFilterTest.java | 17 ----------------- caching-service/src/main/resources/logback.xml | 2 +- .../src/main/resources/logback-gateway.xml | 2 +- .../src/main/resources/logback-zaas.xml | 3 ++- 6 files changed, 6 insertions(+), 31 deletions(-) diff --git a/apiml-common/src/main/resources/logback.xml b/apiml-common/src/main/resources/logback.xml index 37885ba2e7..f06e6a677e 100644 --- a/apiml-common/src/main/resources/logback.xml +++ b/apiml-common/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - + diff --git a/apiml-utility/src/main/java/org/zowe/apiml/product/logging/LogLevelInfoFilter.java b/apiml-utility/src/main/java/org/zowe/apiml/product/logging/LogLevelInfoFilter.java index a9ad773f75..b9939dacee 100644 --- a/apiml-utility/src/main/java/org/zowe/apiml/product/logging/LogLevelInfoFilter.java +++ b/apiml-utility/src/main/java/org/zowe/apiml/product/logging/LogLevelInfoFilter.java @@ -25,24 +25,15 @@ * Solution is that ApimlLogger is enhancing its logs with Marker instances and this filter is providing * adequate filtering. * - * The filter is normally enabled (filtering), or disabled when the service is started with debug profile included - * in system variable spring.profiles.include */ public class LogLevelInfoFilter extends TurboFilter { private static final String APIML_MARKER = "APIML-LOGGER"; - private boolean isFilterActive; - - public LogLevelInfoFilter() { - String profiles = System.getProperties().getProperty("spring.profiles.include"); - isFilterActive = profiles == null || !(profiles.toLowerCase().contains("debug") || profiles.toLowerCase().contains("dev")); - } @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { - if (isFilterActive - && isLevelInfoOrLower(level) + if (isLevelInfoOrLower(level) && isInternalLogger(logger) && ( marker == null || !marker.getName().equals(APIML_MARKER)) ) { diff --git a/apiml-utility/src/test/java/org/zowe/apiml/product/logging/LogLevelInfoFilterTest.java b/apiml-utility/src/test/java/org/zowe/apiml/product/logging/LogLevelInfoFilterTest.java index 6944e49d2e..38021e8328 100644 --- a/apiml-utility/src/test/java/org/zowe/apiml/product/logging/LogLevelInfoFilterTest.java +++ b/apiml-utility/src/test/java/org/zowe/apiml/product/logging/LogLevelInfoFilterTest.java @@ -31,7 +31,6 @@ class LogLevelInfoFilterTest { @BeforeEach void setUp() { - System.getProperties().setProperty("spring.profiles.include", ""); filterInstance = new LogLevelInfoFilter(); } @@ -42,22 +41,6 @@ void createActiveFilterInNormalMode() { assertEquals(FilterReply.DENY, reply, "Filter does not filter INFO level messages"); } - @Test - void createInactiveFilterInDebugMode() { - System.getProperties().setProperty("spring.profiles.include", "blueberries,debug,diag"); - LogLevelInfoFilter filter = new LogLevelInfoFilter(); - FilterReply reply = filter.decide(null, (ch.qos.logback.classic.Logger) log, Level.INFO, "", null, null); - assertEquals(FilterReply.NEUTRAL, reply, "Filter should not filter when service not in debug mode"); - } - - @Test - void createInactiveFilterInDebugModeWithDevProfile() { - System.getProperties().setProperty("spring.profiles.include", "blueberries,dev,diag"); - LogLevelInfoFilter filter = new LogLevelInfoFilter(); - FilterReply reply = filter.decide(null, (ch.qos.logback.classic.Logger) log, Level.INFO, "", null, null); - assertEquals(FilterReply.NEUTRAL, reply, "Filter should not filter when service not in debug mode"); - } - @Test void filtersLevelTest() { diff --git a/caching-service/src/main/resources/logback.xml b/caching-service/src/main/resources/logback.xml index bf5983afc9..85ff061600 100644 --- a/caching-service/src/main/resources/logback.xml +++ b/caching-service/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - + diff --git a/gateway-service/src/main/resources/logback-gateway.xml b/gateway-service/src/main/resources/logback-gateway.xml index cd5430a296..739b9d4bc3 100644 --- a/gateway-service/src/main/resources/logback-gateway.xml +++ b/gateway-service/src/main/resources/logback-gateway.xml @@ -8,7 +8,7 @@ - + diff --git a/zaas-service/src/main/resources/logback-zaas.xml b/zaas-service/src/main/resources/logback-zaas.xml index cd5430a296..09bc43e216 100644 --- a/zaas-service/src/main/resources/logback-zaas.xml +++ b/zaas-service/src/main/resources/logback-zaas.xml @@ -8,8 +8,9 @@ - + +