From 696d8a5e34e223e6159a86b6254b86cd3cbe6b8f Mon Sep 17 00:00:00 2001
From: SisMaker <1713699517@qq.com>
Date: Fri, 5 Mar 2021 18:28:51 +0800
Subject: [PATCH] =?UTF-8?q?ft:=20=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              |   4 +-
 eRum.sample.config                     |  10 +-
 src/backend/rumBackendConsole.erl      |   4 +-
 src/backend/rumBackendFile.erl         |   4 +-
 src/crashLog/rumCrashLog.erl           |   2 +-
 src/eRum.erl                           |   8 +-
 src/eRum_app.erl                       | 121 ++++++++++---------------
 src/errLogger/rumErrLoggerH.erl        |  12 +--
 src/transform/rumTransform.erl         |   4 +-
 src/utils/rumUtil.erl                  |  12 +--
 src/watcher/rumHWatcherSrv.erl         |   8 +-
 test/lager_manager_killer_test.erl     |   4 +-
 test/lager_metadata_whitelist_test.erl |   2 +-
 test/lager_rotate.erl                  |   2 +-
 test/lager_test_backend.erl            |  20 ++--
 test/lager_test_function_transform.erl |   2 +-
 16 files changed, 96 insertions(+), 123 deletions(-)

diff --git a/README.md b/README.md
index cb2a5ac..acd1177 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ error_logger贮藏啤酒还提供了一个处理程序模块，该模块将传
 如果您将自己的处理程序安装到中error_logger，则可以通过使用error_logger_whitelist环境变量和允许的处理程序列表来告诉lager使其不被处理。
 
 ```
-{error_logger_whitelist, [my_handler]}
+{errLoggerWhitelist, [my_handler]}
 ```
 
 该error_logger处理器也将记录较完整的错误信息（使用的保护trunc_io）到“崩溃日志”，它可以被称为进一步的信息。崩溃日志的位置可以由crash_log 应用程序变量指定。如果设置为false完全不写入。
@@ -214,7 +214,7 @@ will send all `error_logger` messages to `error_logger.log` file.
 如果要限制每秒允许的消息数error_logger，如果要在许多相关进程崩溃时应对大量消息，这是一个好主意，则可以设置一个限制：
 
 ```erlang
-{error_logger_hwm, 50}
+{errLoggerHwm, 50}
 ```
 
 最好将此数字保持较小。
diff --git a/eRum.sample.config b/eRum.sample.config
index 62a8b2b..8f60168 100644
--- a/eRum.sample.config
+++ b/eRum.sample.config
@@ -31,7 +31,7 @@
       %% 额外的接收器列表 [{handler, [Handler()]}]
       {extra_sinks, []},
       %% 限制每秒允许的消息数量 最好将此数字保持较小
-      {error_logger_hwm, 50},
+      {errLoggerHwm, 50},
 
       %% **********************************************  日志文件配置相关  ************************************************
       %% 可选的日志路径， 默认情况下是当前路径
@@ -54,11 +54,13 @@
 
       %% **********************************************  error_logger相关  **********************************************
       %% 是否将error_logger消息重定向到默认的lager_event接收器-默认为true
-      {error_logger_redirect, false},
+      {errLoggerRedirect, false},
       %% 列表中的handler 不会处理error_logger
-      {error_logger_whitelist, []},
+      {errLoggerWhitelist, []},
       %% 每秒允许来自error_logger的消息数量是多少 超过就丢弃掉
-      {error_logger_hwm, 50},
+      {errLoggerHwm, 50},
+      %% errLogger group leader策略 handle | ignore | mirror
+      {errLoggerGroupLeaderStrategy, handle},
 
       %% 对于特定的接收器事件队列刷新，请使用改选项
       {flush_queue, true},
diff --git a/src/backend/rumBackendConsole.erl b/src/backend/rumBackendConsole.erl
index 76a0db6..b52b7b6 100644
--- a/src/backend/rumBackendConsole.erl
+++ b/src/backend/rumBackendConsole.erl
@@ -252,7 +252,7 @@ console_log_test_() ->
          error_logger:tty(false),
          application:load(lager),
          application:set_env(lager, handlers, []),
