X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2Forg%2Flttng%2Fust%2Fagent%2Flog4j%2FLttngLogAppender.java;h=92b76de2594446e4afc67a559c30f931b487cb8e;hb=b1ca4c5fae8a541330c940c45dd5f3bd93dbf46a;hp=753a5df34fc9f5642027e16527281ec051aabe4e;hpb=6e7bc9e0a5346b2dde6d9d5d72e0d2bf3a073f54;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java
index 753a5df3..92b76de2 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java
@@ -19,12 +19,16 @@
 package org.lttng.ust.agent.log4j;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.spi.LoggingEvent;
 import org.lttng.ust.agent.ILttngAgent;
 import org.lttng.ust.agent.ILttngHandler;
+import org.lttng.ust.agent.context.ContextInfoSerializer;
 
 /**
  * LTTng-UST Log4j 1.x log handler.
@@ -116,9 +120,13 @@ public class LttngLogAppender extends AppenderSkeleton implements ILttngHandler
 			line = -1;
 		}
 
+		/* Retrieve all the requested context information we can find */
+		Collection<Entry<String, Map<String, Integer>>> enabledContexts = agent.getEnabledAppContexts();
+		ContextInfoSerializer.SerializedContexts contextInfo = ContextInfoSerializer.queryAndSerializeRequestedContexts(enabledContexts);
+
 		eventCount.incrementAndGet();
 
-		LttngLog4jApi.tracepoint(event.getRenderedMessage(),
+		LttngLog4jApi.tracepointWithContext(event.getRenderedMessage(),
 				event.getLoggerName(),
 				event.getLocationInformation().getClassName(),
 				event.getLocationInformation().getMethodName(),
@@ -126,7 +134,9 @@ public class LttngLogAppender extends AppenderSkeleton implements ILttngHandler
 				line,
 				event.getTimeStamp(),
 				event.getLevel().toInt(),
-				event.getThreadName());
+				event.getThreadName(),
+				contextInfo.getEntriesArray(),
+				contextInfo.getStringsArray());
 	}
 
 }