Merge pull request #1436 from rabbitmq/looking-glass-id-processes

ID processes in Looking Glass and trace more by default

9 files changed, 12 insertions, 1 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index c671438ce8..edb782f9f9 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -383,6 +383,7 @@ force_event_refresh(Ref) ->
 init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost,
       Capabilities, CollectorPid, LimiterPid]) ->
     process_flag(trap_exit, true),
+    ?LG_PROCESS_TYPE(channel),
     ?store_proc_name({ConnName, Channel}),
     ok = pg_local:join(rabbit_channels, self()),
     Flow = case rabbit_misc:get_env(rabbit, mirroring_flow_control, true) of
diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl
index b091451b52..d4fefd548d 100644
--- a/src/rabbit_channel_sup.erl
+++ b/src/rabbit_channel_sup.erl
@@ -88,6 +88,7 @@ start_link({direct, Channel, ClientChannelPid, ConnPid, ConnName, Protocol,
 %%----------------------------------------------------------------------------
 
 init(Type) ->
+    ?LG_PROCESS_TYPE(channel_sup),
     {ok, {{one_for_all, 0, 1}, child_specs(Type)}}.
 
 child_specs({tcp, Sock, Channel, FrameMax, ReaderPid, Protocol, Identity}) ->
diff --git a/src/rabbit_channel_sup_sup.erl b/src/rabbit_channel_sup_sup.erl
index 1ab74f4378..f728250c90 100644
--- a/src/rabbit_channel_sup_sup.erl
+++ b/src/rabbit_channel_sup_sup.erl
@@ -27,6 +27,8 @@
 
 -export([init/1]).
 
+-include("rabbit.hrl").
+
 %%----------------------------------------------------------------------------
 
 -spec start_link() -> rabbit_types:ok_pid_or_error().
@@ -44,6 +46,7 @@ start_channel(Pid, Args) ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
+    ?LG_PROCESS_TYPE(channel_sup_sup),
     {ok, {{simple_one_for_one, 0, 1},
           [{channel_sup, {rabbit_channel_sup, start_link, []},
             temporary, infinity, supervisor, [rabbit_channel_sup]}]}}.
diff --git a/src/rabbit_connection_helper_sup.erl b/src/rabbit_connection_helper_sup.erl
index 8b9d48d4a1..23058ed040 100644
--- a/src/rabbit_connection_helper_sup.erl
+++ b/src/rabbit_connection_helper_sup.erl
@@ -62,4 +62,5 @@ start_queue_collector(SupPid, Identity) ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
+    ?LG_PROCESS_TYPE(connection_helper_sup),
     {ok, {{one_for_one, 10, 10}, []}}.
diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl
index 85bd96733c..4dcfa8dc8a 100644
--- a/src/rabbit_connection_sup.erl
+++ b/src/rabbit_connection_sup.erl
@@ -72,4 +72,5 @@ reader(Pid) ->
 %%--------------------------------------------------------------------------
 
 init([]) ->
+    ?LG_PROCESS_TYPE(connection_sup),
     {ok, {{one_for_all, 0, 1}, []}}.
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 93bacc568d..241654991c 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -334,6 +334,7 @@ ensure_credit_invariant(C) ->
 %%----------------------------------------------------------------------------
 
 init([ProcName]) -> ?store_proc_name(ProcName),
+                    ?LG_PROCESS_TYPE(limiter),
                     {ok, #lim{}}.
 
 prioritise_call(get_prefetch_limit, _From, _Len, _State) -> 9;
diff --git a/src/rabbit_looking_glass.erl b/src/rabbit_looking_glass.erl
index 6cd53dbc23..1e9b2032d8 100644
--- a/src/rabbit_looking_glass.erl
+++ b/src/rabbit_looking_glass.erl
@@ -39,6 +39,7 @@ boot() ->
                 "traces.lz4",
                 maps:from_list([
                     {mode, profile},
+                    {process_dump, true},
                     {running, true},
                     {send, true}]
                 )
@@ -53,4 +54,4 @@ parse_value(Value) ->
 
 connections() ->
     Pids = [Pid || {{conns_sup, _}, Pid} <- ets:tab2list(ranch_server)],
-    [{app, rabbit}, {app, rabbit_common}, {scope, Pids}].
+    ['_', {scope, Pids}].
diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl
index dd8423e7a0..461bcabf11 100644
--- a/src/rabbit_queue_collector.erl
+++ b/src/rabbit_queue_collector.erl
@@ -49,6 +49,7 @@ delete_all(CollectorPid) ->
 %%----------------------------------------------------------------------------
 
 init([ProcName]) ->
+    ?LG_PROCESS_TYPE(queue_collector),
     ?store_proc_name(ProcName),
     {ok, #state{monitors = pmon:new(), delete_from = undefined}}.
 
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 6e2ed2a889..d66cf5f3a5 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -196,6 +196,7 @@ shutdown(Pid, Explanation) ->
     gen_server:call(Pid, {shutdown, Explanation}, infinity).
 
 init(Parent, HelperSup, Ref, Sock) ->
+    ?LG_PROCESS_TYPE(reader),
     RealSocket = rabbit_net:unwrap_socket(Sock),
     rabbit_networking:accept_ack(Ref, RealSocket),
     Deb = sys:debug_options([]),