Tests: Validate that filters may be used with JUL's logger_name filtering

[lttng-tools.git] / tests / regression / ust / java-jul / test_java_jul

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index a91904af4b28f1323a9f5a04aad4e2d97d2c4151..6c888eb8f345c62b168d9bef784c23bd8748dbb4 100755 (executable)
--- 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"
 
 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=131

 
 source $TESTDIR/utils/utils.sh
 
 
 source $TESTDIR/utils/utils.sh
 


@@ -38,15 +38,12 @@ function run_app
        local finest_tp=$1
        local fire_second_tp=$2
 
        local finest_tp=$1
        local fire_second_tp=$2
 

-       java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1 &
+       java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1

 }
 
 }
 

-function wait_apps
+function run_app_background

 {
 {

-       while [ -n "$(pidof java)" ]; do
-               sleep 0.5
-       done
-       pass "Wait for applications to end"
+       run_app $@ &

 }
 
 function enable_jul_loglevel_only()
 }
 
 function enable_jul_loglevel_only()


@@ -67,6 +64,27 @@ function enable_jul_loglevel_only()
        ok $? "Enable JUL event $event_name for session $sess_name with loglevel-only $loglevel"
 }
 
        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"
+}
+
+function enable_jul_filter_loglevel_only()
+{
+       local sess_name="$1"
+       local event_name="$2"
+       local filter="$3"
+       local loglevel="$4"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel-only $loglevel "$event_name" -s $sess_name -j --filter "$filter" >/dev/null 2>&1
+       ok $? "Enable event $event_name with filter \"$filter\" and loglevel-only $loglevel for session $sess_name"
+}
+

 # MUST set TESTDIR before calling those functions
 
 function test_jul_before_start ()
 # MUST set TESTDIR before calling those functions
 
 function test_jul_before_start ()


@@ -76,17 +94,18 @@ function test_jul_before_start ()
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
 
        # Run 5 times with a 1 second delay
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
 
        # Run 5 times with a 1 second delay

-       run_app
+       run_app_background

 
        start_lttng_tracing $SESSION_NAME
 
 
        start_lttng_tracing $SESSION_NAME
 

-       wait_apps
+       # Wait for the applications started in background
+       wait ${!}

 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -103,13 +122,11 @@ function test_jul_after_start ()
        # Run 5 times with a 1 second delay
        run_app
 
        # Run 5 times with a 1 second delay
        run_app
 

-       wait_apps
-

        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -126,13 +143,11 @@ function test_jul_loglevel ()
        # Run 5 times with a 1 second delay
        run_app
 
        # Run 5 times with a 1 second delay
        run_app
 

-       wait_apps
-

        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -146,13 +161,11 @@ function test_jul_loglevel ()
        # Run 5 times with a 1 second delay
        run_app
 
        # Run 5 times with a 1 second delay
        run_app
 

-       wait_apps
-

        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting 0 events.
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting 0 events.

-       trace_matches $EVENT_NAME 0 $TRACE_PATH
+       trace_match_only $EVENT_NAME 0 $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -166,13 +179,11 @@ function test_jul_loglevel ()
        # Run 5 times with a 1 second delay
        run_app
 
        # Run 5 times with a 1 second delay
        run_app
 

-       wait_apps
-

        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events.

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH

        return $?
 }
 
        return $?
 }
 


@@ -187,13 +198,12 @@ function test_jul_loglevel_multiple ()
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1

-       wait_apps

 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events times two.
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events times two.

-       trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+       trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -205,13 +215,12 @@ function test_jul_loglevel_multiple ()
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1

-       wait_apps

 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events times two.
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting all events times two.

-       trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+       trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -231,7 +240,6 @@ function test_jul_multi_session_loglevel()
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1

-       wait_apps

 
        stop_lttng_tracing $SESSION_NAME-1
        stop_lttng_tracing $SESSION_NAME-2
 
        stop_lttng_tracing $SESSION_NAME-1
        stop_lttng_tracing $SESSION_NAME-2


