[skip ci] Remove rabbit_log_shovel, use LOG_ macros directly

Author: mkuratczyk

deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl

@@ -36,7 +36,8 @@
 -import(rabbit_misc, [pget/2, pget/3]).
 -import(rabbit_data_coercion, [to_binary/1]).
 
--define(INFO(Text, Args), rabbit_log_shovel:info(Text, Args)).
+-include_lib("kernel/include/logger.hrl").
+
 -define(LINK_CREDIT_TIMEOUT, 20_000).
 
 -type state() :: rabbit_shovel_behaviour:state().
@@ -194,7 +195,7 @@ handle_source({amqp10_event, {connection, Conn, opened}},
 handle_source({amqp10_event, {connection, Conn, {closed, Why}}},
               #{source := #{current := #{conn := Conn}},
                 name := Name}) ->
-    ?INFO("Shovel ~ts source connection closed. Reason: ~tp", [Name, Why]),
+    ?LOG_INFO("Shovel ~ts source connection closed. Reason: ~tp", [Name, Why]),
     {stop, {inbound_conn_closed, Why}};
 handle_source({amqp10_event, {session, Sess, begun}},
               State = #{source := #{current := #{session := Sess}}}) ->
@@ -231,7 +232,7 @@ handle_dest({amqp10_disposition, {Result, Tag}},
             {#{Tag := IncomingTag}, rejected} ->
                 {1, rabbit_shovel_behaviour:nack(IncomingTag, false, State1)};
             _ -> % not found - this should ideally not happen
-                rabbit_log_shovel:warning("Shovel ~ts amqp10 destination disposition tag not found: ~tp",
+                ?LOG_WARNING("Shovel ~ts amqp10 destination disposition tag not found: ~tp",
                                           [Name, Tag]),
                 {0, State1}
         end,
@@ -242,7 +243,7 @@ handle_dest({amqp10_event, {connection, Conn, opened}},
 handle_dest({amqp10_event, {connection, Conn, {closed, Why}}},
             #{name := Name,
               dest := #{current := #{conn := Conn}}}) ->
-    ?INFO("Shovel ~ts destination connection closed. Reason: ~tp", [Name, Why]),
+    ?LOG_INFO("Shovel ~ts destination connection closed. Reason: ~tp", [Name, Why]),
     {stop, {outbound_conn_died, Why}};
 handle_dest({amqp10_event, {session, Sess, begun}},
             State = #{dest := #{current := #{session := Sess}}}) ->

deps/rabbitmq_shovel/src/rabbit_log_shovel.erl

@@ -34,6 +34,8 @@
          incr_forwarded/1
         ]).
 
+-include_lib("kernel/include/logger.hrl").
+
 -type tag() :: non_neg_integer().
 -type uri() :: string() | binary().
 -type ack_mode() :: 'no_ack' | 'on_confirm' | 'on_publish'.
@@ -189,7 +191,7 @@ decr_remaining(N, State = #{source := #{remaining := M} = Src,
     case M > N of
         true  -> State#{source => Src#{remaining => M - N}};
         false ->
-            rabbit_log_shovel:info("shutting down Shovel '~ts', no messages left to transfer", [Name]),
-            rabbit_log_shovel:debug("shutting down Shovel '~ts', no messages left to transfer. Shovel state: ~tp", [Name, State]),
+            ?LOG_INFO("shutting down Shovel '~ts', no messages left to transfer", [Name]),
+            ?LOG_DEBUG("shutting down Shovel '~ts', no messages left to transfer. Shovel state: ~tp", [Name, State]),
             exit({shutdown, autodelete})
     end.

deps/rabbitmq_shovel/src/rabbit_shovel_behaviour.erl

@@ -15,6 +15,7 @@
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include("rabbit_shovel.hrl").
 -include_lib("kernel/include/logger.hrl").
+-include_lib("logging.hrl").
 -define(SUPERVISOR, ?MODULE).
 
 start_link(Name, Config) ->
@@ -35,6 +36,7 @@ maybe_start_link(_, Name, Config) ->
 %%----------------------------------------------------------------------------
 
 init([Name, Config0]) ->
+    logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_SHOVEL}),
     Config  = rabbit_data_coercion:to_proplist(Config0),
     Delay   = pget(<<"reconnect-delay">>, Config, ?DEFAULT_RECONNECT_DELAY),
     case Name of

deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup.erl

@@ -14,6 +14,8 @@
 -import(rabbit_misc, [pget/2]).
 -import(rabbit_data_coercion, [to_map/1, to_list/1]).
 
+-include_lib("kernel/include/logger.hrl").
+-include_lib("logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -define(SUPERVISOR, ?MODULE).
 
@@ -37,10 +39,10 @@ adjust(Name, Def) ->
     start_child(Name, Def).
 
 start_child({VHost, ShovelName} = Name, Def) ->
-    rabbit_log_shovel:debug("Asked to start a dynamic Shovel named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
+    ?LOG_DEBUG("Asked to start a dynamic Shovel named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
     LockId = rabbit_shovel_locks:lock(Name),
     cleanup_specs(),
-    rabbit_log_shovel:debug("Starting a mirrored supervisor named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
+    ?LOG_DEBUG("Starting a mirrored supervisor named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
     case child_exists(Name)
         orelse mirrored_supervisor:start_child(
            ?SUPERVISOR,
@@ -68,7 +70,7 @@ child_exists(Name) ->
               mirrored_supervisor:which_children(?SUPERVISOR)).
 
 stop_child({VHost, ShovelName} = Name) ->
-    rabbit_log_shovel:debug("Asked to stop a dynamic Shovel named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
+    ?LOG_DEBUG("Asked to stop a dynamic Shovel named '~ts' in virtual host '~ts'", [ShovelName, VHost]),
     LockId = rabbit_shovel_locks:lock(Name),
     case get({shovel_worker_autodelete, Name}) of
         true -> ok; %% [1]
@@ -136,6 +138,7 @@ cleanup_specs() ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
+    logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_SHOVEL}),
     {ok, {{one_for_one, 3, 10}, []}}.
 
 id({VHost, ShovelName} = Name)

deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl

@@ -25,6 +25,9 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 
+-include_lib("kernel/include/logger.hrl").
+-include("logging.hrl").
+
 -define(SERVER, ?MODULE).
 -define(ETS_NAME, ?MODULE).
 -define(CHECK_FREQUENCY, 60000).
@@ -113,6 +116,7 @@ get_status_table() ->
     gen_server:call(?SERVER, get_status_table).
 
 init([]) ->
+    logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_SHOVEL}),
     ?ETS_NAME = ets:new(?ETS_NAME,
                         [named_table, {keypos, #entry.name}, private]),
     {ok, ensure_timer(#state{})}.
@@ -185,7 +189,7 @@ handle_info(check, State) ->
         rabbit_shovel_dyn_worker_sup_sup:cleanup_specs()
     catch
         C:E ->
-            rabbit_log_shovel:warning("Recurring shovel spec clean up failed with ~p:~p", [C, E])
+            ?LOG_WARNING("Recurring shovel spec clean up failed with ~p:~p", [C, E])
     end,
     {noreply, ensure_timer(State)};
 handle_info(_Info, State) ->

deps/rabbitmq_shovel/src/rabbit_shovel_status.erl

@@ -89,7 +89,7 @@ restart_shovel(VHost, Name) ->
         not_found ->
             {error, not_found};
         _Obj ->
-            rabbit_log_shovel:info("Shovel '~ts' in virtual host '~ts' will be restarted", [Name, VHost]),
+            ?LOG_INFO("Shovel '~ts' in virtual host '~ts' will be restarted", [Name, VHost]),
             ok = rabbit_shovel_dyn_worker_sup_sup:stop_child({VHost, Name}),
             {ok, _} = rabbit_shovel_dyn_worker_sup_sup:start_link(),
             ok