Fix: Ensure the Java JUL messages are correctly formatted

[deliverable/lttng-ust.git] / liblttng-ust-java-agent / java / lttng-ust-agent-jul / org / lttng / ust / agent / jul / LttngLogHandler.java

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java
index d8e0cb826eb40f3e37fd75d2b1ec68907b16ba66..39e08a831d51614ec3e5bcd4bc8e9d338ab7456e 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java
@@ -20,6 +20,7 @@ package org.lttng.ust.agent.jul;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 
@@ -43,6 +44,17 @@ public class LttngLogHandler extends Handler implements ILttngHandler {
 
        private static final String SHARED_OBJECT_NAME = "lttng-ust-jul-jni";
 
+       /**
+        * Dummy Formatter object, so we can use its
+        * {@link Formatter#formatMessage(LogRecord)} method.
+        */
+       private static final Formatter FORMATTER = new Formatter() {
+               @Override
+               public String format(LogRecord record) {
+                       throw new UnsupportedOperationException();
+               }
+       };
+
        private final ILttngAgent<LttngLogHandler> agent;
 
        /** Number of events logged (really sent through JNI) by this handler */
@@ -103,13 +115,15 @@ public class LttngLogHandler extends Handler implements ILttngHandler {
                        return;
                }
 
+               String formattedMessage = FORMATTER.formatMessage(record);
+
                eventCount.incrementAndGet();
                /*
                 * Specific tracepoint designed for JUL events. The source class of the
                 * caller is used for the event name, the raw message is taken, the
                 * loglevel of the record and the thread ID.
                 */
-               tracepoint(record.getMessage(),
+               tracepoint(formattedMessage,
                                record.getLoggerName(),
                                record.getSourceClassName(),
                                record.getSourceMethodName(),