Merge pull request #5 from newrelic/btach-flush-enhancements

feat: Batch flush enhancements

Author: gsidhwani-nr

README.md

@@ -28,7 +28,7 @@ Add the library to your project using Maven Central:
 <dependency>
     <groupId>com.newrelic.labs</groupId>
     <artifactId>custom-log4j2-appender</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 
@@ -38,7 +38,7 @@ Or, if using a locally built JAR file:
 <dependency>
     <groupId>com.newrelic.labs</groupId>
     <artifactId>custom-log4j2-appender</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <scope>system</scope>
     <systemPath>${project.basedir}/src/main/resources/custom-log4j2-appender.jar</systemPath>
 </dependency>

custom-log4j2-appender/build-jar.gradle

@@ -20,7 +20,7 @@ jar {
             'Implementation-Title': 'Custom Log4j2 Appender',
             'Implementation-Vendor': 'New Relic Labs',
             'Implementation-Vendor-Id': 'com.newrelic.labs',
-            'Implementation-Version': '1.0.1'
+            'Implementation-Version': '1.0.2'
         )
     }
 }
@@ -53,7 +53,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.1'
+            version = '1.0.2'
 
             pom {
                 name = 'Custom Log4j2 Appender'

custom-log4j2-appender/build-shadowJar.gradle

@@ -27,7 +27,7 @@ shadowJar {
             'Implementation-Title': 'Custom Log4j2 Appender',
             'Implementation-Vendor': 'New Relic Labs',
             'Implementation-Vendor-Id': 'com.newrelic.labs',
-            'Implementation-Version': '1.0.1'
+            'Implementation-Version': '1.0.2'
         )
     }
 }
@@ -55,7 +55,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.1'
+            version = '1.0.2'
 
             pom {
                 name = 'Custom Log4j2 Appender'

custom-log4j2-appender/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'java'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
     id 'maven-publish'
 }
 
@@ -15,18 +16,22 @@ dependencies {
 }
 
 jar {
+    enabled = false // Disable the standard JAR task
+}
+
+shadowJar {
+    archiveClassifier.set('') // Remove the 'all' classifier
+    mergeServiceFiles()
     manifest {
         attributes(
             'Implementation-Title': 'Custom Log4j2 Appender',
             'Implementation-Vendor': 'New Relic Labs',
             'Implementation-Vendor-Id': 'com.newrelic.labs',
-            'Implementation-Version': '1.0.1'
+            'Implementation-Version': '1.0.2'
         )
     }
 }
 
-
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -41,19 +46,16 @@ task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
 }
 
-
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            from components.java // Include standard JAR
-
+            artifact shadowJar // Only include Shadow JAR
             artifact javadocJar
             artifact sourcesJar
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.1'
+            version = '1.0.2'
 
             pom {
                 name = 'Custom Log4j2 Appender'

custom-log4j2-appender/publish-jar-legacy.sh

@@ -7,7 +7,7 @@ cp build-jar.gradle build.gradle
 # Set variables
 GROUP_ID="com.newrelic.labs"
 ARTIFACT_ID="custom-log4j2-appender"
-VERSION="1.0.1"
+VERSION="1.0.2"
 KEY_ID="0ED9FD74E81E6D83FAE25F235640EA0B1C631C6F" # Replace with your actual key ID
 
 # Get the current directory (assuming the script is run from the custom-log4j2-appender directory)

custom-log4j2-appender/publish-jar.sh

@@ -7,7 +7,7 @@ cp build-jar.gradle build.gradle
 # Set variables
 GROUP_ID="io.github.newrelic-experimental"
 ARTIFACT_ID="custom-log4j2-appender"
-VERSION="1.0.1"
+VERSION="1.0.2"
 KEY_ID="0ED9FD74E81E6D83FAE25F235640EA0B1C631C6F" # Replace with your actual key ID
 
 # Get the current directory (assuming the script is run from the custom-log4j2-appender directory)

custom-log4j2-appender/publish-shadowJar.sh

@@ -6,7 +6,7 @@ cp build-shadowJar.gradle build.gradle
 # Set variables
 GROUP_ID="io.github.newrelic-experimental"
 ARTIFACT_ID="custom-log4j2-appender"
-VERSION="1.0.1"
+VERSION="1.0.2"
 KEY_ID="0ED9FD74E81E6D83FAE25F235640EA0B1C631C6F" # Replace with your actual key ID
 
 # Get the current directory (assuming the script is run from the custom-log4j2-appender directory)

custom-log4j2-appender/src/main/java/com/newrelic/labs/NewRelicBatchingAppender.java

@@ -132,10 +132,23 @@ public void append(LogEvent event) {
 			}
 			// Directly add to the queue
 			queue.add(new LogEntry(message, applicationName, muleAppName, logType, timestamp, custom));
+			// Check if the batch size is reached and flush immediately
+	        if (queue.size() >= batchSize) {
+	            flushQueue();
+	        }
 		} catch (Exception e) {
 			logger.error("Unable to insert log entry into log queue. ", e);
 		}
 	}
+	private void flushQueue() {
+	    List<LogEntry> batch = new ArrayList<>();
+	    queue.drainTo(batch, batchSize);
+	    if (!batch.isEmpty()) {
+	        logger.debug("Flushing {} log entries to New Relic", batch.size());
+	        logForwarder.flush(batch);
+	    }
+	}
+	
 
 	private Map<String, Object> extractcustom(LogEvent event) {
 		Map<String, Object> custom = new HashMap<>();