Merge pull request #12 from newrelic/custom-connection-logContext

feat: Added logging context

Author: gsidhwani-nr

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.6'
+            'Implementation-Version': '1.1.2'
         )
     }
 }
@@ -53,7 +53,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.6'
+            version = '1.1.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.6'
+            'Implementation-Version': '1.1.2'
         )
     }
 }
@@ -55,7 +55,7 @@ publishing {
 
             groupId = 'com.newrelic.labs'
             artifactId = 'custom-log4j2-appender'
-            version = '1.0.6'
+            version = '1.1.2'
 
             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.6'
+            'Implementation-Version': '1.1.2'
         )
     }
 }
 
+
+
 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.6'
+            version = '1.1.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.6"
+VERSION="1.1.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.6"
+VERSION="1.1.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.6"
+VERSION="1.1.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/FlushCallback.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 
 public interface FlushCallback {
-	void onSuccess();
+    void onSuccess();
 
-	void onFailure(List<Map<String, Object>> failedLogEvents);
+    void onFailure(List<Map<String, Object>> failedLogEvents);
 }

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

@@ -13,15 +13,16 @@ public class LogEntry {
 	private final String name;
 	private final String logtype;
 	private final long timestamp;
+	private final Map<String, Object> properties; // Add custom fields
 
 	public LogEntry(String message, String applicationName, String name, String logtype, long timestamp,
-			Map<String, Object> custom, boolean mergeCustomFields) {
+			Map<String, Object> properties, boolean mergeCustomFields) {
 		this.message = message;
 		this.applicationName = applicationName;
 		this.name = name;
 		this.logtype = logtype;
 		this.timestamp = timestamp;
-
+		this.properties = properties; // Initialize custom fields
 	}
 
 	// Default constructor for Jackson
@@ -31,17 +32,20 @@ public LogEntry() {
 		this.name = null;
 		this.logtype = null;
 		this.timestamp = 0L;
+		this.properties = null; // Initialize custom fields
 	}
 
 	@JsonCreator
 	public LogEntry(@JsonProperty("message") String message, @JsonProperty("applicationname") String applicationName,
 			@JsonProperty("name") String name, @JsonProperty("logtype") String logtype,
-			@JsonProperty("timestamp") long timestamp) {
+			@JsonProperty("timestamp") long timestamp, @JsonProperty("custom") Map<String, Object> properties) { // Add
+
 		this.message = message;
 		this.applicationName = applicationName;
 		this.name = name;
 		this.logtype = logtype;
 		this.timestamp = timestamp;
+		this.properties = properties; // Initialize custom fields
 	}
 
 	public String getMessage() {
@@ -63,4 +67,8 @@ public String getLogType() {
 	public long getTimestamp() {
 		return timestamp;
 	}
-}
+
+	public Map<String, Object> getProperties() { // Add getter for custom
+		return properties;
+	}
+}