Rename Java Agent event names to "event"

Previously, separate event names were used for events targeting
a root session daemon or a user one. Those were "sys_event" and
"user_event", respectively.

Now that the Java side only sends one event type, we can rename
it to simply "event".

This patch is dependant on a similar update on the lttng-tools
side.

Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
index 7363f65c0b5adf640674ea5684ec3d8982cae0f1..0e86fbc7c1d0637597df3f84e927f61027da5379 100644 (file)
--- a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
+++ b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
@@ -41,8 +41,7 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LttngLogHandler_tracepoint(J
        const char *class_name_cstr = (*env)->GetStringUTFChars(env, class_name, &iscopy);
        const char *method_name_cstr = (*env)->GetStringUTFChars(env, method_name, &iscopy);
 
-       // FIXME Change "sys_event" to "event" once lttng-tools is updated
-       tracepoint(lttng_jul, sys_event, msg_cstr, logger_name_cstr,
+       tracepoint(lttng_jul, event, msg_cstr, logger_name_cstr,
                        class_name_cstr, method_name_cstr, millis, log_level, thread_id);
 
        (*env)->ReleaseStringUTFChars(env, msg, msg_cstr);

diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h
index 1482d90f571552b9c80dd08669ec7a2ffce34e3f..ebbe2c3257c764c385d82dd11c2b10584a768c7f 100644 (file)
--- a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h
+++ b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h
@@ -27,8 +27,7 @@
 /*
  * Tracepoint used by Java applications using the JUL handler.
  */
-// FIXME Change "sys_event" to "event" once lttng-tools is updated
-TRACEPOINT_EVENT(lttng_jul, sys_event,
+TRACEPOINT_EVENT(lttng_jul, event,
        TP_ARGS(
                const char *, msg,
                const char *, logger_name,

diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
index d5df70e2a18f5493fbcd2ec5167856e7415eecc2..73d4eee7a9383453fd9d966d7d7907aeb6d89b80 100644 (file)
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
@@ -45,8 +45,7 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LttngLogAppender_tracepoin
        const char *file_name_cstr = (*env)->GetStringUTFChars(env, file_name, &iscopy);
        const char *thread_name_cstr = (*env)->GetStringUTFChars(env, thread_name, &iscopy);
 
-       // FIXME Change "sys_event" to "event" once lttng-tools is updated
-       tracepoint(lttng_log4j, sys_event, msg_cstr, logger_name_cstr,
+       tracepoint(lttng_log4j, event, msg_cstr, logger_name_cstr,
                   class_name_cstr, method_name_cstr, file_name_cstr,
                   line_number, timestamp, loglevel, thread_name_cstr);
 

diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
index 7e20b6985f061d4ed6039ebc27c267d3566853c5..d9b592d083243f4247a0316c0cf08c0753043159 100644 (file)
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
@@ -27,8 +27,7 @@
 /*
  * Tracepoint used by Java applications using the log4j log appender.
  */
-// FIXME Change "sys_event" to "event" once lttng-tools is updated
-TRACEPOINT_EVENT(lttng_log4j, sys_event,
+TRACEPOINT_EVENT(lttng_log4j, event,
        TP_ARGS(
                const char *, msg,
                const char *, logger_name,