From e2c06e69f137c57563eb4633b49e373faaae1548 Mon Sep 17 00:00:00 2001 From: Tomasz Kowalczewski Date: Fri, 19 Jul 2024 21:25:13 +0200 Subject: [PATCH] Re #123: Using Loki 3.1.0 for integration tests. --- .../java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java | 2 +- core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java | 2 +- .../pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java | 4 ++-- .../resources/appender-test-custom-endpoint-configuration.xml | 1 - .../pl/tkowalcz/tjahzi/logback/infra/IntegrationTest.java | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java index 86fc2a5..33d836d 100644 --- a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java +++ b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java @@ -30,7 +30,7 @@ class LoggingSystemSanityCheckTest { @Container - public GenericContainer loki = new GenericContainer("grafana/loki:2.3.0") + public GenericContainer loki = new GenericContainer("grafana/loki:3.1.0") .withCommand("-config.file=/etc/loki-config.yaml") .withClasspathResourceMapping("loki-config.yaml", "/etc/loki-config.yaml", diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java index 7307ac0..72413ea 100644 --- a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java +++ b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java @@ -33,7 +33,7 @@ class LoggingSystemTest { @Container - public GenericContainer loki = new GenericContainer("grafana/loki:2.3.0") + public GenericContainer loki = new GenericContainer("grafana/loki:3.1.0") .withCommand("-config.file=/etc/loki-config.yaml") .withClasspathResourceMapping("loki-config.yaml", "/etc/loki-config.yaml", diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java index 8f3f093..dd308a5 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java @@ -31,7 +31,7 @@ public class ServerNameIndicatorTest { public static Network network = Network.newNetwork(); @Container - public GenericContainer loki1 = new GenericContainer("grafana/loki:2.3.0") + public GenericContainer loki1 = new GenericContainer("grafana/loki:3.1.0") .withNetwork(network) .withNetworkAliases("loki1") .withCommand("-config.file=/etc/loki-config.yaml") @@ -46,7 +46,7 @@ public class ServerNameIndicatorTest { .withExposedPorts(3100); @Container - public GenericContainer loki2 = new GenericContainer("grafana/loki:2.3.0") + public GenericContainer loki2 = new GenericContainer("grafana/loki:3.1.0") .withNetwork(network) .withNetworkAliases("loki2") .withCommand("-config.file=/etc/loki-config.yaml") diff --git a/log4j2-appender/src/test/resources/appender-test-custom-endpoint-configuration.xml b/log4j2-appender/src/test/resources/appender-test-custom-endpoint-configuration.xml index 0024917..57abdde 100644 --- a/log4j2-appender/src/test/resources/appender-test-custom-endpoint-configuration.xml +++ b/log4j2-appender/src/test/resources/appender-test-custom-endpoint-configuration.xml @@ -20,7 +20,6 @@ tjahzi tjahzi - [%t] %d{DEFAULT} %5p %c{1} - %m%n%exception{full} diff --git a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/infra/IntegrationTest.java b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/infra/IntegrationTest.java index eb90636..42d8731 100644 --- a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/infra/IntegrationTest.java +++ b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/infra/IntegrationTest.java @@ -23,7 +23,7 @@ public class IntegrationTest { public static Network network = Network.newNetwork(); @Container - public GenericContainer loki = new GenericContainer("grafana/loki:2.3.0") + public GenericContainer loki = new GenericContainer("grafana/loki:3.1.0") .withNetwork(network) .withNetworkAliases("loki") .withCommand("-config.file=/etc/loki-config.yaml")