-         application:set_env(lager, error_logger_redirect, false),
+         application:set_env(lager, errLoggerRedirect, false),
          eRum:start(),
          whereis(user)
       end,
@@ -552,7 +552,7 @@ set_loglevel_test_() ->
          error_logger:tty(false),
          application:load(lager),
          application:set_env(lager, handlers, [{lager_console_backend, [{level, info}]}]),
-         application:set_env(lager, error_logger_redirect, false),
+         application:set_env(lager, errLoggerRedirect, false),
          eRum:start()
       end,
       fun(_) ->
diff --git a/src/backend/rumBackendFile.erl b/src/backend/rumBackendFile.erl
index ca64933..8cf4535 100644
--- a/src/backend/rumBackendFile.erl
+++ b/src/backend/rumBackendFile.erl
@@ -590,7 +590,7 @@ filesystem_test_() ->
          ok = error_logger:tty(false),
          ok = rumUtil:safe_application_load(lager),
          ok = application:set_env(lager, handlers, [{lager_test_backend, info}]),
-         ok = application:set_env(lager, error_logger_redirect, false),
+         ok = application:set_env(lager, errLoggerRedirect, false),
          ok = application:set_env(lager, asyncThreshold, undefined),
          {ok, _TestDir} = rumUtil:create_test_dir(),
          ok = eRum:start(),
@@ -1085,7 +1085,7 @@ formatting_test_() ->
          ok = error_logger:tty(false),
          ok = rumUtil:safe_application_load(lager),
          ok = application:set_env(lager, handlers, [{lager_test_backend, info}]),
-         ok = application:set_env(lager, error_logger_redirect, false),
+         ok = application:set_env(lager, errLoggerRedirect, false),
          ok = eRum:start(),
          %% same race condition issue
          ok = timer:sleep(5),
diff --git a/src/crashLog/rumCrashLog.erl b/src/crashLog/rumCrashLog.erl
index dee399c..dc3ff23 100644
--- a/src/crashLog/rumCrashLog.erl
+++ b/src/crashLog/rumCrashLog.erl
@@ -229,7 +229,7 @@ filesystem_test_() ->
          ok = error_logger:tty(false),
          ok = rumUtil:safe_application_load(lager),
          ok = application:set_env(lager, handlers, [{lager_test_backend, info}]),
-         ok = application:set_env(lager, error_logger_redirect, true),
+         ok = application:set_env(lager, errLoggerRedirect, true),
          ok = application:unset_env(lager, crash_log),
          ok = eRum:start(),
          ok = timer:sleep(1000),
diff --git a/src/eRum.erl b/src/eRum.erl
index 4b863f4..da9ec20 100644
--- a/src/eRum.erl
+++ b/src/eRum.erl
@@ -49,7 +49,7 @@
    , set_loglevel/3
    , set_loglevel/4
    , get_loglevels/1
-   , update_loglevel_config/1
+   , updateLogevelCfg/1
    , posix_error/1
    , set_loghwm/2
    , set_loghwm/3
@@ -480,7 +480,7 @@ set_loglevel(Sink, Handler, Ident, Level) when is_atom(Level) ->
                    _ -> {Handler, Ident}
                 end,
    Reply = gen_event:call(Sink, HandlerArg, {set_loglevel, Level}, infinity),
-   update_loglevel_config(Sink),
+   updateLogevelCfg(Sink),
    Reply.
 
 
@@ -543,11 +543,11 @@ add_trace_to_loglevel_config(Trace, Sink) ->
    end.
 
 %% @doc recalculate min log level
-update_loglevel_config(error_logger) ->
+updateLogevelCfg(error_logger) ->
    %% Not a sink under our control, part of the Erlang logging
    %% utility that error_logger_lager_h attaches to
    true;
-update_loglevel_config(Sink) ->
+updateLogevelCfg(Sink) ->
    {_, Traces} = rumConfig:get({Sink, loglevel}, {ignore_me, []}),
    MinLog = minimum_loglevel(get_loglevels(Sink)),
    rumConfig:set({Sink, loglevel}, {MinLog, Traces}).
