Fix: Ensure the Java JUL messages are correctly formatted

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

diff --git a/liblttng-ust-java-agent/java/org/lttng/ust/agent/jul/LTTngLogHandler.java b/liblttng-ust-java-agent/java/org/lttng/ust/agent/jul/LTTngLogHandler.java
index a20aed21707b48d67fbf2431e1e1d58527339989..15c7a8ea2829140b53d0ea36a8188ec6820c8aeb 100644 (file)
--- a/liblttng-ust-java-agent/java/org/lttng/ust/agent/jul/LTTngLogHandler.java
+++ b/liblttng-ust-java-agent/java/org/lttng/ust/agent/jul/LTTngLogHandler.java
@@ -19,15 +19,28 @@ package org.lttng.ust.agent.jul;
 
 import java.lang.String;
 
+import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 
 class LTTngLogHandler extends Handler {
-       private Boolean is_root;
+
+       /**
+        * 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 Boolean isRoot;
 
        public LTTngLogHandler(Boolean isRoot) {
                super();
-               this.is_root = isRoot;
+               this.isRoot = isRoot;
                /* Initialize LTTng UST tracer. */
                try {
                        System.loadLibrary("lttng-ust-jul-jni"); //$NON-NLS-1$
@@ -42,7 +55,7 @@ class LTTngLogHandler extends Handler {
        }
 
        public Boolean isRoot() {
-               return this.is_root;
+               return this.isRoot;
        }
 
        @Override
@@ -53,18 +66,20 @@ class LTTngLogHandler extends Handler {
 
        @Override
        public void publish(LogRecord record) {
+               String formattedMessage = FORMATTER.formatMessage(record);
+
                /*
-                * Specific tracepoing designed for JUL events. The source class of the
+                * 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.
                 */
-               if (this.is_root) {
-                       tracepointS(record.getMessage(),
+               if (this.isRoot) {
+                       tracepointS(formattedMessage,
                                    record.getLoggerName(), record.getSourceClassName(),
                                    record.getSourceMethodName(), record.getMillis(),
                                    record.getLevel().intValue(), record.getThreadID());
                } else {
-                       tracepointU(record.getMessage(),
+                       tracepointU(formattedMessage,
                                    record.getLoggerName(), record.getSourceClassName(),
                                    record.getSourceMethodName(), record.getMillis(),
                                    record.getLevel().intValue(), record.getThreadID());
@@ -72,10 +87,20 @@ class LTTngLogHandler extends Handler {
        }
 
        /* Use for a user session daemon. */
-       private native void tracepointU(String msg, String logger_name, String class_name,
-                       String method_name, long millis, int log_level, int thread_id);
+       private native void tracepointU(String msg,
+                       String logger_name,
+                       String class_name,
+                       String method_name,
+                       long millis,
+                       int log_level,
+                       int thread_id);
 
        /* Use for a root session daemon. */
-       private native void tracepointS(String msg, String logger_name, String class_name,
-                       String method_name, long millis, int log_level, int thread_id);
+       private native void tracepointS(String msg,
+                       String logger_name,
+                       String class_name,
+                       String method_name,
+                       long millis,
+                       int log_level,
+                       int thread_id);
 }