[logger] Change base OTP domain from [beam,erlang,otp] to [otp]

erlang · Jun 8, 2018 · ba4b23c · ba4b23c
1 parent c8c1c67
commit ba4b23c
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 55 deletions.
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
@@ -136,7 +136,7 @@ start_log_handler() ->
 init([]) ->
     {ok, #eh_state{log_func = tc_log_async}}.
 
-log(#{msg:={report,Msg},meta:=#{domain:=[beam,erlang,otp,sasl]}}=Log,Config) ->
+log(#{msg:={report,Msg},meta:=#{domain:=[otp,sasl]}}=Log,Config) ->
     case whereis(sasl_sup) of
 	undefined ->
 	    ok; % sasl application is not started
@@ -162,7 +162,7 @@ log(#{msg:={report,Msg},meta:=#{domain:=[beam,erlang,otp,sasl]}}=Log,Config) ->
                     do_log(add_log_category(Log,sasl),Config)
             end
     end;
-log(#{meta:=#{domain:=[beam,erlang,otp]}}=Log,Config) ->
+log(#{meta:=#{domain:=[otp]}}=Log,Config) ->
     do_log(add_log_category(Log,error_logger),Config);
 log(#{meta:=#{domain:=_}},_) ->
     ok;

diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
@@ -1914,7 +1914,7 @@ info_started(Name, Node) ->
     ?LOG_INFO(#{label=>{application_controller,progress},
                 report=>[{application, Name},
                          {started_at, Node}]},
-              #{domain=>[beam,erlang,otp,sasl],
+              #{domain=>[otp,sasl],
                 report_cb=>fun logger:format_otp_report/1,
                 logger_formatter=>#{title=>"PROGRESS REPORT"},
                 error_logger=>#{tag=>info_report,type=>progress}}).
@@ -1924,7 +1924,7 @@ info_exited(Name, Reason, Type) ->
                 report=>[{application, Name},
                          {exited, Reason},
                          {type, Type}]},
-              #{domain=>[beam,erlang,otp],
+              #{domain=>[otp],
                 report_cb=>fun logger:format_otp_report/1,
                 error_logger=>#{tag=>info_report,type=>std_info}}).
 

diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
@@ -539,7 +539,7 @@ tty(true) ->
                         logger:add_handler(error_logger_tty_true,logger_std_h,
                                            #{filter_default=>stop,
                                              filters=>?DEFAULT_HANDLER_FILTERS(
-                                                         [beam,erlang,otp]),
+                                                         [otp]),
                                              formatter=>{?DEFAULT_FORMATTER,
                                                          ?DEFAULT_FORMAT_CONFIG},
                                              logger_std_h=>#{type=>standard_io}})

diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
@@ -731,7 +731,7 @@ init_default_config(Type) ->
 get_default_handler_filters() ->
     case application:get_env(kernel, logger_sasl_compatible, false) of
         true ->
-            ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp]);
+            ?DEFAULT_HANDLER_FILTERS([otp]);
         false ->
             Extra =
                 case application:get_env(kernel, logger_progress_reports, stop) of
@@ -741,7 +741,7 @@ get_default_handler_filters() ->
                         [{stop_progress,
                           {fun logger_filters:progress/2,stop}}]
                 end,
-            Extra ++ ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp,sasl])
+            Extra ++ ?DEFAULT_HANDLER_FILTERS([otp,sasl])
     end.
 
 get_logger_env() ->

diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
@@ -23,8 +23,7 @@
 -define(HANDLER_KEY,'$handler_config$').
 -define(LOGGER_META_KEY,'$logger_metadata$').
 -define(STANDARD_HANDLER, default).
--define(DEFAULT_HANDLER_FILTERS,
-        ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp])).
+-define(DEFAULT_HANDLER_FILTERS,?DEFAULT_HANDLER_FILTERS([otp])).
 -define(DEFAULT_HANDLER_FILTERS(Domain),
         [{remote_gl,{fun logger_filters:remote_gl/2,stop}},
          {domain,{fun logger_filters:domain/2,{log,super,Domain}}},

diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -82,8 +82,7 @@ default(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -95,8 +94,7 @@ default_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     true = lists:keymember(sasl,1,Hs),
@@ -107,8 +105,7 @@ error_logger_tty(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -121,8 +118,7 @@ error_logger_tty_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     true = lists:keymember(sasl,1,Hs),
@@ -138,8 +134,7 @@ error_logger_false(Config) ->
     debug = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,SimpleFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
     false = lists:keymember(sasl,1,Hs),
     ok.
@@ -155,8 +150,7 @@ error_logger_false_progress(Config) ->
     debug = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,SimpleFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
     false = lists:keymember(sasl,1,Hs),
     ok.
@@ -172,8 +166,7 @@ error_logger_false_sasl_compatible(Config) ->
     debug = maps:get(level,SimpleC),
     notice = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,super,[beam,erlang,otp]}}} =
-        lists:keyfind(domain,1,SimpleFilters),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
     true = lists:keymember(sasl,1,Hs),
     ok.
@@ -220,8 +213,7 @@ logger_file(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -243,8 +235,7 @@ logger_file_sasl_compatible(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     true = lists:keymember(sasl,1,Hs),
@@ -266,8 +257,7 @@ logger_file_log_progress(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -353,8 +343,7 @@ logger_filters(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -406,8 +395,7 @@ logger_module_level(Config) ->
     {?STANDARD_HANDLER,logger_std_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -428,8 +416,7 @@ logger_disk_log(Config) ->
     {?STANDARD_HANDLER,logger_disk_log_h,StdC} = lists:keyfind(?STANDARD_HANDLER,1,Hs),
     debug = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,StdFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(simple,1,Hs),
     false = lists:keymember(sasl,1,Hs),
@@ -465,8 +452,7 @@ logger_undefined(Config) ->
     debug = maps:get(level,SimpleC),
     info = maps:get(level,L),
     SimpleFilters = maps:get(filters,SimpleC),
-    {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
-        lists:keyfind(domain,1,SimpleFilters),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
     false = lists:keymember(sasl,1,Hs),
     ok.

diff --git a/lib/kernel/test/logger_legacy_SUITE.erl b/lib/kernel/test/logger_legacy_SUITE.erl
@@ -67,14 +67,12 @@ end_per_suite(_Config) ->
 init_per_group(std, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
-           [{domain,{fun logger_filters:domain/2,
-                     {log,super,[beam,erlang,otp]}}}]),
+           [{domain,{fun logger_filters:domain/2,{log,super,[otp]}}}]),
     Config;
 init_per_group(sasl, Config) ->
     ok = logger:set_handler_config(
            error_logger,filters,
-           [{domain,{fun logger_filters:domain/2,
-                     {log,super,[beam,erlang,otp,sasl]}}}]),
+           [{domain,{fun logger_filters:domain/2,{log,super,[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/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
@@ -139,7 +139,7 @@ add_sasl_logger(Dest, Level) ->
                                     {fun logger_filters:remote_gl/2,stop}},
                                    {sasl_domain,
                                     {fun logger_filters:domain/2,
-                                     {log,equal,[beam,erlang,otp,sasl]}}}],
+                                     {log,equal,[otp,sasl]}}}],
                               logger_std_h=>#{type=>Dest},
                               formatter=>{logger_formatter,FC}}).
 

diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
@@ -589,7 +589,7 @@ server_update(Handler1, Func, Event, SName) ->
             ?LOG_WARNING(#{label=>{gen_event,no_handle_info},
                            module=>Mod1,
                            message=>Event},
-                         #{domain=>[beam,erlang,otp],
+                         #{domain=>[otp],
                            report_cb=>fun gen_event:format_log/1,
                            error_logger=>#{tag=>warning_msg}}), % warningmap??
             {ok, Handler1};
@@ -751,7 +751,7 @@ report_error(Handler, Reason, State, LastIn, SName) ->
                  state=>format_status(terminate,Handler#handler.module,
                                       get(),State),
                  reason=>Reason},
-               #{domain=>[beam,erlang,otp],
+               #{domain=>[otp],
                  report_cb=>fun gen_event:format_log/1,
                  error_logger=>#{tag=>error}}).
 

diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
@@ -505,7 +505,7 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
             ?LOG_WARNING(#{label=>{gen_fsm,no_handle_info},
                            module=>Mod,
                            message=>Msg},
-                         #{domain=>[beam,erlang,otp],
+                         #{domain=>[otp],
                            report_cb=>fun gen_fsm:format_log/1,
                            error_logger=>#{tag=>warning_msg}}),
             loop(Parent, Name, StateName, StateData, Mod, infinity, HibernateAfterTimeout, []);
@@ -616,7 +616,7 @@ error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
                  state_name=>StateName,
                  state_data=>StateData,
                  reason=>Reason},
-               #{domain=>[beam,erlang,otp],
+               #{domain=>[otp],
                  report_cb=>fun gen_fsm:format_log/1,
                  error_logger=>#{tag=>error}}),
     sys:print_log(Debug),

diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
@@ -645,7 +645,7 @@ try_dispatch(Mod, Func, Msg, State) ->
                        #{label=>{gen_server,no_handle_info},
                          module=>Mod,
                          message=>Msg},
-                       #{domain=>[beam,erlang,otp],
+                       #{domain=>[otp],
                          report_cb=>fun gen_server:format_log/1,
                          error_logger=>#{tag=>warning_msg}}),
                     {ok, {noreply, State}};
@@ -891,7 +891,7 @@ error_info(Reason, Name, From, Msg, Mod, State, Debug) ->
                  state=>format_status(terminate, Mod, get(), State),
                  reason=>Reason,
                  client_info=>client_stacktrace(From)},