diff --git a/src/eRum_app.erl b/src/eRum_app.erl
index 394a5df..b059a02 100644
--- a/src/eRum_app.erl
+++ b/src/eRum_app.erl
@@ -8,6 +8,7 @@
    start/0
    , start/2
    , stop/1
+   , doStart/0
    , doStart/1
    , startHandler/3
    , configure_sink/2
@@ -20,24 +21,25 @@ start() ->
 
 start(_StartType, _StartArgs) ->
    {ok, Pid} = eRum_sup:start_link(),
-   SavedHandlers = boot(),
+   SavedHandlers = doStart(),
    _ = doStart('__all_extra'),
    _ = doStart('__traces'),
-   clean_up_config_checks(),
    {ok, Pid, SavedHandlers}.
 
-boot() ->
-   %% Handle the default sink.
+%% 启动默认的接收器(sink)
+doStart() ->
+   %% 尝试起送异步管理者
    tryStartAsyncMgr(rumUtil:get_env(asyncThreshold, undefined), rumUtil:get_env(asyncThresholdWindow, undefined), ?RumDefSink),
 
+   %%尝试安装killer
    tryInstallKiller(rumUtil:get_env(killerHwm, undefined), rumUtil:get_env(killerReTime, undefined), ?RumDefSink),
 
+   %%尝试启动各个handler
    tryStartHandlers(rumUtil:get_env(handlers, ?RumDefHandler), ?RumDefSink),
 
-
-
-   SavedHandlers = start_error_logger_handler(rumUtil:get_env(error_logger_redirect, true), rumUtil:get_env(error_logger_hwm, 0), rumUtil:get_env(error_logger_whitelist, [])),
-   eRum:update_loglevel_config(?RumDefSink),
+   %% 尝试替换error logger
+   SavedHandlers = tryStartErrLoggerHandler(rumUtil:get_env(errLoggerRedirect, true), rumUtil:get_env(errLoggerHwm, 0), rumUtil:get_env(errLoggerWhitelist, [])),
+   eRum:updateLogevelCfg(?RumDefSink),
    SavedHandlers.
 
 doStart('__traces') ->
@@ -45,11 +47,11 @@ doStart('__traces') ->
    ok = add_configured_traces();
 
 doStart('__all_extra') ->
-   configure_extra_sinks(application:get_env(lager, extra_sinks, []));
+   doStartExtraSinks(rumUtil:get_env(extra_sinks, []));
 
-doStart(?RumDefSink) -> boot();
+doStart(?RumDefSink) -> doStart();
 doStart(Sink) ->
-   AllSinksDef = application:get_env(lager, extra_sinks, []),
+   AllSinksDef = rumUtil:get_env(extra_sinks, []),
    boot_sink(Sink, lists:keyfind(Sink, 1, AllSinksDef)).
 
 boot_sink(Sink, {Sink, Def}) ->
@@ -95,19 +97,18 @@ doStartHandlers([], _Sink, _NameAcc, HandlerAcc) ->
    HandlerAcc;
 doStartHandlers([OneHandler | Handlers], Sink, NameAcc, HandlerAcc) ->
    {Module, Options} = expand_handlers(OneHandler),
-   NewNameAcc =
-      case Module of
-         {rumBackendFile, F} ->
-            case lists:member(F, NameAcc) of
-               true ->
-                  error_logger:error_msg("Cannot have same file (~p) in multiple file backends~n", [F]),
-                  throw({error, bad_config});
-               _ ->
-                  [F | NameAcc]
-            end;
-         _ ->
-            NameAcc
-      end,
+   case Module of
+      {rumBackendFile, F} ->
+         case lists:member(F, NameAcc) of
+            true ->
+               error_logger:error_msg("Cannot have same file (~p) in multiple file backends~n", [F]),
+               throw({error, bad_config});
+            _ ->
+               NewNameAcc = [F | NameAcc]
+         end;
+      _ ->
+         NewNameAcc = NameAcc
+   end,
 
    HandlerRet = startHandler(Sink, Module, Options),
    doStartHandlers(Handlers, Sink, NewNameAcc, [HandlerRet | HandlerAcc]).
