Move to kernel style SPDX license identifiers

[lttng-ust.git] / liblttng-ust-java-agent / java / lttng-ust-agent-log4j / org / lttng / ust / agent / log4j / LttngLogAppender.java

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 98cc2c8dc583065d1c2b9829e6dd06fc346ac6a7..c232fb8b3c65de5657bb09da6d8fe8273e4f371c 100644 (file)
--- 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
@@ -1,30 +1,24 @@
 /*
- * Copyright (C) 2015 - EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
- * Copyright (C) 2014 - Christian Babeux <christian.babeux@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2015 EfficiOS Inc.
+ * Copyright (C) 2015 Alexandre Montplaisir <alexmonthy@efficios.com>
+ * Copyright (C) 2014 Christian Babeux <christian.babeux@efficios.com>
  */
 
 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,8 +110,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();
-               tracepoint(event.getRenderedMessage(),
+
+               LttngLog4jApi.tracepointWithContext(event.getRenderedMessage(),
                                event.getLoggerName(),
                                event.getLocationInformation().getClassName(),
                                event.getLocationInformation().getMethodName(),
@@ -125,18 +124,9 @@ public class LttngLogAppender extends AppenderSkeleton implements ILttngHandler
                                line,
                                event.getTimeStamp(),
                                event.getLevel().toInt(),
-                               event.getThreadName());
+                               event.getThreadName(),
+                               contextInfo.getEntriesArray(),
+                               contextInfo.getStringsArray());
        }
 
-
-       /* Use for a user session daemon. */
-       private native void tracepoint(String msg,
-                       String logger_name,
-                       String class_name,
-                       String method_name,
-                       String file_name,
-                       int line_number,
-                       long timestamp,
-                       int loglevel,
-                       String thread_name);
 }