-               #{domain=>[beam,erlang,otp],
+               #{domain=>[otp],
                  report_cb=>fun gen_server:format_log/1,
                  error_logger=>#{tag=>error}}),
     sys:print_log(Debug),

diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
@@ -1900,7 +1900,7 @@ error_info(
                  state_enter=>StateEnter,
                  state=>format_status(terminate, get(), S),
                  reason=>{Class,Reason,Stacktrace}},
-               #{domain=>[beam,erlang,otp],
+               #{domain=>[otp],
                  report_cb=>fun gen_statem:format_log/1,
                  error_logger=>#{tag=>error}}).
 

diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
@@ -508,7 +508,7 @@ crash_report(Class, Reason, StartF, Stacktrace) ->
     ?LOG_ERROR(#{label=>{proc_lib,crash},
                  report=>[my_info(Class, Reason, StartF, Stacktrace),
                           linked_info(self())]},
-               #{domain=>[beam,erlang,otp,sasl],
+               #{domain=>[otp,sasl],
                  report_cb=>fun proc_lib:report_cb/1,
                  logger_formatter=>#{title=>"CRASH REPORT"},
                  error_logger=>#{tag=>error_report,type=>crash_report}}).

diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
@@ -43,7 +43,7 @@
                               {errorContext,Error},
                               {reason,Reason},
                               {offender,extract_child(Child)}]},
