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=5c6df4dff4e9c8e213c9fb3c2fa5a83d7827848d;hb=8ab5c06b92ac9a06ba2743470a38e4e1cfc6a3c9;hp=753a5df34fc9f5642027e16527281ec051aabe4e;hpb=1d193914f13dd604d60df9db680001c9a4af5f9d;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..5c6df4df 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>> enabledContexts = agent.getEnabledAppContexts(); + byte[] 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,8 @@ public class LttngLogAppender extends AppenderSkeleton implements ILttngHandler line, event.getTimeStamp(), event.getLevel().toInt(), - event.getThreadName()); + event.getThreadName(), + contextInfo); } }