@@ -239,13 +247,48 @@ function test_jul_multi_session_loglevel()
        destroy_lttng_session $SESSION_NAME-2
 
        # Expecting 6 events being the main event plus the second tp.
        destroy_lttng_session $SESSION_NAME-2
 
        # Expecting 6 events being the main event plus the second tp.

-       trace_matches $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
+       trace_match_only $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1

        if [ $? -ne 0 ]; then
                return $?
        fi
 
        # Expectin 5 events being the finest TP.
        if [ $? -ne 0 ]; then
                return $?
        fi
 
        # Expectin 5 events being the finest TP.

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+       if [ $? -ne 0 ]; then
+               return $?
+       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
+
+       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_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+
+       # Validate test. Expecting one event of the second TP.
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -265,7 +308,6 @@ function test_jul_multi_session()
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
 
        # 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
 
        stop_lttng_tracing $SESSION_NAME-1
        stop_lttng_tracing $SESSION_NAME-2


@@ -273,13 +315,13 @@ function test_jul_multi_session()
        destroy_lttng_session $SESSION_NAME-2
 
        # Validate test. Expecting all events of first TP
        destroy_lttng_session $SESSION_NAME-2
 
        # Validate test. Expecting all events of first TP

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1

        if [ $? -ne 0 ]; then
                return $?
        fi
 
        # Validate test. Expecting one event of the second TP.
        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
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -294,7 +336,7 @@ function test_jul_destroy_session()
        start_lttng_tracing $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        start_lttng_tracing $SESSION_NAME
 
        # Run 5 times with a 1 second delay

-       run_app 0 1
+       run_app_background 0 1

 
        sleep 1
 
 
        sleep 1
 


@@ -311,13 +353,130 @@ function test_jul_destroy_session()
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
        start_lttng_tracing $SESSION_NAME
 
        enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
        start_lttng_tracing $SESSION_NAME
 

-       wait_apps
+       # Wait for the applications started in background
+       wait ${!}

 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting only one event num 2
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        # Validate test. Expecting only one event num 2

-       trace_matches $EVENT_NAME2 1 $TRACE_PATH/second-sess
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/second-sess
+       if [ $? -ne 0 ]; then
+               return $?
+       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
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test. Expecting one event of the second TP only.
+       trace_match_only $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
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test. Expecting NR_ITER event of the main INFO tp.
+       trace_match_only $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
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test. Expecting one event of the second TP only.
+       trace_match_only $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
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test. Expecting NR_ITER event of the main INFO tp.
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_filter_loglevel()
+{
+       local BOGUS_EVENT_NAME="not_a_real_event"
+       local FILTER="int_loglevel > 700 || int_loglevel < 700"
+       local ALL_EVENTS="."
+
+       diag "Test JUL a filter with a loglevel"
+
+       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       # Enable an event with a filter and the loglevel-only option.
+       enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
+       disable_jul_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
+       enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
+       start_lttng_tracing $SESSION_NAME
+
+       # Run 5 times with a 1 second delay and fire second TP.
+       run_app 0 1
+
+       stop_lttng_tracing $SESSION_NAME
+       destroy_lttng_session $SESSION_NAME
+
+       # Validate test. Expecting no events.
+       trace_match_only $ALL_EVENTS 0 $TRACE_PATH/$SESSION_NAME

        if [ $? -ne 0 ]; then
                return $?
        fi
        if [ $? -ne 0 ]; then
                return $?
        fi


@@ -338,6 +497,10 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
        start_lttng_sessiond
 
        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
                test_jul_multi_session_loglevel
                test_jul_destroy_session
                test_jul_loglevel


@@ -345,6 +508,7 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
                test_jul_before_start
                test_jul_after_start
                test_jul_multi_session
                test_jul_before_start
                test_jul_after_start
                test_jul_multi_session

+               test_jul_filter_loglevel

        )
 
        for fct_test in ${tests[@]};
        )
 
        for fct_test in ${tests[@]};