X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=bf3bb0bc27dfa4820877acbe031f9bc84bebc2b2;hp=a91904af4b28f1323a9f5a04aad4e2d97d2c4151;hb=1d842d5af5b13a90c9e587a1bb7ec0c27ae6dae2;hpb=3e1c9ff7804bbdb8fd223a9d2453bcc5ff291aa3

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index a91904af4..bf3bb0bc2 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -29,7 +29,7 @@ EVENT_NAME="JTestLTTng"
 EVENT_NAME2="JTestLTTng2"
 JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar"
 
-NUM_TESTS=92
+NUM_TESTS=139
 
 source $TESTDIR/utils/utils.sh
 
@@ -67,6 +67,16 @@ function enable_jul_loglevel_only()
 	ok $? "Enable JUL event $event_name for session $sess_name with loglevel-only $loglevel"
 }
 
+function enable_jul_filter()
+{
+	local sess_name="$1"
+	local event_name="$2"
+	local filter="$3"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -j --filter "$filter" >/dev/null 2>&1
+	ok $? "Enable event $event_name with filter $filter for session $sess_name"
+}
+
 # MUST set TESTDIR before calling those functions
 
 function test_jul_before_start ()
@@ -251,6 +261,42 @@ function test_jul_multi_session_loglevel()
 	fi
 }
 
+function test_jul_multi_session_disable()
+{
+	diag "Test JUL with multiple session with disabled event"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME2
+	disable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME-1
+
+	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
+	start_lttng_tracing $SESSION_NAME-2
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME-1
+	stop_lttng_tracing $SESSION_NAME-2
+	destroy_lttng_session $SESSION_NAME-1
+	destroy_lttng_session $SESSION_NAME-2
+
+	# Validate test. Expecting one event of the second TP.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting one event of the second TP.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 function test_jul_multi_session()
 {
 	diag "Test JUL with multiple session"
@@ -323,6 +369,98 @@ function test_jul_destroy_session()
 	fi
 }
 
+function test_jul_filtering()
+{
+	diag "Test JUL filtering"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_filter $SESSION_NAME '*' 'msg == "JUL second logger fired"'
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting one event of the second TP only.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable first Logger but filter msg payload for the INFO one while
+	# triggering the finest and second TP.
+	enable_jul_filter $SESSION_NAME $EVENT_NAME 'msg == "JUL tp fired!"'
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay, fire finest and second TP.
+	run_app 1 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting NR_ITER event of the main INFO tp.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_disable()
+{
+	diag "Test JUL disable event"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting one event of the second TP only.
+	trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_disable_enable()
+{
+	diag "Test JUL disable event followed by an enable"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME
+
+	# Run 5 times with a 1 second delay and fire second TP.
+	run_app 0 1
+	wait_apps
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting NR_ITER event of the main INFO tp.
+	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -338,6 +476,10 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_multi_session_disable
+		test_jul_disable
+		test_jul_disable_enable
+		test_jul_filtering
 		test_jul_multi_session_loglevel
 		test_jul_destroy_session
 		test_jul_loglevel