Switch integration test from Loki 2.9.1 to Loki 3.0.0

.github/workflows/integration-tests.yaml

@@ -11,16 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        loki: [1.6.1, 2.9.1]
+        loki: [1.6.1, 3.0.0]
         include:
           - loki: 1.6.1
             limits: -distributor.ingestion-rate-limit-mb=160 -distributor.ingestion-burst-size-mb=240
-          - loki: 2.9.1
+          - loki: 3.0.0
             limits: |
               -distributor.ingestion-rate-limit-mb=160 -distributor.ingestion-burst-size-mb=240 \
               -ingester.per-stream-rate-limit="80MB" -ingester.per-stream-rate-limit-burst="160MB" \
               -server.grpc-max-recv-msg-size-bytes=4194304000 \
-              -querier.frontend-client.grpc-max-send-msg-size=167772160
+              -querier.frontend-client.grpc-max-send-msg-size=167772160 \
+              -shard-streams.enabled=false
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK
@@ -39,7 +40,7 @@ jobs:
             -config.file=/etc/loki/local-config.yaml -auth.enabled=true
           sleep 5s
 
-          gradle check integTests
+          gradle -Dorg.gradle.jvmargs=-Xmx2G check integTests
           gradle ciOnlyTests --tests "*MultitenantSupportTest"
 
           docker stop loki

loki-logback-appender/src/test/java/com/github/loki4j/logback/Generators.java

@@ -119,7 +119,7 @@ public static JsonEncoder jsonEncoder(boolean staticLabels, String testLabel) {
     public static JsonEncoder jsonEncoder(boolean staticLabels, String testLabel, Layout<ILoggingEvent> msgLayout) {
         var encoder = new JsonEncoder();
         encoder.setStaticLabels(staticLabels);
-        encoder.setLabel(labelCfg("test=" + testLabel + ",level=%level,app=my-app", ",", "=", true, false));
+        encoder.setLabel(labelCfg("test=" + testLabel + ",level=%level,service_name=my-app", ",", "=", true, false));
         encoder.setMessage(msgLayout);
         encoder.setSortByTime(true);
         return encoder;
@@ -132,7 +132,7 @@ public static ProtobufEncoder protobufEncoder(boolean staticLabels, String testL
     public static ProtobufEncoder protobufEncoder(boolean staticLabels, String testLabel, Layout<ILoggingEvent> msgLayout) {
         var encoder = new ProtobufEncoder();
         encoder.setStaticLabels(staticLabels);
-        encoder.setLabel(labelCfg("test=" + testLabel + ",level=%level,app=my-app", ",", "=", true, false));
+        encoder.setLabel(labelCfg("test=" + testLabel + ",level=%level,service_name=my-app", ",", "=", true, false));
         encoder.setMessage(msgLayout);
         return encoder;
     }

loki-logback-appender/src/test/java/com/github/loki4j/logback/PatternLayoutTest.java

@@ -30,7 +30,7 @@ public void testEncodeEscapes() {
         try { Thread.sleep(100L); } catch (InterruptedException e1) { }
 
         var expected = (
-            "{'streams':[{'stream':{'test':'testEncodeEscapes','level':'INFO','app':'my-app'}," +
+            "{'streams':[{'stream':{'test':'testEncodeEscapes','level':'INFO','service_name':'my-app'}," +
             "'values':[['100100000','l=INFO c=TestApp t=main | m1-line1\\r\\nline2\\r\\n ']," +
             "['100100001','l=INFO c=TestApp t=main | m2-line1\\nline2\\n ']," +
             "['100100002','l=INFO c=TestApp t=main | m3-line1\\rline2\\r ']]}]}"

loki-logback-appender/src/test/java/com/github/loki4j/logback/integration/FastSendTest.java

@@ -28,6 +28,18 @@ public static void stopLokiClient() {
         client.close();
     }
 
+    @Test
+    @Category({IntegrationTests.class})
+    public void testJavaJsonOneEventSend() throws Exception {
+        var label = "testJavaJsonOneEventSend";
+        var encoder = jsonEncoder(false, label);
+        var sender = javaHttpSender(urlPush);
+        var appender = appender(10, 1000, encoder, sender);
+
+        var events = generateEvents(1, 10);
+        client.testHttpSend(label, events, appender, jsonEncoder(false, label));
+    }
+
 
     @Test
     @Category({IntegrationTests.class})

loki-logback-appender/src/test/java/com/github/loki4j/logback/integration/GrafanaCloudTest.java

@@ -9,7 +9,6 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -50,6 +49,19 @@ private static AbstractHttpSender authorize(AbstractHttpSender sender) {
         return sender;
     }
 
+    @Test
+    @Category({CIOnlyTests.class})
+    public void testApacheJsonOneEventCloud() throws Exception {
+        var label = label("testApacheJsonOneEventCloud");
+        var encoder = jsonEncoder(false, label);
+        var sender = authorize(apacheHttpSender(urlPush));
+        var appender = appender(10, 1000, encoder, sender);
+
+        var events = generateEvents(1, 20);
+        client.testHttpSend(label, events, appender, jsonEncoder(false, label));
+
+        assertTrue(true);
+    }
 
     @Test
     @Category({CIOnlyTests.class})
@@ -144,7 +156,6 @@ public void testApacheJsonMaxBytesSend() throws Exception {
 
     @Test
     @Category({CIOnlyTests.class})
-    @Ignore("Disabled due to unpredictable stream sharding on Grafana Cloud Loki side")
     public void testJavaProtobufMaxBytesSend() throws Exception {
         var label = label("testJavaProtobufMaxBytesSendCloud");
         var encoder = protobufEncoder(false, label);

loki-logback-appender/src/test/java/com/github/loki4j/logback/integration/LokiTestingClient.java

@@ -81,7 +81,6 @@ public void close() {
     }
 
     public String queryRecords(String testLabel, int limit, String time) {
-
         try {
             var query = URLEncoder.encode("{test=\"" + testLabel + "\"}", "utf-8");
             var url = URI.create(String.format(