@@ -116,87 +117,59 @@ startHandler(Sink, Module, Config) ->
    {ok, Watcher} = supervisor:start_child(rumHWatcherSup, [Sink, Module, Config]),
    {Module, Watcher, Sink}.
 
-interpret_hwm(undefined) ->
-   undefined;
-interpret_hwm(HWM) when not is_integer(HWM) orelse HWM < 0 ->
-   _ = eRum:log(warning, self(), "Invalid error_logger high water mark: ~p, disabling", [HWM]),
-   undefined;
-interpret_hwm(HWM) ->
-   HWM.
-
--spec start_error_logger_handler(boolean(), pos_integer(), list()) -> list().
-start_error_logger_handler(false, _HWM, _Whitelist) ->
-   [];
-start_error_logger_handler(true, HWM, WhiteList) ->
-   GlStrategy =
-      case application:get_env(lager, error_logger_groupleader_strategy) of
-         undefined ->
-            handle;
-         {ok, GlStrategy0} when
-            GlStrategy0 =:= handle;
-            GlStrategy0 =:= ignore;
-            GlStrategy0 =:= mirror ->
-            GlStrategy0;
-         {ok, BadGlStrategy} ->
-            error_logger:error_msg(
-               "Invalid value for 'error_logger_groupleader_strategy': ~p~n",
-               [BadGlStrategy]),
-            throw({error, bad_config})
-      end,
-
+-spec tryStartErrLoggerHandler(boolean(), pos_integer(), list()) -> list().
+tryStartErrLoggerHandler(false, _HWM, _Whitelist) -> [];
+tryStartErrLoggerHandler(_ErrLoggerRedirect, HWM, WhiteList) ->
    case whereis(error_logger) of
       undefined ->
-         %% On OTP 21 and above, error_logger is deprecated in favor of 'logger'
-         %% As a band-aid, boot up error_logger anyway and install it as a logger handler
-         %% we can't use error_logger:add_report_handler because we want supervision of the handler
-         %% so we have to manually add the logger handler
+         %% 在OTP 21及以上版本中，error_logger已弃用，而改用 'logger'
+         %% 作为一个修补, 启动error_logger并将其安装为 logger handler
+         %% 我们不能使用 error_logger:add_report_handler 因为我们想要监视这个handler
+         %% 因此，我们必须手动添加这个 logger handler
          %%
