From 989f6014c62127fe62b6c77ef691b0443a4b64d9 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 00:07:40 +0100
Subject: [PATCH 01/16] Working to make CircleCI trigger on tag.

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 419abf1..9f97caa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,6 +51,9 @@ workflows:
   main:
     jobs:
       - build-and-test
+          filters:
+            tags:
+              only: /.*/
       - circleci-maven-release-orb/run-maven-release:
           filters:
             branches:

From 110c6f922dfb3465835b895911c857713a12aa2e Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 00:08:44 +0100
Subject: [PATCH 02/16] Of course there was an error in yaml...

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f97caa..2bf1797 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,7 +50,7 @@ workflows:
   version: 2
   main:
     jobs:
-      - build-and-test
+      - build-and-test:
           filters:
             tags:
               only: /.*/

From d023fb45dbced77e9006f49afc2c94da7ed310a4 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 00:37:39 +0100
Subject: [PATCH 03/16] Never version of maven release orb.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2bf1797..568cec0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  circleci-maven-release-orb: sonatype-nexus-community/circleci-maven-release-orb@0.0.15
+  circleci-maven-release-orb: sonatype-nexus-community/circleci-maven-release-orb@0.0.16
 
 jobs:
   build-and-test:

From bad0d0d5d1913364286e80b9d303f6463b2eb992 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 08:46:32 +0100
Subject: [PATCH 04/16] Trying to make circleci checkout repo without detached
 HEAD.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 568cec0..127bbd1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ workflows:
       - circleci-maven-release-orb/run-maven-release:
           filters:
             branches:
-              ignore: /.*/
+              only: /master/
             tags:
               only: /.*/
           requires:

From bf1ebd6c76488924d3503994380a9eff59020641 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 07:53:49 +0000
Subject: [PATCH 05/16] [skip ci] [maven-release-plugin] prepare release
 tjahzi-0.7

---
 loki-log4j2-appender/pom.xml | 5 ++---
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 5 ++---
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 92a91ad..3f58d45 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index fbd50e6..2921519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>HEAD</tag>
+        <tag>tjahzi-0.7</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 879a39e..b6fce59 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 4260bf4..8d7f68a 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From ee2bacaaf2bf28c44fd2d01d2ef8ccfcffb749bb Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 22:32:05 +0100
Subject: [PATCH 06/16] Changing how releases are performed.

---
 .circleci/config.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 127bbd1..3fc2710 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,20 +46,21 @@ executors:
     machine:
       image: ubuntu-2004:202008-01
 
+parameters:
+  run_workflow_release:
+    default: false
+    type: boolean
+
 workflows:
   version: 2
   main:
     jobs:
-      - build-and-test:
-          filters:
-            tags:
-              only: /.*/
+      - build-and-test
+  release:
+    when: << pipeline.parameters.run_workflow_release >>
+    jobs:
+      - build-and-test
       - circleci-maven-release-orb/run-maven-release:
-          filters:
-            branches:
-              only: /master/
-            tags:
-              only: /.*/
           requires:
               - build-and-test
           executor: new-java-maven-executor

From d37c0987587f16b92280c1d35c34549f80445848 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Tue, 26 Jan 2021 22:33:55 +0100
Subject: [PATCH 07/16] Revert "[skip ci] [maven-release-plugin] prepare
 release tjahzi-0.7"

This reverts commit bf1ebd6c
---
 loki-log4j2-appender/pom.xml | 5 +++--
 tjahzi-core/pom.xml          | 5 +++--
 tjahzi-protobuf/pom.xml      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 3f58d45..92a91ad 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -1,11 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index b6fce59..879a39e 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -1,11 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 8d7f68a..4260bf4 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From f5b61bed1494580d2575be067efd79b25af96f66 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Wed, 27 Jan 2021 23:19:51 +0100
Subject: [PATCH 08/16] Revert "[skip ci] [maven-release-plugin] prepare
 release tjahzi-0.7"

This reverts commit bf1ebd6c
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2921519..fbd50e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.7</version>
+    <version>0.7-SNAPSHOT</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>tjahzi-0.7</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>

