Add bufferChunkRetentionTimeMillis option for fluency #53

sndyuk · Oct 3, 2020 · 66a2455 · 66a2455
1 parent 892ceec
commit 66a2455
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,7 @@ Just add it to your dependency then you can use the slf4j module in your applica
 * Add options for Fluent / Fluency appenders:
   * "encoder" option becomes optional. If you don't set encoder, the log message outputs pure message. 
   * "messageFieldKeyName" option has been added: Set it if you want to change the default message field key name(= "message").
+* Add options for Fluency appender: `bufferChunkRetentionTimeMillis`
 * Fix bug: Messages were lost sometimes when the messages had been waiting for flushing on shutting down an application.  
 * Fix bug: Fluent appender: Do not raise an error when a fluentd server is down.
 

diff --git a/pom-JAVA9MODULE_SLF4J17.xml b/pom-JAVA9MODULE_SLF4J17.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sndyuk</groupId>
   <artifactId>logback-more-appenders</artifactId>
-  <version>1.8.0-JAVA9MODULE_SLF4J17</version>
+  <version>1.8.1-JAVA9MODULE_SLF4J17</version>
   <name>logback-more-appenders</name>
   <description>logback appenders.</description>
   <url>https://github.com/sndyuk/logback-more-appenders</url>
@@ -53,31 +53,31 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.2.0</version>
         <executions>
           <execution>
-            <id>default-compile</id>
-            <configuration>
-              <release>9</release>
-            </configuration>
-          </execution>
-          <execution>
-            <id>base-compile</id>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
             <goals>
-              <goal>compile</goal>
+              <goal>add-source</goal>
             </goals>
             <configuration>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
+              <sources>
+                <source>src/java9/java</source>
+              </sources>
             </configuration>
           </execution>
         </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
         <configuration>
           <fork>true</fork>
-          <release>8</release>
+          <release>9</release>
           <encoding>${project.build.sourceEncoding}</encoding>
           <source>${jdk.version}</source>
           <target>${jdk.version}</target>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sndyuk</groupId>
   <artifactId>logback-more-appenders</artifactId>
-  <version>1.8.0</version>
+  <version>1.8.1</version>
   <name>logback-more-appenders</name>
   <description>logback appenders.</description>
   <url>https://github.com/sndyuk/logback-more-appenders</url>
@@ -21,7 +21,7 @@
     <logback.version>1.2.3</logback.version>
     <jackson.version>2.9.8</jackson.version>
     <aws.version>1.11.642</aws.version>
-    <jdk.version>1.7</jdk.version>
+    <jdk.version>7</jdk.version>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>
 
@@ -58,9 +58,6 @@
           <encoding>${project.build.sourceEncoding}</encoding>
           <source>${jdk.version}</source>
           <target>${jdk.version}</target>
-          <excludes>
-            <exclude>**/module-info.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -91,9 +88,6 @@
         <configuration>
           <source>${jdk.version}</source>
           <additionalparam>-Xdoclint:none</additionalparam>
-          <sourceFileExcludes>
-            <sourceFileExclude>**/module-info.java</sourceFileExclude>
-          </sourceFileExcludes>
         </configuration>
       </plugin>
       <plugin>

diff --git a/src/main/java/ch/qos/logback/more/appenders/DataFluentAppender.java b/src/main/java/ch/qos/logback/more/appenders/DataFluentAppender.java
@@ -13,14 +13,15 @@
  */
 package ch.qos.logback.more.appenders;
 
-import static ch.qos.logback.core.CoreConstants.CODES_URL;
-import java.util.HashMap;
-import java.util.Map;
-import org.fluentd.logger.FluentLogger;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.encoder.Encoder;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
-import org.fluentd.logger.sender.ExponentialDelayReconnector;
+import org.fluentd.logger.FluentLogger;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static ch.qos.logback.core.CoreConstants.CODES_URL;
 
 public class DataFluentAppender<E> extends FluentdAppenderBase<E> {
     private FluentLogger fluentLogger;

diff --git a/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java b/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java
@@ -129,6 +129,7 @@ public void stop() {
     private String fileBackupDir;
     private Integer bufferChunkInitialSize;
     private Integer bufferChunkRetentionSize;
+    private Integer bufferChunkRetentionTimeMillis;
     private Long maxBufferSize;
     private Integer connectionTimeoutMilli;
     private Integer readTimeoutMilli;
@@ -207,6 +208,14 @@ public void setBufferChunkRetentionSize(Integer bufferChunkRetentionSize) {
         this.bufferChunkRetentionSize = bufferChunkRetentionSize;
     }
 
+    public Integer getBufferChunkRetentionTimeMillis() {
+        return bufferChunkRetentionTimeMillis;
+    }
+
+    public void setBufferChunkRetentionTimeMillis(Integer bufferChunkRetentionTimeMillis) {
+        this.bufferChunkRetentionTimeMillis = bufferChunkRetentionTimeMillis;
+    }
+
     public Long getMaxBufferSize() {
         return maxBufferSize;
     }
@@ -284,6 +293,7 @@ protected FluencyBuilderForFluentd configureFluency() {
         if (fileBackupDir != null) { builder.setFileBackupDir(fileBackupDir); }
         if (bufferChunkInitialSize != null) { builder.setBufferChunkInitialSize(bufferChunkInitialSize); }
         if (bufferChunkRetentionSize != null) { builder.setBufferChunkRetentionSize(bufferChunkRetentionSize); }
+        if (bufferChunkRetentionTimeMillis != null) { builder.setBufferChunkRetentionTimeMillis(bufferChunkRetentionTimeMillis); }
         if (maxBufferSize != null) { builder.setMaxBufferSize(maxBufferSize); }
         if (connectionTimeoutMilli != null) { builder.setConnectionTimeoutMilli(connectionTimeoutMilli); }
         if (readTimeoutMilli != null) { builder.setReadTimeoutMilli(readTimeoutMilli); }

diff --git a/src/test/resources/logback-appenders-fluentd.xml b/src/test/resources/logback-appenders-fluentd.xml
@@ -96,6 +96,7 @@
     <bufferChunkInitialSize>2097152</bufferChunkInitialSize>
     <bufferChunkRetentionSize>16777216</bufferChunkRetentionSize>
     <maxBufferSize>268435456</maxBufferSize>
+    <bufferChunkRetentionTimeMillis>1000</bufferChunkRetentionTimeMillis>
     <connectionTimeoutMilli>5000</connectionTimeoutMilli>
     <readTimeoutMilli>5000</readTimeoutMilli>
     <waitUntilBufferFlushed>30</waitUntilBufferFlushed>