Merge pull request #16 from newrelic/v1.1.10-unwrapJson

fix: preserve custom attributes name's case

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.1.10</version>
+    <version>1.1.12</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.1.10</version>
+    <version>1.1.12</version>
     <scope>system</scope>
     <systemPath>${project.basedir}/src/main/resources/custom-log4j2-appender.jar</systemPath>
 </dependency>

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

custom-log4j2-appender/pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.newrelic.labs</groupId>
     <artifactId>custom-log4j2-appender</artifactId>
-    <version>1.1.10</version>
+    <version>1.1.12</version>
     <packaging>jar</packaging>
     <name>Custom Log4j2 Appender</name>
     <description>A custom Log4j2 appender for New Relic.</description>

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

@@ -5,6 +5,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -183,13 +184,15 @@ private Map<String, Object> convertToLogEvent(LogEntry entry, boolean mergeCusto
 		logEvent.put("applicationName", entry.getApplicationName());
 		logEvent.put("name", entry.getName());
 		logEvent.put("source", "NRBatchingAppender");
-		logEvent.put("version", "1.1.10");
+		logEvent.put("version", "1.1.12");
 
 		// Add custom fields
 		if (customFields != null) {
 			if (mergeCustomFields) {
-				for (Map.Entry<String, Object> field : customFields.entrySet()) { // Modify 1.1.0
-					logEvent.put(field.getKey(), field.getValue());
+				// Use putPreserveCase() to preserve custom field name casing
+				LowercaseKeyMap lowercaseMap = (LowercaseKeyMap) logEvent;
+				for (Map.Entry<String, Object> field : customFields.entrySet()) {
+					lowercaseMap.putPreserveCase(field.getKey(), field.getValue());
 				}
 			} else {
 				logEvent.put("custom", customFields);

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

@@ -17,4 +17,12 @@ public void putAll(Map<? extends String, ? extends Object> m) {
 	    this.put(entry.getKey().toLowerCase(), entry.getValue());
 	}
     }
+
+    /**
+     * Put a key-value pair without converting the key to lowercase.
+     * Use this for fields that should preserve their original case (e.g., custom fields).
+     */
+    public Object putPreserveCase(String key, Object value) {
+	return super.put(key, value);
+    }
 }

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

@@ -159,7 +159,7 @@ private Map<String, Object> parsecustomFields(String customFields) {
 			for (String pair : pairs) {
 				String[] keyValue = pair.split("=");
 				if (keyValue.length == 2) {
-					custom.put(keyValue[0], keyValue[1]);
+					custom.put(keyValue[0].trim(), keyValue[1].trim());
 				}
 			}
 		}