From e63a7f3e155b9d9819a729f90a4ec894d4d000ac Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Wed, 27 Jan 2021 22:31:56 +0000
Subject: [PATCH 09/16] [skip ci] [maven-release-plugin] prepare release
 tjahzi-0.7

---
 loki-log4j2-appender/pom.xml | 5 ++---
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 5 ++---
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 92a91ad..3f58d45 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index fbd50e6..2921519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>HEAD</tag>
+        <tag>tjahzi-0.7</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 879a39e..b6fce59 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 4260bf4..8d7f68a 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From 6083bc1627798920ba1fbca09340d6f93f36a039 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Thu, 28 Jan 2021 00:53:15 +0100
Subject: [PATCH 10/16] Manually preparing for 0.8 release.

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 2 +-
 tjahzi-core/pom.xml          | 2 +-
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 3f58d45..2bed228 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.8-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index 2921519..c374d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index b6fce59..d0950b0 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.8-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 8d7f68a..1ba49a1 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.7</version>
+        <version>0.8-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From 30955907464e9e78006d15f956b9e1cebfe204aa Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Thu, 28 Jan 2021 00:05:33 +0000
Subject: [PATCH 11/16] [skip ci] [maven-release-plugin] prepare release
 tjahzi-0.8

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 2 +-
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 2bed228..ef51645 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.8</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index c374d41..35e8878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>tjahzi-0.7</tag>
+        <tag>tjahzi-0.8</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index d0950b0..802170d 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.8</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 1ba49a1..45bf0dc 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8-SNAPSHOT</version>
+        <version>0.8</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From 7b8bf0d298079ba6b26ad9d821197e48b9316540 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Thu, 28 Jan 2021 00:05:40 +0000
Subject: [PATCH 12/16] [skip ci] [maven-release-plugin] prepare for next
 development iteration

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 2 +-
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index ef51645..8c473c0 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8</version>
+        <version>0.9-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index 35e8878..9d209fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.8</version>
+    <version>0.9-SNAPSHOT</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>tjahzi-0.8</tag>
+        <tag>tjahzi-0.7</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 802170d..377831c 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8</version>
+        <version>0.9-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 45bf0dc..01198cd 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8</version>
+        <version>0.9-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From 0539d70240809bb419f732087515c38222ec9e4c Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Sun, 31 Jan 2021 11:47:21 +0100
Subject: [PATCH 13/16] Re #26: Fixed bug caused by Snappy class from Netty
 being able to compress max 32kb of data. Now it is called multiple times but
 since it appends uncompressed data size at the beginning I had to copy the
 class contents and remove that (we only need it once).

Also streamlined dependency on netty-all.
---
 .../LokiAppenderLargeBatchesTestTest.java     | 124 +++++++++
 .../resources/appender-test-large-batches.xml |  23 ++
 .../src/test/resources/loki-config.yaml       |   1 +
 tjahzi-core/pom.xml                           |  12 +-
 .../pl/tkowalcz/tjahzi/LogBufferAgent.java    |  19 +-
 .../tkowalcz/tjahzi/http/NettyHttpClient.java |  33 ++-
 .../java/pl/tkowalcz/tjahzi/http/Snappy.java  | 256 ++++++++++++++++++
 .../tkowalcz/tjahzi/LogBufferAgentTest.java   |   5 +-
 .../pl/tkowalcz/tjahzi/ReconnectTest.java     |   4 +-
 .../pl/tkowalcz/tjahzi/http/SnappyTest.java   |  44 +++
 10 files changed, 496 insertions(+), 25 deletions(-)
 create mode 100644 loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderLargeBatchesTestTest.java
 create mode 100644 loki-log4j2-appender/src/test/resources/appender-test-large-batches.xml
 create mode 100644 tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
 create mode 100644 tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java

