Merge pull request #7 from newrelic/configurable-custom-fields

fix: requeue logentries failed due to case sensitive applicationName comparsion

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.3</version>
+    <version>1.0.4</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.3</version>
+    <version>1.0.4</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.3'
+            'Implementation-Version': '1.0.4'
         )
     }
 }
@@ -53,7 +53,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.3'
+            version = '1.0.4'
 
             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.3'
+            'Implementation-Version': '1.0.4'
         )
     }
 }
@@ -55,7 +55,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.3'
+            version = '1.0.4'
 
             pom {
                 name = 'Custom Log4j2 Appender'

custom-log4j2-appender/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
     id 'maven-publish'
 }
 
@@ -16,22 +15,18 @@ 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.3'
+            'Implementation-Version': '1.0.4'
         )
     }
 }
 
+
+
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -46,16 +41,19 @@ task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
 }
 
+
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact shadowJar // Only include Shadow JAR
+            from components.java // Include standard JAR
+
             artifact javadocJar
             artifact sourcesJar
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.3'
+            version = '1.0.4'
 
             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.3"
+VERSION="1.0.4"
 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.3"
+VERSION="1.0.4"
 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.3"
+VERSION="1.0.4"
 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/LogEntry.java

@@ -2,14 +2,18 @@
 
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class LogEntry {
 	private final String message;
 	private final String applicationName;
 	private final String name;
 	private final String logtype;
 	private final long timestamp;
 
-
 	public LogEntry(String message, String applicationName, String name, String logtype, long timestamp,
 			Map<String, Object> custom, boolean mergeCustomFields) {
 		this.message = message;
@@ -20,6 +24,26 @@ public LogEntry(String message, String applicationName, String name, String logt
 
 	}
 
+	// Default constructor for Jackson
+	public LogEntry() {
+		this.message = null;
+		this.applicationName = null;
+		this.name = null;
+		this.logtype = null;
+		this.timestamp = 0L;
+	}
+
+	@JsonCreator
+	public LogEntry(@JsonProperty("message") String message, @JsonProperty("applicationname") String applicationName,
+			@JsonProperty("name") String name, @JsonProperty("logtype") String logtype,
+			@JsonProperty("timestamp") long timestamp) {
+		this.message = message;
+		this.applicationName = applicationName;
+		this.name = name;
+		this.logtype = logtype;
+		this.timestamp = timestamp;
+	}
+
 	public String getMessage() {
 		return message;
 	}

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

@@ -198,15 +198,35 @@ private void sendLogs(List<Map<String, Object>> logEvents) throws IOException {
 	}
 
 	private void requeueLogs(List<Map<String, Object>> logEvents) {
+
 		for (Map<String, Object> logEvent : logEvents) {
 			try {
+				// Log the contents of logEvent
+				// System.out.println("logEvent: " + logEvent);
+
+				// Convert logEvent to LogEntry
 				LogEntry logEntry = objectMapper.convertValue(logEvent, LogEntry.class);
-				logQueue.put(logEntry); // Requeue the log entry
+
+				// Log the contents of the converted LogEntry
+				// System.out.println("Converted LogEntry: ");
+				// System.out.println(" message: " + logEntry.getMessage());
+				// System.out.println(" applicationName: " + logEntry.getApplicationName());
+				// System.out.println(" name: " + logEntry.getName());
+				// System.out.println(" logtype: " + logEntry.getLogType());
+				// System.out.println(" timestamp: " + logEntry.getTimestamp());
+
+				// Requeue the log entry
+				logQueue.put(logEntry);
 			} catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 				System.err.println("Failed to requeue log entry: " + logEvent);
+			} catch (IllegalArgumentException e) {
+				System.err.println("Failed to convert log event to LogEntry: " + logEvent);
 			}
 		}
+
+		System.err.println("Network issue - NewRelicBatchingAppenderhas re-queued " + logEvents.size() + " entries"
+				+ " : queue size " + logQueue.size());
 	}
 
 	private byte[] gzipCompress(String input) throws IOException {