Added event mutator.

Author: cipriancraciun

logback-amqp-appender/src/main/java/ch/qos/logback/amqp/AmqpAppender.java

@@ -2,18 +2,18 @@
 package ch.qos.logback.amqp;
 
 
-import java.io.Serializable;
 import java.util.concurrent.LinkedBlockingDeque;
 
 import ch.qos.logback.amqp.tools.DefaultBinarySerializer;
 import ch.qos.logback.amqp.tools.DefaultContextAwareCallbacks;
+import ch.qos.logback.amqp.tools.DefaultMutator;
+import ch.qos.logback.amqp.tools.Mutator;
+import ch.qos.logback.amqp.tools.PubLoggingEventVO;
 import ch.qos.logback.amqp.tools.Serializer;
 import ch.qos.logback.classic.PatternLayout;
-import ch.qos.logback.classic.net.LoggingEventPreSerializationTransformer;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
-import ch.qos.logback.core.spi.PreSerializationTransformer;
 
 
 public final class AmqpAppender
@@ -22,16 +22,21 @@ public final class AmqpAppender
 	public AmqpAppender ()
 	{
 		super ();
-		this.preserializer = new LoggingEventPreSerializationTransformer ();
 		this.serializer = new DefaultBinarySerializer ();
 		this.buffer = new LinkedBlockingDeque<AmqpMessage> ();
 		this.exchangeLayout = new PatternLayout ();
 		this.routingKeyLayout = new PatternLayout ();
 		this.exchangeLayout.setPattern (AmqpAppender.defaultExchangeKeyPattern);
 		this.routingKeyLayout.setPattern (AmqpAppender.defaultRoutingKeyPattern);
+		this.mutator = new DefaultMutator ();
 		this.publisher = null;
 	}
 
+	public final Mutator getMutator ()
+	{
+		return (this.mutator);
+	}
+	
 	public final boolean isDrained ()
 	{
 		return (this.buffer.isEmpty ());
@@ -66,6 +71,13 @@ public final void setHost (final String host)
 		this.host = host;
 	}
 
+	public final void setMutator (final Mutator mutator)
+	{
+		if (this.isStarted ())
+			throw (new IllegalStateException ("amqp appender is already started"));
+		this.mutator = mutator;
+	}
+	
 	public final void setPassword (final String password)
 	{
 		if (this.isStarted ())
@@ -127,19 +139,19 @@ public final void stop ()
 		super.stop ();
 	}
 
-	protected final void append (final ILoggingEvent event)
+	protected final void append (final ILoggingEvent originalEvent)
 	{
+		final PubLoggingEventVO event = this.prepare (originalEvent);
 		byte[] data;
 		try {
-			final Serializable object = this.preserializer.transform (event);
-			data = this.serializer.serialize (object);
+			data = this.serializer.serialize (event);
 		} catch (final Throwable exception) {
 			data = null;
 			this.addError ("amqp appender encountered an error while serializing the event; ignoring!", exception);
 		}
 		if (data != null) {
-			final String exchange = this.exchangeLayout.doLayout (event);
-			final String routingKey = this.routingKeyLayout.doLayout (event);
+			final String exchange = this.exchangeLayout.doLayout (originalEvent);
+			final String routingKey = this.routingKeyLayout.doLayout (originalEvent);
 			final AmqpMessage message =
 					new AmqpMessage (
 							exchange, routingKey, this.serializer.getContentType (), this.serializer.getContentEncoding (),
@@ -148,12 +160,20 @@ protected final void append (final ILoggingEvent event)
 		}
 	}
 
+	private final PubLoggingEventVO prepare (final ILoggingEvent originalEvent)
+	{
+		final PubLoggingEventVO newEvent = PubLoggingEventVO.build (originalEvent);
+		if (this.mutator != null)
+			this.mutator.mutate (newEvent);
+		return (newEvent);
+	}
+	
 	private final LinkedBlockingDeque<AmqpMessage> buffer;
 	private final PatternLayout exchangeLayout;
 	private String host;
+	private Mutator mutator;
 	private String password;
 	private Integer port;
-	private final PreSerializationTransformer<ILoggingEvent> preserializer;
 	private AmqpPublisher publisher;
 	private final PatternLayout routingKeyLayout;
 	private final Serializer serializer;

logback-amqp-appender/src/main/java/ch/qos/logback/amqp/tools/DefaultMutator.java

@@ -0,0 +1,87 @@
+
+package ch.qos.logback.amqp.tools;
+
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+
+
+public class DefaultMutator
+		implements
+			Mutator
+{
+	public DefaultMutator ()
+	{
+		this.sequence = 0;
+		this.application = System.getProperty ("application");
+		this.component = System.getProperty ("component");
+		try {
+			this.node = InetAddress.getLocalHost ().getHostName ();
+		} catch (final UnknownHostException exception) {
+			this.node = null;
+		}
+	}
+	
+	public String getApplication ()
+	{
+		return (this.application);
+	}
+	
+	public String getComponent ()
+	{
+		return (this.component);
+	}
+	
+	public String getNode ()
+	{
+		return (this.node);
+	}
+	
+	public long getSequence ()
+	{
+		return (this.sequence);
+	}
+	
+	public void mutate (final PubLoggingEventVO event)
+	{
+		long sequence;
+		synchronized (this) {
+			sequence = this.sequence;
+			this.sequence++;
+		}
+		if (event.mdcPropertyMap == null)
+			event.mdcPropertyMap = new HashMap<String, String> (3);
+		else
+			event.mdcPropertyMap = new HashMap<String, String> (event.mdcPropertyMap);
+		event.mdcPropertyMap.put (DefaultMutator.sequenceKey, Long.toString (sequence));
+		event.mdcPropertyMap.put (DefaultMutator.applicationKey, this.application != null ? this.application : "unknown");
+		event.mdcPropertyMap.put (DefaultMutator.componentKey, this.component != null ? this.component : "unknown");
+		event.mdcPropertyMap.put (DefaultMutator.nodeKey, this.node != null ? this.node : "unknown");
+	}
+	
+	public void setApplication (final String application)
+	{
+		this.application = application;
+	}
+	
+	public void setComponent (final String component)
+	{
+		this.component = component;
+	}
+	
+	public void setNode (final String node)
+	{
+		this.node = node;
+	}
+	
+	protected String application;
+	protected String component;
+	protected String node;
+	private long sequence;
+	
+	public static final String applicationKey = "application";
+	public static final String componentKey = "component";
+	public static final String nodeKey = "node";
+	public static final String sequenceKey = "sequence";
+}

logback-amqp-appender/src/main/java/ch/qos/logback/amqp/tools/Mutator.java

@@ -0,0 +1,8 @@
+
+package ch.qos.logback.amqp.tools;
+
+
+public interface Mutator
+{
+	public abstract void mutate (final PubLoggingEventVO event);
+}