Merge branch 'siri/logger-fix'

* siri/logger-fix:
  Update documentation of logger and error_logger
  Change type name logger:log() to logger:log_event()
  Update preloaded
  Update primary bootstrap
  Rename module logger_simple to logger_simple_h
  Change env var logger_log_progress to logger_progress_reports
  Remove HandlerId from handler callback functions and add it to Config
  Change handler id for sasl handler from sasl_h to sasl
  Change Compare parameter to logger_filters:domain/2
  Update Logger documentation
  Rename reset_module_level to unset_module_level
  Allow chars_limit to limit strings
  Add logger:update_formatter_config/2,3
  Set legacy_header=true for kernel's default handler only
  Improve documentation of logger and error_logger
  Use system_time instead of monotonic_time as timestamp in logger

11 files changed, 264 insertions, 182 deletions

diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 2f637ca9de..2ad1e3107c 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -77,7 +77,7 @@ MODULES= \
 	logger_filters_SUITE \
 	logger_formatter_SUITE \
 	logger_legacy_SUITE \
-	logger_simple_SUITE \
+	logger_simple_h_SUITE \
 	logger_std_h_SUITE \
 	logger_test_lib \
 	os_SUITE \
diff --git a/lib/kernel/test/logger.cover b/lib/kernel/test/logger.cover
index b30bcfe920..960bc0abff 100644
--- a/lib/kernel/test/logger.cover
+++ b/lib/kernel/test/logger.cover
@@ -8,7 +8,7 @@
             logger_filters,
             logger_formatter,
             logger_server,
-            logger_simple,
+            logger_simple_h,
             logger_std_h,
             logger_sup]}.
 
diff --git a/lib/kernel/test/logger.spec b/lib/kernel/test/logger.spec
index cd76a754a4..1ab90b3e93 100644
--- a/lib/kernel/test/logger.spec
+++ b/lib/kernel/test/logger.spec
@@ -7,5 +7,5 @@
                            logger_filters_SUITE,
                            logger_formatter_SUITE,
                            logger_legacy_SUITE,
-                           logger_simple_SUITE,
+                           logger_simple_h_SUITE,
                            logger_std_h_SUITE]}.
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index e602fa2576..f7ec59a7b7 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -318,7 +318,7 @@ macros(_Config) ->
 
 macros(cleanup,_Config) ->
     logger:remove_handler(h1),
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 set_level(_Config) ->
@@ -350,29 +350,29 @@ set_level_module(_Config) ->
     logger:info(M2=?map_rep,?MY_LOC(0)),
     ok = check_logged(info,M2,?MY_LOC(1)),
 
-    {error,{not_a_module,{bad}}} = logger:reset_module_level({bad}),
-    ok = logger:reset_module_level(?MODULE),
+    {error,{not_a_module,{bad}}} = logger:unset_module_level({bad}),
+    ok = logger:unset_module_level(?MODULE),
 
     ok.
 
 set_level_module(cleanup,_Config) ->
     logger:remove_handler(h1),
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 cache_level_module(_Config) ->
-    ok = logger:reset_module_level(?MODULE),
+    ok = logger:unset_module_level(?MODULE),
     [] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
     ?LOG_INFO(?map_rep),
     %% Caching is done asynchronously, so wait a bit for the update
     timer:sleep(100),
     [_] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
-    ok = logger:reset_module_level(?MODULE),
+    ok = logger:unset_module_level(?MODULE),
     [] = ets:lookup(logger,?MODULE), %dirty - add API in logger_config?
     ok.
 
 cache_level_module(cleanup,_Config) ->
-    logger:reset_module_level(?MODULE),
+    logger:unset_module_level(?MODULE),
     ok.
 
 format_report(_Config) ->