-         %% Longer term we should be installing a logger handler instead, but this will bridge the gap
-         %% for now.
+         %% 从长远来看，我们应该安装一个日志处理程序, but this will bridge the gap for now.
          _ = error_logger:start(),
          _ = logger:add_handler(error_logger, error_logger, #{level => info, filter_default => log}),
-         ok = maybe_remove_logger_handler();
+         ok = tryRemoveLoggerHandler();
       _ ->
          ok
    end,
 
    %% capture which handlers we removed from error_logger so we can restore them when lager stops
+   %% 捕获从error_logger中删除的处理程序，以便在lager停止时恢复它们
    OldHandlers =
-      case supervisor:start_child(lager_handler_watcher_sup, [error_logger, error_logger_lager_h, [HWM, GlStrategy]]) of
+      case supervisor:start_child(rumHWatcherSup, [error_logger, rumErrLoggerH, [HWM, rumUtil:get_env(errLoggerGroupLeaderStrategy, handle)]]) of
          {ok, _} ->
-            [begin error_logger:delete_report_handler(X), X end ||
-               X <- gen_event:which_handlers(error_logger) -- [error_logger_lager_h | WhiteList]];
+            [begin error_logger:delete_report_handler(X), X end || X <- gen_event:which_handlers(error_logger) -- [error_logger_lager_h | WhiteList]];
          {error, _} ->
             []
       end,
    OldHandlers.
 
-%% On OTP 21.1 and higher we need to remove the `default' handler.
-%% But it might not exist, so we will wrap this in a try-catch
-%% block
-maybe_remove_logger_handler() ->
+%% 在OTP 21.1及更高版本上，我们需要删除`default' handler。但是它可能不存在，因此我们将其包装在try-catch块中
+tryRemoveLoggerHandler() ->
    try
       ok = logger:remove_handler(default)
    catch
       error:undef -> ok;
       Err:Reason ->
-         error_logger:error_msg("calling logger:remove_handler(default) failed: ~p ~p",
-            [Err, Reason])
+         error_logger:error_msg("calling logger:remove_handler(default) failed: ~p ~p", [Err, Reason])
    end.
 
 configure_sink(Sink, SinkDef) ->
    rumConfig:initSink(Sink),
-   ChildId = rumUtil:make_internal_sink_name(Sink),
+   ChildId = rumUtil:makeInnerSinkName(Sink),
    _ = supervisor:start_child(eRum_sup, {ChildId, {gen_event, start_link, [{local, Sink}]}, permanent, 5000, worker, dynamic}),
    tryStartAsyncMgr(Sink, proplists:get_value(asyncThreshold, SinkDef), proplists:get_value(asyncThresholdWindow, SinkDef)),
-   _ = tryInstallKiller(Sink, proplists:get_value(killerHwm, SinkDef),
-      proplists:get_value(killerReTime, SinkDef)),
+   _ = tryInstallKiller(Sink, proplists:get_value(killerHwm, SinkDef), proplists:get_value(killerReTime, SinkDef)),
    tryStartHandlers(proplists:get_value(handlers, SinkDef, []), Sink),
-   eRum:update_loglevel_config(Sink).
+   eRum:updateLogevelCfg(Sink).
 
 
-configure_extra_sinks(Sinks) ->
-   lists:foreach(fun({Sink, Proplist}) -> configure_sink(Sink, Proplist) end, Sinks).
+doStartExtraSinks(Sinks) ->
+   [configure_sink(Sink, Opts) || {Sink, Opts} <- Sinks],
+   ok.
+
 
 
 
diff --git a/src/errLogger/rumErrLoggerH.erl b/src/errLogger/rumErrLoggerH.erl
index 273236b..9133560 100644
--- a/src/errLogger/rumErrLoggerH.erl
+++ b/src/errLogger/rumErrLoggerH.erl
@@ -622,8 +622,8 @@ no_silent_hwm_drops_test_() ->
             error_logger:tty(false),
             application:load(lager),
             application:set_env(lager, handlers, [{lager_test_backend, warning}]),
-            application:set_env(lager, error_logger_redirect, true),
-            application:set_env(lager, error_logger_hwm, 5),
+            application:set_env(lager, errLoggerRedirect, true),
+            application:set_env(lager, errLoggerHwm, 5),
             application:set_env(lager, error_logger_flush_queue, false),
             application:set_env(lager, suppress_supervisor_start_stop, true),
             application:set_env(lager, suppress_application_start_stop, true),
@@ -653,8 +653,8 @@ shaper_does_not_forward_sup_progress_messages_to_info_level_backend_test_() ->
          error_logger:tty(false),
          application:load(lager),
          application:set_env(lager, handlers, [{lager_test_backend, info}]),
-         application:set_env(lager, error_logger_redirect, true),
-         application:set_env(lager, error_logger_hwm, 5),
+         application:set_env(lager, errLoggerRedirect, true),
+         application:set_env(lager, errLoggerHwm, 5),
          application:set_env(lager, suppress_supervisor_start_stop, false),
          application:set_env(lager, suppress_application_start_stop, false),
          application:unset_env(lager, crash_log),
@@ -702,8 +702,8 @@ supressed_messages_are_not_counted_for_hwm_test_() ->
          error_logger:tty(false),
          application:load(lager),
          application:set_env(lager, handlers, [{lager_test_backend, debug}]),
-         application:set_env(lager, error_logger_redirect, true),
-         application:set_env(lager, error_logger_hwm, 5),
+         application:set_env(lager, errLoggerRedirect, true),
+         application:set_env(lager, errLoggerHwm, 5),
          application:set_env(lager, suppress_supervisor_start_stop, true),
          application:set_env(lager, suppress_application_start_stop, true),
          application:unset_env(lager, crash_log),
diff --git a/src/transform/rumTransform.erl b/src/transform/rumTransform.erl
index 8b6ea4a..54c3aac 100644
--- a/src/transform/rumTransform.erl
+++ b/src/transform/rumTransform.erl
@@ -73,12 +73,12 @@ transform_statement({call, Line, {remote, _Line1, {atom, _Line2, Module},
       true ->
          case lists:member(Function, ?RumLevels) of
             true ->
-               SinkName = rumUtil:make_internal_sink_name(Module),
+               SinkName = rumUtil:makeInnerSinkName(Module),
                do_transform(Line, SinkName, Function, Arguments0);
             false ->
                case lists:keyfind(Function, 1, ?RumLevelsUnsafe) of
                   {Function, Severity} ->
-                     SinkName = rumUtil:make_internal_sink_name(Module),
+                     SinkName = rumUtil:makeInnerSinkName(Module),
                      do_transform(Line, SinkName, Severity, Arguments0, unsafe);
                   false ->
                      Stmt
diff --git a/src/utils/rumUtil.erl b/src/utils/rumUtil.erl
index 5bc375d..ad0ea75 100644
--- a/src/utils/rumUtil.erl
+++ b/src/utils/rumUtil.erl
@@ -25,7 +25,7 @@
    , find_file/2
    , check_hwm/1
    , check_hwm/2
-   , make_internal_sink_name/1
+   , makeInnerSinkName/1
    , otp_version/0
    , maybe_flush/2
    , has_file_changed/3
@@ -596,10 +596,8 @@ discard_messages(Second, Filter, Count) ->
 %% @private Build an atom for the gen_event process based on a sink name.
 %% For historical reasons, the default gen_event process for lager itself is named
 %% `lager_event'. For all other sinks, it is SinkName++`_lager_event'
-make_internal_sink_name(lager) ->
-   ?RumDefSink;
-make_internal_sink_name(Sink) ->
-   list_to_atom(atom_to_list(Sink) ++ "_lager_event").
+makeInnerSinkName(Sink) ->
+   binary_to_atom(<<(atom_to_binary(Sink, utf8))/binary, "Event">>).
 
 -spec otp_version() -> pos_integer().
 %% @doc Return the major version of the current Erlang/OTP runtime as an integer.
@@ -879,8 +877,8 @@ expand_path_test() ->
 
 sink_name_test_() ->
    [
-      ?_assertEqual(rumEvent, make_internal_sink_name(lager)),
-      ?_assertEqual(audit_lager_event, make_internal_sink_name(audit))
+      ?_assertEqual(rumEvent, makeInnerSinkName(lager)),
+      ?_assertEqual(audit_lager_event, makeInnerSinkName(audit))
    ].
 
 create_test_dir() ->
diff --git a/src/watcher/rumHWatcherSrv.erl b/src/watcher/rumHWatcherSrv.erl
index 7b18534..0c27de2 100644
--- a/src/watcher/rumHWatcherSrv.erl
+++ b/src/watcher/rumHWatcherSrv.erl
@@ -106,7 +106,7 @@ install_handler2(Sink, Module, Config) ->
    case gen_event:add_sup_handler(Sink, Module, Config) of
       ok ->
          ?INT_LOG(debug, "Lager installed handler ~p into ~p", [Module, Sink]),
-         eRum:update_loglevel_config(Sink),
+         eRum:updateLogevelCfg(Sink),
          ok;
       {error, {fatal, Reason}} ->
          ?INT_LOG(error, "Lager fatally failed to install handler ~p into ~p, NOT retrying: ~p", [Module, Sink, Reason]),
@@ -133,7 +133,7 @@ reinstall_on_initial_failure_test_() ->
             error_logger:tty(false),
             application:load(lager),
             application:set_env(lager, handlers, [{lager_test_backend, info}, {lager_crash_backend, [from_now(2), undefined]}]),
-            application:set_env(lager, error_logger_redirect, false),
+            application:set_env(lager, errLoggerRedirect, false),
             application:unset_env(lager, crash_log),
             eRum:start(),
             try
@@ -159,7 +159,7 @@ reinstall_on_runtime_failure_test_() ->
             error_logger:tty(false),
             application:load(lager),
             application:set_env(lager, handlers, [{lager_test_backend, info}, {lager_crash_backend, [undefined, from_now(5)]}]),
-            application:set_env(lager, error_logger_redirect, false),
+            application:set_env(lager, errLoggerRedirect, false),
             application:unset_env(lager, crash_log),
             eRum:start(),
             try
@@ -186,7 +186,7 @@ reinstall_handlers_after_killer_hwm_test_() ->
             error_logger:tty(false),
             application:load(lager),
             application:set_env(lager, handlers, [{lager_manager_killer, [1000, 5000]}]),
-            application:set_env(lager, error_logger_redirect, false),
+            application:set_env(lager, errLoggerRedirect, false),
             application:set_env(lager, killerReTime, 5000),
             application:unset_env(lager, crash_log),
             eRum:start(),
diff --git a/test/lager_manager_killer_test.erl b/test/lager_manager_killer_test.erl
index 3662a76..e3fb27f 100644
--- a/test/lager_manager_killer_test.erl
+++ b/test/lager_manager_killer_test.erl
@@ -19,7 +19,7 @@ overload_test_() ->
          KillerReinstallAfter = 1000, % reinstall killer after 1 sec
          application:set_env(lager, handlers, [{lager_slow_backend, [{delay, Delay}]}]),
          application:set_env(lager, asyncThreshold, undefined),
-         application:set_env(lager, error_logger_redirect, true),
+         application:set_env(lager, errLoggerRedirect, true),
          application:set_env(lager, killerHwm, KillerHWM),
          application:set_env(lager, killerReTime, KillerReinstallAfter),
          ensure_started(lager),
@@ -61,7 +61,7 @@ overload_alternate_sink_test_() ->
             {killerReTime, KillerReinstallAfter},
             {asyncThreshold, undefined}
          ]}]),