diff --git a/loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderLargeBatchesTestTest.java b/loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderLargeBatchesTestTest.java
new file mode 100644
index 0000000..3393f5f
--- /dev/null
+++ b/loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderLargeBatchesTestTest.java
@@ -0,0 +1,124 @@
+package pl.tkowalcz.tjahzi.log4j2;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
+import org.awaitility.Durations;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItems;
+
+@Testcontainers
+class LokiAppenderLargeBatchesTestTest {
+
+    @Container
+    public GenericContainer loki = new GenericContainer("grafana/loki:latest")
+            .withCommand("-config.file=/etc/loki-config.yaml")
+            .withClasspathResourceMapping("loki-config.yaml",
+                    "/etc/loki-config.yaml",
+                    BindMode.READ_ONLY)
+            .waitingFor(
+                    Wait.forHttp("/ready")
+                            .forPort(3100)
+            )
+            .withExposedPorts(3100);
+
+    @Test
+    void shouldSendData() throws URISyntaxException {
+        // Given
+        System.setProperty("loki.host", loki.getHost());
+        System.setProperty("loki.port", loki.getFirstMappedPort().toString());
+
+        URI uri = getClass()
+                .getClassLoader()
+                .getResource("appender-test-large-batches.xml")
+                .toURI();
+
+        ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false))
+                .setConfigLocation(uri);
+
+        String expectedLogLine = "Cupcake ipsum dolor sit amet cake wafer. " +
+                "Souffle jelly beans biscuit topping. " +
+                "Danish bonbon gummies powder caramels. " +
+                "Danish jelly beans sweet roll topping jelly beans oat cake toffee. " +
+                "Chocolate cake sesame snaps brownie biscuit cheesecake. " +
+                "Ice cream dessert sweet donut marshmallow. " +
+                "Muffin bear claw cookie jelly-o sugar plum jelly beans apple pie fruitcake cookie. " +
+                "Tootsie roll carrot cake pastry jujubes jelly beans chupa chups. " +
+                "Souffle cake muffin liquorice tart souffle pie sesame snaps.";
+
+        long expectedTimestamp = System.currentTimeMillis();
+        Logger logger = LogManager.getLogger(LokiAppenderLargeBatchesTestTest.class);
+
+        // When
+        for (int i = 0; i < 1000; i++) {
+            logger.info(i + " " + expectedLogLine);
+        }
+
+        // Then
+        RestAssured.port = loki.getFirstMappedPort();
+        RestAssured.baseURI = "http://" + loki.getHost();
+        RestAssured.registerParser("text/plain", Parser.JSON);
+
+        Awaitility
+                .await()
+                .atMost(Durations.ONE_MINUTE)
+                .pollInterval(Durations.ONE_SECOND)
+                .ignoreExceptions()
+                .untilAsserted(() -> {
+                    given()
+                            .contentType(ContentType.URLENC)
+                            .urlEncodingEnabled(false)
+                            .formParam("&start=" + expectedTimestamp + "&limit=1000&query=%7Bserver%3D%22127.0.0.1%22%7D")
+                            .when()
+                            .get("/loki/api/v1/query_range")
+                            .then()
+                            .log()
+                            .all()
+                            .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].values.size()", equalTo(1000))
+                            .body("data.result[0].values", hasItems(new BaseMatcher<>() {
+                                                                        @Override
+                                                                        public boolean matches(Object o) {
+                                                                            List<Object> list = (List<Object>) o;
+                                                                            if (list.size() != 2) {
+                                                                                return false;
+                                                                            }
+
+                                                                            long actualTimestamp = Long.parseLong(list.get(0).toString());
+                                                                            String actualLogLine = list.get(1).toString();
+
+                                                                            return actualLogLine.contains(expectedLogLine)
+                                                                                    && (expectedTimestamp - actualTimestamp) < TimeUnit.MINUTES.toMillis(1);
+                                                                        }
+
+                                                                        @Override
+                                                                        public void describeTo(Description description) {
+
+                                                                        }
+                                                                    }
+
+                            ));
+                });
+    }
+}
diff --git a/loki-log4j2-appender/src/test/resources/appender-test-large-batches.xml b/loki-log4j2-appender/src/test/resources/appender-test-large-batches.xml
new file mode 100644
index 0000000..79aa5a9
--- /dev/null
+++ b/loki-log4j2-appender/src/test/resources/appender-test-large-batches.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration status="OFF" shutdownHook="disable" packages="pl.tkowalcz.tjahzi.log4j2">
+    <Loggers>
+        <Root level="INFO">
+            <AppenderRef ref="Loki"/>
+        </Root>
+    </Loggers>
+
+    <appenders>
+        <Loki name="Loki" bufferSizeMegabytes="2" batchWait="10000">
+            <host>${sys:loki.host}</host>
+            <port>${sys:loki.port}</port>
+
+            <ThresholdFilter level="ALL"/>
+            <PatternLayout>
+                <Pattern>%X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}</Pattern>
+            </PatternLayout>
+
+            <Header name="server" value="127.0.0.1"/>
+            <Label name="server" value="127.0.0.1"/>
+        </Loki>
+    </appenders>
+</configuration>
diff --git a/loki-log4j2-appender/src/test/resources/loki-config.yaml b/loki-log4j2-appender/src/test/resources/loki-config.yaml
index ab1c41f..aded6e8 100644
--- a/loki-log4j2-appender/src/test/resources/loki-config.yaml
+++ b/loki-log4j2-appender/src/test/resources/loki-config.yaml
@@ -38,6 +38,7 @@ limits_config:
   enforce_metric_name: false
   reject_old_samples: true
   reject_old_samples_max_age: 168h