@@ -769,14 +769,14 @@ process_metadata(_Config) ->
     undefined = logger:get_process_metadata(),
     {error,badarg} = ?TRY(logger:set_process_metadata(bad)),
     ok = logger:add_handler(h1,?MODULE,#{level=>info,filter_default=>log}),
-    Time = erlang:monotonic_time(microsecond),
+    Time = erlang:system_time(microsecond),
     ProcMeta = #{time=>Time,line=>0,custom=>proc},
     ok = logger:set_process_metadata(ProcMeta),
     S1 = ?str,
     ?LOG_INFO(S1,#{custom=>macro}),
     check_logged(info,S1,#{time=>Time,line=>0,custom=>macro}),
 
-    Time2 = erlang:monotonic_time(microsecond),
+    Time2 = erlang:system_time(microsecond),
     S2 = ?str,
     ?LOG_INFO(S2,#{time=>Time2,line=>1,custom=>macro}),
     check_logged(info,S2,#{time=>Time2,line=>1,custom=>macro}),
@@ -839,20 +839,20 @@ check_maps(Expected,Got,What) ->
     end.
 
 %% Handler
-adding_handler(_Id,#{add_call:=Fun}) ->
+adding_handler(#{add_call:=Fun}) ->
     Fun();
-adding_handler(_Id,Config) ->
+adding_handler(Config) ->
     maybe_send(add),
     {ok,Config}.
 
-removing_handler(_Id,#{rem_call:=Fun}) ->
+removing_handler(#{rem_call:=Fun}) ->
     Fun();
-removing_handler(_Id,_Config) ->
+removing_handler(_Config) ->
     maybe_send(remove),
     ok.
-changing_config(_Id,_Old,#{conf_call:=Fun}) ->
+changing_config(_Old,#{conf_call:=Fun}) ->
     Fun();
-changing_config(_Id,_Old,Config) ->
+changing_config(_Old,Config) ->
     maybe_send(changing_config),
     {ok,Config}.
 
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 3aa1c3557b..7a1736c814 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -336,24 +336,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(Name),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(?log_no(LogFile,1),"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(?log_no(LogFile,1),"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(Name,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(?log_no(LogFile,1),
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(?log_no(LogFile,1),
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(?log_no(LogFile,1),
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1491,3 +1491,10 @@ check_tracer(T) ->
             dbg:stop_clear(),
             ct:fail({timeout,tracer})
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 764f443634..601d331fb0 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -82,11 +82,11 @@ default(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 default_sasl_compatible(Config) ->
@@ -95,11 +95,11 @@ default_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty(Config) ->
@@ -107,11 +107,11 @@ error_logger_tty(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty_sasl_compatible(Config) ->
@@ -121,11 +121,11 @@ error_logger_tty_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false(Config) ->
@@ -134,14 +134,14 @@ error_logger_false(Config) ->
               [{error_logger,false},
                {logger_level,notice}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_progress(Config) ->
@@ -149,16 +149,16 @@ error_logger_false_progress(Config) ->
         setup(Config,
               [{error_logger,false},
                {logger_level,notice},
-               {logger_log_progress,true}]),
+               {logger_progress_reports,log}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_sasl_compatible(Config) ->
@@ -168,22 +168,22 @@ error_logger_false_sasl_compatible(Config) ->
                {logger_level,notice},
                {logger_sasl_compatible,true}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent(Config) ->
     {ok,#{handlers:=Hs},_Node} = setup(Config,
                                        [{error_logger,silent}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent_sasl_compatible(Config) ->
@@ -191,8 +191,8 @@ error_logger_silent_sasl_compatible(Config) ->
                                        [{error_logger,silent},
                                         {logger_sasl_compatible,true}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 
@@ -220,11 +220,11 @@ logger_file(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -243,11 +243,11 @@ logger_file_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -255,7 +255,7 @@ logger_file_log_progress(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}}]}]),
@@ -266,11 +266,11 @@ logger_file_log_progress(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -289,8 +289,8 @@ logger_file_no_filter(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -310,8 +310,8 @@ logger_file_no_filter_level(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     error = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -331,8 +331,8 @@ logger_file_formatter(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -340,7 +340,7 @@ logger_filters(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,logger:=Logger},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}},
@@ -353,11 +353,11 @@ logger_filters(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     LoggerFilters = maps:get(filters,Logger),
     true = lists:keymember(stop_progress,1,LoggerFilters),
 
@@ -367,7 +367,7 @@ logger_filters_stop(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,logger:=Logger},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{filters=>[],
@@ -382,8 +382,8 @@ logger_filters_stop(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     LoggerFilters = maps:get(filters,Logger),
     true = lists:keymember(log_error,1,LoggerFilters),
 
@@ -393,7 +393,7 @@ logger_module_level(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,#{handlers:=Hs,module_levels:=ModuleLevels},Node}
         = setup(Config,
-                [{logger_log_progress,true},
+                [{logger_progress_reports,log},
                  {logger,
                   [{handler,?STANDARD_HANDLER,logger_std_h,
                     #{logger_std_h=>#{type=>{file,Log}}}},
@@ -406,11 +406,11 @@ logger_module_level(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     [{supervisor,error}] = ModuleLevels,
     ok.
 
@@ -428,11 +428,11 @@ logger_disk_log(Config) ->
     {?STANDARD_HANDLER,logger_disk_log_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -452,8 +452,8 @@ logger_disk_log_formatter(Config) ->
     {?STANDARD_HANDLER,logger_disk_log_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
-    false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(simple,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -461,14 +461,14 @@ logger_undefined(Config) ->
     {ok,#{handlers:=Hs,logger:=L},_Node} =
         setup(Config,[{logger,[{handler,?STANDARD_HANDLER,undefined}]}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
-    {logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
+    {simple,logger_simple_h,SimpleC} = lists:keyfind(simple,1,Hs),
     info = maps:get(level,SimpleC),
     info = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,prefix_of,[beam,erlang,otp,sasl]}}} =
+    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 
@@ -542,8 +542,8 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
     ok = rpc:call(Node,logger_std_h,filesync,[info]),
     {ok, Bin} = file:read_file(LogInfo),
     ct:log("Log content:~n~s",[Bin]),
-    match(Bin,<<"PROGRESS REPORT">>,NumProgress,info,info),
-    match(Bin,<<"ALERT REPORT">>,0,alert,info),
+    match(Bin,<<"info:">>,NumProgress+1,info,info),
+    match(Bin,<<"alert:">>,0,alert,info),
 
     ok.
 
@@ -552,7 +552,7 @@ sasl_compatible_false(Config) ->
     {ok,_Hs,Node} = setup(Config,
                           [{error_logger,{file,Log}},
                            {logger_sasl_compatible,false},
-                           {logger_log_progress,true}]),
+                           {logger_progress_reports,log}]),
     check_default_log(Node,Log,
                       file,% dest
                       6),% progress in std logger
@@ -563,7 +563,7 @@ sasl_compatible_false_no_progress(Config) ->
     {ok,_Hs,Node} = setup(Config,
                           [{error_logger,{file,Log}},
                            {logger_sasl_compatible,false},
-                           {logger_log_progress,false}]),
+                           {logger_progress_reports,stop}]),
     check_default_log(Node,Log,
                       file,% dest
                       0),% progress in std logger
@@ -589,7 +589,7 @@ bad_sasl_compatibility(Config) ->
     error = setup(Config,[{logger_sasl_compatible,badcomp}]).
 
 bad_progress(Config) ->
-    error = setup(Config,[{logger_log_progress,badprogress}]).
+    error = setup(Config,[{logger_progress_reports,badprogress}]).
 
 %%%-----------------------------------------------------------------
 %%% Internal
diff --git a/lib/kernel/test/logger_filters_SUITE.erl b/lib/kernel/test/logger_filters_SUITE.erl
index c4b31370ff..11cce8fd20 100644
--- a/lib/kernel/test/logger_filters_SUITE.erl
+++ b/lib/kernel/test/logger_filters_SUITE.erl
@@ -75,79 +75,79 @@ all() ->
      remote_gl].
 
 domain(_Config) ->
-    L1 = logger_filters:domain(L1=?dlog([]),{log,prefix_of,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,prefix_of,[]}),
-    L2 = logger_filters:domain(L2=?dlog([]),{log,starts_with,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,starts_with,[]}),
-    L3 = logger_filters:domain(L3=?dlog([]),{log,equals,[]}),
-    stop = logger_filters:domain(?dlog([]),{stop,equals,[]}),
-    ignore = logger_filters:domain(?dlog([]),{log,differs,[]}),
-    ignore = logger_filters:domain(?dlog([]),{stop,differs,[]}),
-    ignore = logger_filters:domain(?dlog([]),{log,no_domain,[]}),
-    ignore = logger_filters:domain(?dlog([]),{stop,no_domain,[]}),
-
-    L4 = logger_filters:domain(L4=?dlog([a]),{log,prefix_of,[a,b]}),
-    stop = logger_filters:domain(?dlog([a]),{stop,prefix_of,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,starts_with,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,starts_with,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,equals,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,equals,[a,b]}),
-    L5 = logger_filters:domain(L5=?dlog([a]),{log,differs,[a,b]}),
-    stop = logger_filters:domain(?dlog([a]),{stop,differs,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{log,no_domain,[a,b]}),
-    ignore = logger_filters:domain(?dlog([a]),{stop,no_domain,[a,b]}),
-
-    ignore = logger_filters:domain(?dlog([a,b]),{log,prefix_of,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,prefix_of,[a]}),
-    L6 = logger_filters:domain(L6=?dlog([a,b]),{log,starts_with,[a]}),
-    stop = logger_filters:domain(?dlog([a,b]),{stop,starts_with,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{log,equals,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,equals,[a]}),
-    L7 = logger_filters:domain(L7=?dlog([a,b]),{log,differs,[a]}),
-    stop = logger_filters:domain(?dlog([a,b]),{stop,differs,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{log,no_domain,[a]}),
-    ignore = logger_filters:domain(?dlog([a,b]),{stop,no_domain,[a]}),
-
-    ignore = logger_filters:domain(?ndlog,{log,prefix_of,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,prefix_of,[a]}),
-    ignore = logger_filters:domain(?ndlog,{log,starts_with,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,starts_with,[a]}),
-    ignore = logger_filters:domain(?ndlog,{log,equals,[a]}),
-    ignore = logger_filters:domain(?ndlog,{stop,equals,[a]}),
-    L8 = logger_filters:domain(L8=?ndlog,{log,differs,[a]}),
-    stop = logger_filters:domain(?ndlog,{stop,differs,[a]}),
-    L9 = logger_filters:domain(L9=?ndlog,{log,no_domain,[a]}),
-    stop = logger_filters:domain(?ndlog,{stop,no_domain,[a]}),
-
-    L10 = logger_filters:domain(L10=?dlog([a,b,c,d]),{log,prefix_of,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,prefix_of,[a,b,c,d]}),
-    L11 = logger_filters:domain(L11=?dlog([a,b,c,d]),{log,starts_with,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,starts_with,[a,b,c,d]}),
-    L12 = logger_filters:domain(L12=?dlog([a,b,c,d]),{log,equals,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,equals,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,no_domain,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,no_domain,[a,b,c,d]}),
+    L1 = logger_filters:domain(L1=?dlog([]),{log,super,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,super,[]}),
+    L2 = logger_filters:domain(L2=?dlog([]),{log,sub,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,sub,[]}),
+    L3 = logger_filters:domain(L3=?dlog([]),{log,equal,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,undefined,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,undefined,[]}),
+
+    L4 = logger_filters:domain(L4=?dlog([a]),{log,super,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,super,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,equal,[a,b]}),
+    L5 = logger_filters:domain(L5=?dlog([a]),{log,not_equal,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,not_equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,undefined,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,undefined,[a,b]}),
+
+    ignore = logger_filters:domain(?dlog([a,b]),{log,super,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,super,[a]}),
+    L6 = logger_filters:domain(L6=?dlog([a,b]),{log,sub,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,sub,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,equal,[a]}),
+    L7 = logger_filters:domain(L7=?dlog([a,b]),{log,not_equal,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,not_equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,undefined,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,undefined,[a]}),
+
+    ignore = logger_filters:domain(?ndlog,{log,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,equal,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,equal,[a]}),
+    L8 = logger_filters:domain(L8=?ndlog,{log,not_equal,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,not_equal,[a]}),
+    L9 = logger_filters:domain(L9=?ndlog,{log,undefined,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,undefined,[a]}),
+
+    L10 = logger_filters:domain(L10=?dlog([a,b,c,d]),{log,super,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,super,[a,b,c,d]}),
+    L11 = logger_filters:domain(L11=?dlog([a,b,c,d]),{log,sub,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,sub,[a,b,c,d]}),
+    L12 = logger_filters:domain(L12=?dlog([a,b,c,d]),{log,equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,undefined,[a,b,c,d]}),
 
     %% A domain field in meta which is not a list is allowed by the
     %% filter, but since MatchDomain is always a list of atoms, only
-    %% Action=differs can ever match.
-    ignore = logger_filters:domain(?dlog(dummy),{log,prefix_of,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,prefix_of,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,starts_with,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,starts_with,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,equals,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,equals,[a,b,c,d]}),
-    L13 = logger_filters:domain(L13=?dlog(dummy),{log,differs,[a,b,c,d]}),
-    stop = logger_filters:domain(?dlog(dummy),{stop,differs,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{log,no_domain,[a,b,c,d]}),
-    ignore = logger_filters:domain(?dlog(dummy),{stop,no_domain,[a,b,c,d]}),
+    %% Action=not_equal can ever match.
+    ignore = logger_filters:domain(?dlog(dummy),{log,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,equal,[a,b,c,d]}),
+    L13 = logger_filters:domain(L13=?dlog(dummy),{log,not_equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog(dummy),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,undefined,[a,b,c,d]}),
 
     {error,badarg} = ?TRY(logger_filters:domain(?ndlog,bad)),
-    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{bad,prefix_of,[]})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{bad,super,[]})),
     {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,bad,[]})),
-    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,prefix_of,bad})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,super,bad})),
 
     ok.
 
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
index 9baadfd65a..7a93f2ca79 100644
--- a/lib/kernel/test/logger_formatter_SUITE.erl
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -68,7 +68,8 @@ all() ->
      level_or_msg_in_meta,
      faulty_log,
      faulty_config,
-     faulty_msg].
+     faulty_msg,
+     update_config].
 
 default(_Config) ->
     String1 = format(info,{"~p",[term]},#{},#{}),
@@ -268,8 +269,8 @@ format_msg(_Config) ->
     String8 = format(info,{string,['not',printable,list]},
                      #{report_cb=>fun(_)-> {"formatted",[]} end},
                      #{template=>Template}),
-    ct:log(String8),
-    "INVALID STRING: ['not',printable,list]" = String8,
+    ct:log("~ts",[String8]), % avoiding ct_log crash
+    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String8,
 
     String9 = format(info,{string,"string"},#{},#{template=>Template}),
     ct:log(String9),
@@ -405,6 +406,14 @@ chars_limit(_Config) ->
     L5 = MS5,
     true = lists:prefix(lists:sublist(String5,L5-4),String4),
 
+    %% Test that chars_limit limits string also
+    Str = "123456789012345678901234567890123456789012345678901234567890123456789",
+    CL6 = 80,
+    String6 = format(info,{string,Str},Meta,FC#{chars_limit=>CL6}),
+    L6 = string:length(String6),
+    ct:log("String6: ~p~nLength6: ~p~n",[String6,L6]),
+    L6 = CL6,
+
     ok.
 
 format_mfa(_Config) ->
@@ -505,7 +514,7 @@ level_or_msg_in_meta(_Config) ->
     ok.
 
 faulty_log(_Config) ->
-    %% Unexpected log (should be type logger:log()) - print error
+    %% Unexpected log (should be type logger:log_event()) - print error
     {error,
      function_clause,
      {logger_formatter,format,[_,_],_}} =
@@ -532,6 +541,54 @@ faulty_msg(_Config) ->
                                      #{})),
     ok.
 
+%% Test that formatter config can be changed, and that the default
+%% template is updated accordingly
+update_config(_Config) ->
+    logger:add_handler_filter(default,silence,{fun(_,_) -> stop end,ok}),
+    ok = logger:add_handler(?MODULE,?MODULE,#{}),
+    D = lists:seq(1,1000),
+    logger:info("~p~n",[D]),
+    {Lines1,C1} = check_log(),
+    [ct:log(L) || L <- Lines1],
+    ct:log("~p",[C1]),
+    [Line1] = Lines1,
+    [_Time,"info: "++D1] = string:split(Line1," "),
+    true = length(D1)>3000,
+    true = #{}==C1,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,false),
+    logger:info("~p~n",[D]),
+    {Lines2,C2} = check_log(),
+    [ct:log(L) || L <- Lines2],
+    ct:log("~p",[C2]),
+    true = length(Lines2)>50,
+    true = #{single_line=>false}==C2,
+
+    ok = logger:update_formatter_config(?MODULE,#{legacy_header=>true}),
+    logger:info("~p~n",[D]),
+    {Lines3,C3} = check_log(),
+    [ct:log(L) || L <- Lines3],
+    ct:log("~p",[C3]),
+    ["=INFO REPORT==== "++_|D3] = Lines3,
+    true = length(D3)>50,
+    true = #{legacy_header=>true,single_line=>false}==C3,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,true),
+    logger:info("~p~n",[D]),
+    {Lines4,C4} = check_log(),
+    [ct:log(L) || L <- Lines4],
+    ct:log("~p",[C4]),
+    ["=INFO REPORT==== "++_,D4] = Lines4,
+    true = length(D4)>3000,
+    true = #{legacy_header=>true,single_line=>true}==C4,
+
+    ok.
+
+update_config(cleanup,_Config) ->
+    _ = logger:remove_handler(?MODULE),
+    _ = logger:remove_handler_filter(default,silence),
+    ok.
+
 %%%-----------------------------------------------------------------
 %%% Internal
 format(Level,Msg,Meta,Config) ->
@@ -546,8 +603,7 @@ default_time_format(Timestamp) ->
 default_time_format(Timestamp,Utc) ->
     default_time_format(Timestamp,Utc,$T).
 
-default_time_format(Timestamp0,Utc,Sep) ->
-    Timestamp=Timestamp0+erlang:time_offset(microsecond),
+default_time_format(Timestamp,Utc,Sep) ->
     Offset = if Utc -> "Z";
                 true -> ""
              end,
@@ -569,10 +625,20 @@ my_try(Fun) ->
     try Fun() catch C:R:S -> {C,R,hd(S)} end.
 
 timestamp() ->
-    erlang:monotonic_time(microsecond).
+    erlang:system_time(microsecond).
 
 %% necessary?
 add_time(#{time:=_}=Meta) ->
     Meta;
 add_time(Meta) ->
     Meta#{time=>timestamp()}.
+
+%%%-----------------------------------------------------------------
+%%% handler callback
+log(Log,#{formatter:={M,C}}) ->
+    put(log,{M:format(Log,C),C}),
+    ok.
+
+check_log() ->
+    {S,C} = erase(log),
+    {string:lexemes(S,"\n"),C}.
diff --git a/lib/kernel/test/logger_legacy_SUITE.erl b/lib/kernel/test/logger_legacy_SUITE.erl
index b59f5f7758..cfba35e43f 100644
--- a/lib/kernel/test/logger_legacy_SUITE.erl
+++ b/lib/kernel/test/logger_legacy_SUITE.erl
@@ -68,13 +68,13 @@ init_per_group(std, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
            [{domain,{fun logger_filters:domain/2,
-                     {log,prefix_of,[beam,erlang,otp]}}}]),
+                     {log,super,[beam,erlang,otp]}}}]),
     Config;
 init_per_group(sasl, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
            [{domain,{fun logger_filters:domain/2,
-                     {log,prefix_of,[beam,erlang,otp,sasl]}}}]),
+                     {log,super,[beam,erlang,otp,sasl]}}}]),
 
     %% cth_log_redirect checks if sasl is started before displaying
     %% any sasl reports - so just to see the real sasl reports in tc
diff --git a/lib/kernel/test/logger_simple_SUITE.erl b/lib/kernel/test/logger_simple_h_SUITE.erl
index 0d505b14f5..271a2126de 100644
--- a/lib/kernel/test/logger_simple_SUITE.erl
+++ b/lib/kernel/test/logger_simple_h_SUITE.erl
@@ -17,7 +17,7 @@
 %%
 %% %CopyrightEnd%
 %%
--module(logger_simple_SUITE).
+-module(logger_simple_h_SUITE).
 
 -compile(export_all).
 
@@ -87,20 +87,20 @@ all() ->
     ].
 
 start_stop(_Config) ->
-    undefined = whereis(logger_simple),
-    register(logger_simple,self()),
-    {error,_} = logger:add_handler(logger_simple,
-                                   logger_simple,
+    undefined = whereis(logger_simple_h),
+    register(logger_simple_h,self()),
+    {error,_} = logger:add_handler(simple,
+                                   logger_simple_h,
                                    #{filter_default=>log}),    
-    unregister(logger_simple),
-    ok = logger:add_handler(logger_simple,logger_simple,#{filter_default=>log}),
-    Pid = whereis(logger_simple),
+    unregister(logger_simple_h),
+    ok = logger:add_handler(simple,logger_simple_h,#{filter_default=>log}),
+    Pid = whereis(logger_simple_h),
     true = is_pid(Pid),
-    ok = logger:remove_handler(logger_simple),
-    false = is_pid(whereis(logger_simple)),
+    ok = logger:remove_handler(simple),
+    false = is_pid(whereis(logger_simple_h)),
     ok.
 start_stop(cleanup,_Config) ->
-    logger:remove_handler(logger_simple).
+    logger:remove_handler(simple).
 
 %% This testcase just tests that it does not crash, the default handler prints
 %% to stdout which we cannot read from in a detached slave.
@@ -138,7 +138,8 @@ replace_file(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_std_h,
-                     #{ logger_std_h => #{ type => {file, File} }}}]]),
+                     #{ logger_std_h => #{ type => {file, File} },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
 
     {ok,Bin} = sync_and_read(Node, file, File),
     Lines = [unicode:characters_to_list(L) ||
@@ -181,7 +182,8 @@ replace_disk_log(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_disk_log_h,
-                     #{ disk_log_opts => #{ file => File }}}]]),
+                     #{ disk_log_opts => #{ file => File },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
     {ok,Bin} = sync_and_read(Node, disk_log, File),
     Lines = [unicode:characters_to_list(L) ||
                 L <- binary:split(Bin,<<"\n">>,[global,trim])],
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index fc59d393e0..5764abd063 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -250,24 +250,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(?MODULE),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(Log,"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(Log,"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(Log,
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(Log,
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(Log,
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1020,7 +1020,7 @@ mem_kill_new(Config) ->
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
-            timer:sleep(RestartAfter + 2000),
+            timer:sleep(RestartAfter * 3),
             true = is_pid(whereis(?MODULE)),
             ok
     after
@@ -1518,3 +1518,10 @@ check_tracer(T,TimeoutFun) ->
             dbg:stop_clear(),
             TimeoutFun()
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].