-         application:set_env(lager, error_logger_redirect, true),
+         application:set_env(lager, errLoggerRedirect, true),
          ensure_started(lager),
          rumConfig:set({?TEST_SINK_EVENT, async}, true),
          Manager = whereis(?TEST_SINK_EVENT),
diff --git a/test/lager_metadata_whitelist_test.erl b/test/lager_metadata_whitelist_test.erl
index 657f281..0bbf865 100644
--- a/test/lager_metadata_whitelist_test.erl
+++ b/test/lager_metadata_whitelist_test.erl
@@ -8,7 +8,7 @@ setup() ->
    ok = error_logger:tty(false),
    ok = rumUtil:safe_application_load(lager),
    ok = application:set_env(lager, handlers, [{lager_common_test_backend, info}]),
-   ok = application:set_env(lager, error_logger_redirect, false),
+   ok = application:set_env(lager, errLoggerRedirect, false),
    ok = application:unset_env(lager, traces),
    ok = eRum:start(),
    ok = timer:sleep(250),
diff --git a/test/lager_rotate.erl b/test/lager_rotate.erl
index d205090..8bc2eab 100644
--- a/test/lager_rotate.erl
+++ b/test/lager_rotate.erl
@@ -64,7 +64,7 @@ rotate_test_() ->
                [{handlers,
                   [{lager_file_backend, [{file, Sink}, {level, info}]}]}
                ]}]),
