Add support for message objects, render object to json message

Author: nukemberg

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

@@ -8,7 +8,12 @@
 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;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
@@ -68,6 +73,10 @@ 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 (loggingEvent.getThrowableInformation() != null) {
@@ -103,6 +112,32 @@ public String format(LoggingEvent loggingEvent) {
         return logstashEvent.toString() + "\n";
     }
 
+    private void addObjectFieldData(Object messageObj) {
+        Field[] fields = messageObj.getClass().getFields();
+        Object value = null;
+
+        for(Field f : fields) {
+            try {
+                value = f.get(messageObj);
+                if (value != null) fieldData.put(f.getName(), value);
+            } catch (IllegalAccessException e) {
+            }
+        }
+        Method[] methods = messageObj.getClass().getMethods();
+        for(Method m : methods)
+        {
+            if(m.getName().startsWith("get"))
+            {
+                try {
+                    value = m.invoke(messageObj);
+                } catch (IllegalAccessException e) {
+                } catch (InvocationTargetException e) {
+                }
+                if (value != null) fieldData.put(m.getName().substring(3), value);
+            }
+        }
+    }
+
     public boolean ignoresThrowable() {
         return ignoreThrowable;
     }

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

@@ -10,6 +10,10 @@
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
 
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
@@ -103,8 +107,11 @@ 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 (loggingEvent.getThrowableInformation() != null) {
             final ThrowableInformation throwableInformation = loggingEvent.getThrowableInformation();
             if (throwableInformation.getThrowable().getClass().getCanonicalName() != null) {
@@ -184,4 +191,30 @@ private void addEventData(String keyname, Object keyval) {
             logstashEvent.put(keyname, keyval);
         }
     }
+
+    private void addObjectFieldData(Object messageObj) {
+        Field[] fields = messageObj.getClass().getFields();
+        Object value = null;
+
+        for(Field f : fields) {
+            try {
+                value = f.get(messageObj);
+                if (value != null) addEventData(f.getName(), value);
+            } catch (IllegalAccessException e) {
+            }
+        }
+        Method[] methods = messageObj.getClass().getMethods();
+        for(Method m : methods)
+        {
+            if(m.getName().startsWith("get"))
+            {
+                try {
+                    value = m.invoke(messageObj);
+                } catch (IllegalAccessException e) {
+                } catch (InvocationTargetException e) {
+                }
+                if (value != null) addEventData(m.getName().substring(3), value);
+            }
+        }
+    }
 }