-                   #{domain=>[beam,erlang,otp,sasl],
+                   #{domain=>[otp,sasl],
                      report_cb=>fun logger:format_otp_report/1,
                      logger_formatter=>#{title=>"SUPERVISOR REPORT"},
                      error_logger=>#{tag=>error_report,
@@ -580,7 +580,7 @@ handle_info({'EXIT', Pid, Reason}, State) ->
 
 handle_info(Msg, State) ->
     ?LOG_ERROR("Supervisor received unexpected message: ~tp~n",[Msg],
-               #{domain=>[beam,erlang,otp],
+               #{domain=>[otp],
                  error_logger=>#{tag=>error}}),
     {noreply, State}.
 
@@ -1419,7 +1419,7 @@ report_progress(Child, SupName) ->
     ?LOG_INFO(#{label=>{supervisor,progress},
                 report=>[{supervisor,SupName},
                          {started,extract_child(Child)}]},
-              #{domain=>[beam,erlang,otp,sasl],
+              #{domain=>[otp,sasl],
                 report_cb=>fun logger:format_otp_report/1,
                 logger_formatter=>#{title=>"PROGRESS REPORT"},
                 error_logger=>#{tag=>info_report,type=>progress}}).

diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl
@@ -135,7 +135,7 @@ report_progress(Pid, Mod, StartArgs, SupName) ->
                 report=>[{supervisor, SupName},
                          {started, [{pid, Pid},
                                     {mfa, {Mod, init, [StartArgs]}}]}]},
-              #{domain=>[beam,erlang,otp,sasl],
+              #{domain=>[otp,sasl],
                 report_cb=>fun logger:format_otp_report/1,
                 logger_formatter=>#{title=>"PROGRESS REPORT"},
                 error_logger=>#{tag=>info_report,type=>progress}}).
@@ -146,7 +146,7 @@ report_error(Error, Reason, #state{name = Name, pid = Pid, mod = Mod}) ->
                           {errorContext, Error},
                           {reason, Reason},
                           {offender, [{pid, Pid}, {mod, Mod}]}]},
-               #{domain=>[beam,erlang,otp,sasl],
+               #{domain=>[otp,sasl],
                  report_cb=>fun logger:format_otp_report/1,
                  logger_formatter=>#{title=>"SUPERVISOR REPORT"},
                  error_logger=>#{tag=>error_report,type=>supervisor_report}}).