-         application:set_env(lager, error_logger_redirect, false),
+         application:set_env(lager, errLoggerRedirect, false),
          application:set_env(lager, asyncThreshold, undefined),
          eRum:start(),
          timer:sleep(1000),
diff --git a/test/lager_test_backend.erl b/test/lager_test_backend.erl
index b3f6bd8..8fe1b31 100644
--- a/test/lager_test_backend.erl
+++ b/test/lager_test_backend.erl
@@ -870,7 +870,7 @@ setup_sink() ->
    error_logger:tty(false),
    application:load(lager),
    application:set_env(lager, handlers, []),
-   application:set_env(lager, error_logger_redirect, false),
+   application:set_env(lager, errLoggerRedirect, false),
    application:set_env(lager, extra_sinks, [{?TEST_SINK_EVENT, [{handlers, [{?MODULE, info}]}]}]),
    lager:start(),
    gen_event:call(lager_event, ?MODULE, flush),
@@ -880,7 +880,7 @@ setup() ->
    error_logger:tty(false),
    application:load(lager),
    application:set_env(lager, handlers, [{?MODULE, info}]),
-   application:set_env(lager, error_logger_redirect, false),
+   application:set_env(lager, errLoggerRedirect, false),
    application:unset_env(lager, traces),
    lager:start(),
    %% There is a race condition between the application start up, lager logging its own
