diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/LogLevelLabelConfigurationTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/LogLevelLabelConfigurationTest.java
index 5a0a3d8..beb4e47 100644
--- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/LogLevelLabelConfigurationTest.java
+++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/labels/LogLevelLabelConfigurationTest.java
@@ -68,7 +68,7 @@ class LogLevelLabelConfigurationTest {
given()
.contentType(ContentType.URLENC)
.urlEncodingEnabled(false)
- .formParam("query=%7Bserver%3D%22127.0.0.1%22%7D")
+ .formParam("query=%7Btest%3D%22shouldWorkWithNoLogLevelConfigured%22%7D")
.when()
.get("/loki/api/v1/query_range")
.then()
@@ -77,7 +77,6 @@ class LogLevelLabelConfigurationTest {
.statusCode(200)
.body("status", equalTo("success"))
.body("data.result.size()", equalTo(1))
- .body("data.result[0].stream.server", equalTo("127.0.0.1"))
.body("data.result[0].stream.log_level", nullValue());
});
}
@@ -114,7 +113,7 @@ class LogLevelLabelConfigurationTest {
given()
.contentType(ContentType.URLENC)
.urlEncodingEnabled(false)
- .formParam("query=%7Bserver%3D%22127.0.0.1%22%7D")
+ .formParam("query=%7Btest%3D%22shouldSendLogLevelAsConfigured%22%7D")
.when()
.get("/loki/api/v1/query_range")
.then()
@@ -123,7 +122,6 @@ class LogLevelLabelConfigurationTest {
.statusCode(200)
.body("status", equalTo("success"))
.body("data.result.size()", equalTo(1))
- .body("data.result[0].stream.server", equalTo("127.0.0.1"))
.body("data.result[0].stream.log_level", equalTo("INFO"));
});
}
diff --git a/log4j2-appender/src/test/resources/appender-test-with-log-label-set.xml b/log4j2-appender/src/test/resources/appender-test-with-log-label-set.xml
index abb0034..6d6ec3c 100644
--- a/log4j2-appender/src/test/resources/appender-test-with-log-label-set.xml
+++ b/log4j2-appender/src/test/resources/appender-test-with-log-label-set.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/log4j2-appender/src/test/resources/appender-test-with-log-label-unset.xml b/log4j2-appender/src/test/resources/appender-test-with-log-label-unset.xml
index 5d1146a..862a7be 100644
--- a/log4j2-appender/src/test/resources/appender-test-with-log-label-unset.xml
+++ b/log4j2-appender/src/test/resources/appender-test-with-log-label-unset.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LogLevelLabelConfigurationTest.java b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LogLevelLabelConfigurationTest.java
index 31f97af..f058f04 100644
--- a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LogLevelLabelConfigurationTest.java
+++ b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LogLevelLabelConfigurationTest.java
@@ -39,7 +39,7 @@ class LogLevelLabelConfigurationTest {
.withExposedPorts(3100);
@Test
- void shouldWorkWIthNoLogLevelConfigured() throws Exception {
+ void shouldWorkWithNoLogLevelConfigured() throws Exception {
// Given
System.setProperty("loki.host", loki.getHost());
System.setProperty("loki.port", loki.getFirstMappedPort().toString());
@@ -58,7 +58,7 @@ class LogLevelLabelConfigurationTest {
configurator.doConfigure(uri.toURL());
// When
- Logger logger = context.getLogger(LokiAppenderLargeBatchesTest.class);
+ Logger logger = context.getLogger(LogLevelLabelConfigurationTest.class);
logger.info("Test");
// Then
@@ -75,7 +75,7 @@ class LogLevelLabelConfigurationTest {
given()
.contentType(ContentType.URLENC)
.urlEncodingEnabled(false)
- .formParam("query=%7Bserver%3D%22127.0.0.1%22%7D")
+ .formParam("query=%7Btest%3D%22shouldWorkWithNoLogLevelConfigured%22%7D")
.when()
.get("/loki/api/v1/query_range")
.then()
@@ -84,7 +84,6 @@ class LogLevelLabelConfigurationTest {
.statusCode(200)
.body("status", equalTo("success"))
.body("data.result.size()", equalTo(1))
- .body("data.result[0].stream.server", equalTo("127.0.0.1"))
.body("data.result[0].stream.log_level", nullValue());
});
}
@@ -109,7 +108,7 @@ class LogLevelLabelConfigurationTest {
configurator.doConfigure(uri.toURL());
// When
- Logger logger = context.getLogger(LokiAppenderLargeBatchesTest.class);
+ Logger logger = context.getLogger(LogLevelLabelConfigurationTest.class);
logger.info("Test");
// Then
@@ -126,7 +125,7 @@ class LogLevelLabelConfigurationTest {
given()
.contentType(ContentType.URLENC)
.urlEncodingEnabled(false)
- .formParam("query=%7Bserver%3D%22127.0.0.1%22%7D")
+ .formParam("query=%7Btest%3D%22shouldSendLogLevelAsConfigured%22%7D")
.when()
.get("/loki/api/v1/query_range")
.then()
@@ -134,8 +133,7 @@ class LogLevelLabelConfigurationTest {
.all()
.statusCode(200)
.body("status", equalTo("success"))
- .body("data.result.size()", greaterThanOrEqualTo(1))
- .body("data.result[0].stream.server", equalTo("127.0.0.1"))
+ .body("data.result.size()", equalTo(1))
.body("data.result[0].stream.log_level", equalTo("INFO"));
});
}
diff --git a/logback-appender/src/test/resources/appender-test-with-log-label-set.xml b/logback-appender/src/test/resources/appender-test-with-log-label-set.xml
index 186ef7e..dc83009 100644
--- a/logback-appender/src/test/resources/appender-test-with-log-label-set.xml
+++ b/logback-appender/src/test/resources/appender-test-with-log-label-set.xml
@@ -12,17 +12,20 @@
Circus
-
-
log_level
+
+
-
+
+
+
+
diff --git a/logback-appender/src/test/resources/appender-test-with-log-label-unset.xml b/logback-appender/src/test/resources/appender-test-with-log-label-unset.xml
index 170d513..e6191e7 100644
--- a/logback-appender/src/test/resources/appender-test-with-log-label-unset.xml
+++ b/logback-appender/src/test/resources/appender-test-with-log-label-unset.xml
@@ -13,12 +13,15 @@
-
+
+
+
+