From 7954184bfc13201ee7d036002de5b2e65ffc6a29 Mon Sep 17 00:00:00 2001
From: Peter Paul Bakker <peter.paul.bakker@stokpop.nl>
Date: Mon, 22 Aug 2022 20:35:59 +0200
Subject: [PATCH] version 2.1.11: fix logstash config in logback-spring.xml

---
 README.md                                              | 4 ++--
 afterburner-java/src/main/resources/logback-spring.xml | 7 +++----
 pom.xml                                                | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index af4cd196..dbbef0ed 100644
--- a/README.md
+++ b/README.md
@@ -397,13 +397,13 @@ on a remote location.
 
 To start the docker:
 
-    docker run --rm -d -p 8080:8080 --name afterburner stokpop/afterburner-jdk:2.1.2
+    docker run --rm -d -p 8080:8080 --name afterburner stokpop/afterburner-jdk:2.1.11-jdk11
 
 To start with the pyroscope agent (make sure to build with profile `pyroscope`: `-Ppyroscope`):
 
     docker run -rm -d -p 8080:8080 \
       -e JAVA_TOOL_OPTIONS="-javaagent:/pyroscope.jar" \
-      --name afterburner stokpop/afterburner-jdk:2.1.2
+      --name afterburner stokpop/afterburner-jdk:2.1.11-jdk11
 
 ##### credits
 * fire favicon from [freefavicon](http://www.freefavicon.com)
diff --git a/afterburner-java/src/main/resources/logback-spring.xml b/afterburner-java/src/main/resources/logback-spring.xml
index 49611c59..cbe8d16c 100644
--- a/afterburner-java/src/main/resources/logback-spring.xml
+++ b/afterburner-java/src/main/resources/logback-spring.xml
@@ -17,12 +17,11 @@
             </encoder>
         </appender>
         <appender name="Stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <param name="Encoding" value="UTF-8"/>
-            <remoteHost>${afterburner.logback.logstash.remotehost:-logstash}</remoteHost>
-            <port>${afterburner.logback.logstash.port:-4560}</port>
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder charset="UTF-8"
+                     class="net.logstash.logback.encoder.LogstashEncoder">
                 <customFields>{"system_under_test":"${management.metrics.tags.system_under_test}", "test_environment": "${management.metrics.tags.test_environment}", "service": "${management.metrics.tags.service}"}</customFields>
             </encoder>
+            <destination>${afterburner.logback.logstash.remotehost:-logstash}:${afterburner.logback.logstash.port:-4560}</destination>
         </appender>
 
         <root level="info">
diff --git a/pom.xml b/pom.xml
index fd5d216f..3204db53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     </developers>
 
     <properties>
-        <revision>2.1.10</revision>
+        <revision>2.1.11</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <encoding>UTF-8</encoding>