@@ -955,7 +955,7 @@ test_body(Expected, Actual) ->
 error_logger_redirect_crash_setup() ->
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:set_env(lager, handlers, [{?MODULE, error}]),
    lager:start(),
    crash:start(),
@@ -964,7 +964,7 @@ error_logger_redirect_crash_setup() ->
 error_logger_redirect_crash_setup_sink() ->
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:unset_env(lager, handlers),
    application:set_env(lager, extra_sinks, [
       {error_logger_lager_event, [
@@ -986,7 +986,7 @@ error_logger_redirect_crash_cleanup(_Sink) ->
 crash_fsm_setup() ->
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:set_env(lager, handlers, [{?MODULE, error}]),
    lager:start(),
    crash_fsm:start(),
@@ -1000,7 +1000,7 @@ crash_fsm_sink_setup() ->
    ErrorSink = error_logger_lager_event,
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:set_env(lager, handlers, []),
    application:set_env(lager, extra_sinks, [{ErrorSink, [{handlers, [{?MODULE, error}]}]}]),
    lager:start(),
@@ -1146,7 +1146,7 @@ error_logger_redirect_crash_test_() ->
 error_logger_redirect_setup() ->
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:set_env(lager, handlers, [{?MODULE, info}]),
    application:set_env(lager, suppress_supervisor_start_stop, false),
    application:set_env(lager, suppress_application_start_stop, false),
@@ -1159,7 +1159,7 @@ error_logger_redirect_setup() ->
 error_logger_redirect_setup_sink() ->
    error_logger:tty(false),
    application:load(lager),
-   application:set_env(lager, error_logger_redirect, true),
+   application:set_env(lager, errLoggerRedirect, true),
    application:unset_env(lager, handlers),
    application:set_env(lager, extra_sinks, [
       {error_logger_lager_event, [
@@ -1776,7 +1776,7 @@ async_threshold_test_() ->
       ?assertEqual(true, ets:insert_new(async_threshold_test, {sync_toggled, 0})),
       ?assertEqual(true, ets:insert_new(async_threshold_test, {async_toggled, 0})),
       _ = application:load(lager),
-      ok = application:set_env(lager, error_logger_redirect, false),
+      ok = application:set_env(lager, errLoggerRedirect, false),
       ok = application:set_env(lager, asyncThreshold, 2),
       ok = application:set_env(lager, asyncThresholdWindow, 1),
       ok = application:set_env(lager, handlers, [{?MODULE, info}]),
@@ -1872,7 +1872,7 @@ high_watermark_test_() ->
       fun() ->
          error_logger:tty(false),
          application:load(lager),
-         application:set_env(lager, error_logger_redirect, true),
+         application:set_env(lager, errLoggerRedirect, true),
          application:set_env(lager, handlers, [{lager_test_backend, info}]),
          application:set_env(lager, asyncThreshold, undefined),
          lager:start()
diff --git a/test/lager_test_function_transform.erl b/test/lager_test_function_transform.erl
index 8683363..f94d918 100644
--- a/test/lager_test_function_transform.erl
+++ b/test/lager_test_function_transform.erl
@@ -63,7 +63,7 @@ setup() ->
    ok = error_logger:tty(false),
    ok = rumUtil:safe_application_load(lager),
    ok = application:set_env(lager, handlers, [{lager_test_backend, info}]),
-   ok = application:set_env(lager, error_logger_redirect, false),
+   ok = application:set_env(lager, errLoggerRedirect, false),
    ok = application:unset_env(lager, traces),
    ok = eRum:start(),
    %% There is a race condition between the application start up, lager logging its own