diff --git a/log4j2-appender/pom.xml b/log4j2-appender/pom.xml index 31046c4..1e9f53d 100644 --- a/log4j2-appender/pom.xml +++ b/log4j2-appender/pom.xml @@ -22,7 +22,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.16.0 @@ -36,7 +36,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.13.3 + 2.16.0 test diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinter.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinter.java index e81966a..2161b19 100644 --- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinter.java +++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinter.java @@ -31,17 +31,16 @@ public class Log4jAdapterLabelPrinter implements LabelPrinter { @Override public boolean isStatic() { - for (int i = 0; i < formatters.size(); i++) { + for (int i = 0; i < formatters.size(); i = i + 1) { LogEventPatternConverter converter = formatters.get(i).getConverter(); - if (!(converter instanceof LiteralPatternConverter)) { - return false; - } - - if (((LiteralPatternConverter) converter).getLiteral().contains("$")) { - return false; + if (converter instanceof LiteralPatternConverter) { + if (((LiteralPatternConverter) converter).getLiteral().contains("$")) { + return false; + } } + return !converter.isVariable(); } return true; diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java index 946f9c7..52ed8a1 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java @@ -47,9 +47,6 @@ class LokiAppenderMonitoringTest { await() .atMost(Durations.ONE_MINUTE) .pollInterval(Durations.ONE_SECOND) - .untilAsserted(() -> { - assertThat(connectAttemptsCounter.getCount()).isEqualTo(1); - } - ); + .untilAsserted(() -> assertThat(connectAttemptsCounter.getCount()).isGreaterThan(0)); } } diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinterTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinterTest.java index ea1cb51..1e4c3ef 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinterTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/Log4jAdapterLabelPrinterTest.java @@ -98,7 +98,7 @@ class Log4jAdapterLabelPrinterTest { Arguments.of("Empty", "", true), Arguments.of("Literal value", "literal value", true), Arguments.of("Literal value with variable", "Literal & variable: ${server}", false), - Arguments.of("Contains pattern", "With pattern %c{1}", false) + Arguments.of("Contains pattern", "With pattern %c{1}", true) // Since 2.15.0 no interpolation possible ); }