Add toggle flag for rendering message object using reflection

Author: nukemberg

src/main/java/net/logstash/log4j/JSONEventLayoutV0.java

@@ -8,7 +8,6 @@
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
-import sun.util.logging.resources.logging;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -20,6 +19,7 @@
 
 public class JSONEventLayoutV0 extends Layout {
 
+    private boolean renderObjectFields = false;
     private boolean locationInfo = false;
 
     private String tags;
@@ -49,16 +49,19 @@ public static String dateFormat(long timestamp) {
      * in the log messages.
      */
     public JSONEventLayoutV0() {
-        this(true);
+        this(true, false);
     }
 
     /**
      * Creates a layout that optionally inserts location information into log messages.
      *
      * @param locationInfo whether or not to include location information in the log messages.
+     * @param renderObjectFields whether or not to render the fields of the message object into the json when an object is logged to log4j.
+     *                     Rendering the fields is done using reflection and incurs a performance cost
      */
-    public JSONEventLayoutV0(boolean locationInfo) {
+    public JSONEventLayoutV0(boolean locationInfo, boolean renderObjectFields) {
         this.locationInfo = locationInfo;
+        this.renderObjectFields = renderObjectFields;
     }
 
     public String format(LoggingEvent loggingEvent) {
@@ -73,12 +76,15 @@ public String format(LoggingEvent loggingEvent) {
 
         logstashEvent.put("@source_host", hostname);
         logstashEvent.put("@message", loggingEvent.getRenderedMessage());
-        Object messageObj = loggingEvent.getMessage();
-        if (messageObj instanceof Serializable && !(messageObj instanceof String)) {
-            addObjectFieldData(messageObj);
-        }
         logstashEvent.put("@timestamp", dateFormat(timestamp));
 
+        if (renderObjectFields) {
+            Object messageObj = loggingEvent.getMessage();
+            if (messageObj instanceof Serializable && !(messageObj instanceof String)) {
+                addObjectFieldData(messageObj);
+            }
+        }
+
         if (loggingEvent.getThrowableInformation() != null) {
             final ThrowableInformation throwableInformation = loggingEvent.getThrowableInformation();
             if (throwableInformation.getThrowable().getClass().getCanonicalName() != null) {
@@ -160,6 +166,15 @@ public void setLocationInfo(boolean locationInfo) {
         this.locationInfo = locationInfo;
     }
 
+    /**
+     * Set whether or not to render the fields of the message object into the json when an object is logged to log4j.
+     * Rendering the fields is done using reflection and incurs a performance cost
+     * @param renderObjectFields
+     */
+    public void setRenderObjectFields(boolean renderObjectFields) {
+        this.renderObjectFields = renderObjectFields;
+    }
+    
     public void activateOptions() {
         activeIgnoreThrowable = ignoreThrowable;
     }

src/main/java/net/logstash/log4j/JSONEventLayoutV1.java

@@ -20,6 +20,7 @@
 
 public class JSONEventLayoutV1 extends Layout {
 
+    private boolean renderObjectFields = false;
     private boolean locationInfo = false;
     private String customUserFields;
 
@@ -51,15 +52,19 @@ public static String dateFormat(long timestamp) {
      * in the log messages.
      */
     public JSONEventLayoutV1() {
-        this(true);
+        this(true, false);
     }
 
     /**
      * Creates a layout that optionally inserts location information into log messages.
      *
      * @param locationInfo whether or not to include location information in the log messages.
+     * @param renderObjectFields whether or not to render the fields of the message object into the json when an object is logged to log4j.
+     *                     Rendering the fields is done using reflection and incurs a performance cost
+
      */
-    public JSONEventLayoutV1(boolean locationInfo) {
+    public JSONEventLayoutV1(boolean locationInfo, boolean renderObjectFields) {
+        this.renderObjectFields = renderObjectFields;
         this.locationInfo = locationInfo;
     }
 
@@ -107,11 +112,15 @@ public String format(LoggingEvent loggingEvent) {
          * Now we start injecting our own stuff.
          */
         logstashEvent.put("source_host", hostname);
-        Object messageObject = loggingEvent.getMessage();
-        if (messageObject instanceof Serializable && ! (messageObject instanceof String)) {
-            addObjectFieldData(messageObject);
-        }
         logstashEvent.put("message", loggingEvent.getRenderedMessage());
+
+        if (renderObjectFields) {
+            Object messageObject = loggingEvent.getMessage();
+            if (messageObject instanceof Serializable && ! (messageObject instanceof String)) {
+                addObjectFieldData(messageObject);
+            }
+        }
+
         if (loggingEvent.getThrowableInformation() != null) {
             final ThrowableInformation throwableInformation = loggingEvent.getThrowableInformation();
             if (throwableInformation.getThrowable().getClass().getCanonicalName() != null) {
@@ -166,6 +175,15 @@ public void setLocationInfo(boolean locationInfo) {
         this.locationInfo = locationInfo;
     }
 
+    /**
+     * Set whether or not to render the fields of the message object into the json when an object is logged to log4j.
+     * Rendering the fields is done using reflection and incurs a performance cost
+      * @param renderObjectFields
+     */
+    public void setRenderObjectFields(boolean renderObjectFields) {
+        this.renderObjectFields = renderObjectFields;
+    }
+
     public String getUserFields() { return customUserFields; }
     public void setUserFields(String userFields) { this.customUserFields = userFields; }