+  max_entries_limit_per_query: 10000
 
 chunk_store_config:
   max_look_back_period: 0s
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 377831c..93a8142 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
+            <artifactId>netty-codec-http</artifactId>
             <version>4.1.52.Final</version>
         </dependency>
         <dependency>
@@ -112,5 +113,12 @@
             <version>1.14.3</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.8.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
index 2765c55..86eaf97 100644
--- a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
+++ b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
@@ -1,8 +1,5 @@
 package pl.tkowalcz.tjahzi;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufOutputStream;
-import io.netty.buffer.PooledByteBufAllocator;
 import logproto.Logproto;
 import org.agrona.MutableDirectBuffer;
 import org.agrona.concurrent.Agent;
@@ -55,16 +52,14 @@ public class LogBufferAgent implements Agent, MessageHandler {
 
         long currentTimeMillis = clock.millis();
         if (exceededBatchSizeThreshold() || exceededWaitTimeThreshold(currentTimeMillis)) {
-            ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
-            request.build().writeTo(
-                    new ByteBufOutputStream(buffer)
-            );
+            try {
+                httpClient.log(request);
+            } finally {
+                request = Logproto.PushRequest.newBuilder();
 
-            httpClient.log(buffer);
-            request = Logproto.PushRequest.newBuilder();
-
-            estimatedBytesPending = 0;
-            timeoutDeadline = currentTimeMillis + batchWaitMillis;
+                estimatedBytesPending = 0;
+                timeoutDeadline = currentTimeMillis + batchWaitMillis;
+            }
         }
 
         return workDone;
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
index d44fa8b..1a8d378 100644
--- a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
+++ b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
@@ -1,12 +1,15 @@
 package pl.tkowalcz.tjahzi.http;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
 import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.handler.codec.compression.Snappy;
 import io.netty.handler.codec.http.*;
+import io.netty.util.ReferenceCountUtil;
+import logproto.Logproto;
 import pl.tkowalcz.tjahzi.stats.MonitoringModule;
 
 import java.io.Closeable;
+import java.io.IOException;
 
 public class NettyHttpClient implements Closeable {
 
@@ -32,21 +35,17 @@ public class NettyHttpClient implements Closeable {
     }
 
     public void log(ByteBuf dataBuffer) {
-        ByteBuf output = PooledByteBufAllocator.DEFAULT.buffer();
-        snappy.encode(dataBuffer, output, dataBuffer.readableBytes());
-        dataBuffer.release();
-
         FullHttpRequest request = new DefaultFullHttpRequest(
                 HttpVersion.HTTP_1_1,
                 HttpMethod.POST,
                 clientConfiguration.getLogEndpoint(),
-                output
+                dataBuffer
         );
 
         request.headers()
                 .add(headers)
                 .set(HttpHeaderNames.CONTENT_TYPE, PROTOBUF_MIME_TYPE)
-                .set(HttpHeaderNames.CONTENT_LENGTH, output.readableBytes())
+                .set(HttpHeaderNames.CONTENT_LENGTH, dataBuffer.readableBytes())
                 .set(HttpHeaderNames.HOST, clientConfiguration.getHost());
 
         lokiConnection.execute(request);
@@ -56,4 +55,24 @@ public class NettyHttpClient implements Closeable {
     public void close() {
         lokiConnection.close();
     }
+
+    public void log(Logproto.PushRequest.Builder request) throws IOException {
+        ByteBuf dataBuffer = PooledByteBufAllocator.DEFAULT.buffer();
+        ByteBuf compressedBuffer = PooledByteBufAllocator.DEFAULT.buffer();
+
+        try {
+            request.build().writeTo(
+                    new ByteBufOutputStream(dataBuffer)
+            );
+
+            snappy.encode(dataBuffer, compressedBuffer, dataBuffer.readableBytes());
+            log(compressedBuffer);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ReferenceCountUtil.safeRelease(dataBuffer);
+            ReferenceCountUtil.safeRelease(compressedBuffer);
+
+            throw e;
+        }
+    }
 }
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
new file mode 100644
index 0000000..c8941d4
--- /dev/null
+++ b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package pl.tkowalcz.tjahzi.http;
+
+import io.netty.buffer.ByteBuf;
+
+/**
+ * Uncompresses an input {@link ByteBuf} encoded with Snappy compression into an
+ * output {@link ByteBuf}.
+ * <p>
+ * See <a href="https://github.com/google/snappy/blob/master/format_description.txt">snappy format</a>.
+ */
+public final class Snappy {
+
+    private static final int MAX_HT_SIZE = 1 << 14;
+    private static final int MIN_COMPRESSIBLE_BYTES = 15;
+
+    // constants for the tag types
+    private static final int LITERAL = 0;
+    private static final int COPY_1_BYTE_OFFSET = 1;
+    private static final int COPY_2_BYTE_OFFSET = 2;
+
+    public void encode(final ByteBuf in, final ByteBuf out, final int length) {
+        // Write the preamble length to the output buffer
+        for (int i = 0; ; i++) {
+            int b = length >>> i * 7;
+            if ((b & 0xFFFFFF80) != 0) {
+                out.writeByte(b & 0x7f | 0x80);
+            } else {
+                out.writeByte(b);
+                break;
+            }
+        }
+
+        while (in.readableBytes() > 0) {
+            int min = Math.min(Short.MAX_VALUE, in.readableBytes());
+
+            ByteBuf slice = in.readSlice(min);
+            encode0(slice, out, slice.readableBytes());
+        }
+    }
+
+    private void encode0(final ByteBuf in, final ByteBuf out, final int length) {
+        int inIndex = in.readerIndex();
+        final int baseIndex = inIndex;
+
+        final short[] table = getHashTable(length);
+        final int shift = Integer.numberOfLeadingZeros(table.length) + 1;
+
+        int nextEmit = inIndex;
+
+        if (length - inIndex >= MIN_COMPRESSIBLE_BYTES) {
+            int nextHash = hash(in, ++inIndex, shift);
+            outer:
+            while (true) {
+                int skip = 32;
+
+                int candidate;
+                int nextIndex = inIndex;
+                do {
+                    inIndex = nextIndex;
+                    int hash = nextHash;
+                    int bytesBetweenHashLookups = skip++ >> 5;
+                    nextIndex = inIndex + bytesBetweenHashLookups;
+
+                    // We need at least 4 remaining bytes to read the hash
+                    if (nextIndex > length - 4) {
+                        break outer;
+                    }
+
+                    nextHash = hash(in, nextIndex, shift);
+
+                    candidate = baseIndex + table[hash];
+
+                    table[hash] = (short) (inIndex - baseIndex);
+                }
+                while (in.getInt(inIndex) != in.getInt(candidate));
+
+                encodeLiteral(in, out, inIndex - nextEmit);
+
+                int insertTail;
+                do {
+                    int base = inIndex;
+                    int matched = 4 + findMatchingLength(in, candidate + 4, inIndex + 4, length);
+                    inIndex += matched;
+                    int offset = base - candidate;
+                    encodeCopy(out, offset, matched);
+                    in.readerIndex(in.readerIndex() + matched);
+                    insertTail = inIndex - 1;
+                    nextEmit = inIndex;
+                    if (inIndex >= length - 4) {
+                        break outer;
+                    }
+
+                    int prevHash = hash(in, insertTail, shift);
+                    table[prevHash] = (short) (inIndex - baseIndex - 1);
+                    int currentHash = hash(in, insertTail + 1, shift);
+                    candidate = baseIndex + table[currentHash];
+                    table[currentHash] = (short) (inIndex - baseIndex);
+                }
+                while (in.getInt(insertTail + 1) == in.getInt(candidate));
+
+                nextHash = hash(in, insertTail + 2, shift);
+                ++inIndex;
+            }
+        }
+
+        // If there are any remaining characters, write them out as a literal
+        if (nextEmit < length) {
+            encodeLiteral(in, out, length - nextEmit);
+        }
+    }
+
+    /**
+     * Hashes the 4 bytes located at index, shifting the resulting hash into
+     * the appropriate range for our hash table.
+     *
+     * @param in    The input buffer to read 4 bytes from
+     * @param index The index to read at
+     * @param shift The shift value, for ensuring that the resulting value is
+     *              withing the range of our hash table size
+     * @return A 32-bit hash of 4 bytes located at index
+     */
+    private static int hash(ByteBuf in, int index, int shift) {
+        return in.getInt(index) * 0x1e35a7bd >>> shift;
+    }
+
+    /**
+     * Creates an appropriately sized hashtable for the given input size
+     *
+     * @param inputSize The size of our input, ie. the number of bytes we need to encode
+     * @return An appropriately sized empty hashtable
+     */
+    private static short[] getHashTable(int inputSize) {
+        int htSize = 256;
+        while (htSize < MAX_HT_SIZE && htSize < inputSize) {
+            htSize <<= 1;
+        }
+        return new short[htSize];
+    }
+
+    /**
+     * Iterates over the supplied input buffer between the supplied minIndex and
+     * maxIndex to find how long our matched copy overlaps with an already-written
+     * literal value.
+     *
+     * @param in       The input buffer to scan over
+     * @param minIndex The index in the input buffer to start scanning from
+     * @param inIndex  The index of the start of our copy
+     * @param maxIndex The length of our input buffer
+     * @return The number of bytes for which our candidate copy is a repeat of
+     */
+    private static int findMatchingLength(ByteBuf in, int minIndex, int inIndex, int maxIndex) {
+        int matched = 0;
+
+        while (inIndex <= maxIndex - 4 &&
+                in.getInt(inIndex) == in.getInt(minIndex + matched)) {
+            inIndex += 4;
+            matched += 4;
+        }
+
+        while (inIndex < maxIndex && in.getByte(minIndex + matched) == in.getByte(inIndex)) {
+            ++inIndex;
+            ++matched;
+        }
+
+        return matched;
+    }
+
+    /**
+     * Calculates the minimum number of bits required to encode a value.  This can
+     * then in turn be used to calculate the number of septets or octets (as
+     * appropriate) to use to encode a length parameter.
+     *
+     * @param value The value to calculate the minimum number of bits required to encode
+     * @return The minimum number of bits required to encode the supplied value
+     */
+    private static int bitsToEncode(int value) {
+        int highestOneBit = Integer.highestOneBit(value);
+        int bitLength = 0;
+        while ((highestOneBit >>= 1) != 0) {
+            bitLength++;
+        }
+
+        return bitLength;
+    }
+
+    /**
+     * Writes a literal to the supplied output buffer by directly copying from
+     * the input buffer.  The literal is taken from the current readerIndex
+     * up to the supplied length.
+     *
+     * @param in     The input buffer to copy from
+     * @param out    The output buffer to copy to
+     * @param length The length of the literal to copy
+     */
+    static void encodeLiteral(ByteBuf in, ByteBuf out, int length) {
+        if (length < 61) {
+            out.writeByte(length - 1 << 2);
+        } else {
+            int bitLength = bitsToEncode(length - 1);
+            int bytesToEncode = 1 + bitLength / 8;
+            out.writeByte(59 + bytesToEncode << 2);
+            for (int i = 0; i < bytesToEncode; i++) {
+                out.writeByte(length - 1 >> i * 8 & 0x0ff);
+            }
+        }
+
+        out.writeBytes(in, length);
+    }
+
+    private static void encodeCopyWithOffset(ByteBuf out, int offset, int length) {
+        if (length < 12 && offset < 2048) {
+            out.writeByte(COPY_1_BYTE_OFFSET | length - 4 << 2 | offset >> 8 << 5);
+            out.writeByte(offset & 0x0ff);
+        } else {
+            out.writeByte(COPY_2_BYTE_OFFSET | length - 1 << 2);
+            out.writeByte(offset & 0x0ff);
+            out.writeByte(offset >> 8 & 0x0ff);
+        }
+    }
+
+    /**
+     * Encodes a series of copies, each at most 64 bytes in length.
+     *
+     * @param out    The output buffer to write the copy pointer to
+     * @param offset The offset at which the original instance lies
+     * @param length The length of the original instance
+     */
+    private static void encodeCopy(ByteBuf out, int offset, int length) {
+        while (length >= 68) {
+            encodeCopyWithOffset(out, offset, 64);
+            length -= 64;
+        }
+
+        if (length > 64) {
+            encodeCopyWithOffset(out, offset, 60);
+            length -= 60;
+        }
+
+        encodeCopyWithOffset(out, offset, length);
+    }
+}
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
index bcdf971..1ee274c 100644
--- a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
+++ b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
@@ -1,5 +1,6 @@
 package pl.tkowalcz.tjahzi;
 
+import logproto.Logproto;
 import org.agrona.concurrent.UnsafeBuffer;
 import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
 import org.agrona.concurrent.ringbuffer.RingBufferDescriptor;
@@ -72,7 +73,7 @@ class LogBufferAgentTest {
         agent.doWork();
 
         // Then
-        verify(httpClient).log(any());
+        verify(httpClient).log((Logproto.PushRequest.Builder) any());
     }
 
     @Test
@@ -179,6 +180,6 @@ class LogBufferAgentTest {
         agent.doWork();
 
         // Then
-        verify(httpClient, times(2)).log(any());
+        verify(httpClient, times(2)).log((Logproto.PushRequest.Builder) any());
     }
 }
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
index 8b9770b..17c3a36 100644
--- a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
+++ b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
@@ -77,8 +77,8 @@ public class ReconnectTest {
                 httpClient,
                 monitoringModule,
                 Map.of(),
-                0,
-                0,
+                10_000,
+                1000,
                 1024 * 1024,
                 false
         );
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java
new file mode 100644
index 0000000..bf233b3
--- /dev/null
+++ b/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java
@@ -0,0 +1,44 @@
+package pl.tkowalcz.tjahzi.http;
+
+import com.google.common.base.Strings;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.PooledByteBufAllocator;
+import org.junit.jupiter.api.Test;
+import org.xerial.snappy.Snappy;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SnappyTest {
+
+    @Test
+    void shouldCompressAndDecompress() throws IOException {
+        // Given
+        String logLine = "Cupcake ipsum dolor sit amet cake wafer. " +
+                "Souffle jelly beans biscuit topping. " +
+                "Danish bonbon gummies powder caramels. " +
+                "Danish jelly beans sweet roll topping jelly beans oat cake toffee. " +
+                "Chocolate cake sesame snaps brownie biscuit cheesecake. " +
+                "Ice cream dessert sweet donut marshmallow. " +
+                "Muffin bear claw cookie jelly-o sugar plum jelly beans apple pie fruitcake cookie. " +
+                "Tootsie roll carrot cake pastry jujubes jelly beans chupa chups. " +
+                "Souffle cake muffin liquorice tart souffle pie sesame snaps.";
+
+        byte[] expected = Strings.repeat(logLine, 10_000).getBytes();
+
+        ByteBuf input = PooledByteBufAllocator.DEFAULT.heapBuffer();
+        input.writeBytes(expected);
+
+        ByteBuf output = PooledByteBufAllocator.DEFAULT.heapBuffer();
+
+        // When
+        new pl.tkowalcz.tjahzi.http.Snappy().encode(input, output, input.readableBytes());
+        byte[] compressed = new byte[output.readableBytes()];
+        output.readBytes(compressed);
+
+        // Then
+        byte[] actual = Snappy.uncompress(compressed);
+        assertThat(actual).isEqualTo(expected);
+    }
+}

From c94552356e7b86f26f2a1caa8ddea147493e7891 Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Sun, 31 Jan 2021 17:12:21 +0100
Subject: [PATCH 14/16] Next release will be patch release.

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 4 +++-
 tjahzi-core/pom.xml          | 2 +-
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 8c473c0..0518926 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index 9d209fd..e91eeb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -56,6 +56,7 @@
         <compiler.source.level>9</compiler.source.level>
         <compiler.target.level>9</compiler.target.level>
 
+        <!--suppress UnresolvedMavenProperty -->
         <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
     </properties>
 
@@ -179,6 +180,7 @@
                 </plugins>
             </build>
             <properties>
+                <!--suppress UnresolvedMavenProperty -->
                 <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
             </properties>
         </profile>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 93a8142..b815c65 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index 01198cd..f9e7a42 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From cdc79b82f8d642920abe2a5e175c373eed39006e Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Sun, 31 Jan 2021 16:24:16 +0000
Subject: [PATCH 15/16] [skip ci] [maven-release-plugin] prepare release
 tjahzi-0.8.1

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 5 ++---
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 0518926..042a123 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.1</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index e91eeb0..9b8e6bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.1-SNAPSHOT</version>
+    <version>0.8.1</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>tjahzi-0.7</tag>
+        <tag>tjahzi-0.8.1</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index b815c65..9aec727 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.1</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index f9e7a42..a4ed58a 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.1</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>

From 3e2e6b354cce305f18014e1942817e9f9d252f2e Mon Sep 17 00:00:00 2001
From: "tomasz.kowalczewski" <tomasz.kowalczewski@gmail.com>
Date: Sun, 31 Jan 2021 16:24:22 +0000
Subject: [PATCH 16/16] [skip ci] [maven-release-plugin] prepare for next
 development iteration

---
 loki-log4j2-appender/pom.xml | 2 +-
 pom.xml                      | 4 ++--
 tjahzi-core/pom.xml          | 2 +-
 tjahzi-protobuf/pom.xml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/loki-log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
index 042a123..20f16cb 100644
--- a/loki-log4j2-appender/pom.xml
+++ b/loki-log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1</version>
+        <version>0.8.2-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-log4j2-appender</name>
diff --git a/pom.xml b/pom.xml
index 9b8e6bf..e6c6c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>pl.tkowalcz</groupId>
     <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.1</version>
+    <version>0.8.2-SNAPSHOT</version>
 
     <name>Tjahzi</name>
     <description>Tjahzi is a low overhead logging client for Loki</description>
@@ -20,7 +20,7 @@
     <scm>
         <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
-        <tag>tjahzi-0.8.1</tag>
+        <tag>tjahzi-0.7</tag>
     </scm>
 
     <distributionManagement>
diff --git a/tjahzi-core/pom.xml b/tjahzi-core/pom.xml
index 9aec727..cac3b71 100644
--- a/tjahzi-core/pom.xml
+++ b/tjahzi-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1</version>
+        <version>0.8.2-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-core</name>
diff --git a/tjahzi-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
index a4ed58a..4d21c1c 100644
--- a/tjahzi-protobuf/pom.xml
+++ b/tjahzi-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.tkowalcz</groupId>
         <artifactId>tjahzi</artifactId>
-        <version>0.8.1</version>
+        <version>0.8.2-SNAPSHOT</version>
     </parent>
 
     <name>tjahzi-loki-protobuf</name>