Remove user and consumer tag.

2 files changed, 17 insertions, 31 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index b9782b2b..62541536 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -264,8 +264,7 @@ handle_cast({deliver, ConsumerTag, AckRequired,
                                    routing_keys = [RoutingKey | _CcRoutes],
                                    content = Content}}},
             State = #ch{writer_pid = WriterPid,
-                        next_tag   = DeliveryTag,
-                        user       = User}) ->
+                        next_tag = DeliveryTag}) ->
     State1 = lock_message(AckRequired,
                           ack_record(DeliveryTag, ConsumerTag, Msg),
                           State),
@@ -282,7 +281,7 @@ handle_cast({deliver, ConsumerTag, AckRequired,
                          true  -> deliver;
                          false -> deliver_no_ack
                      end, State),
-    rabbit_trace:tap_trace_out(Msg, ConsumerTag, User),
+    rabbit_trace:tap_trace_out(Msg),
     noreply(State1#ch{next_tag = DeliveryTag + 1});
 
 handle_cast(emit_stats, State = #ch{stats_timer = StatsTimer}) ->
@@ -589,8 +588,7 @@ handle_method(#'basic.publish'{exchange    = ExchangeNameBin,
                                immediate   = Immediate},
               Content, State = #ch{virtual_host    = VHostPath,
                                    transaction_id  = TxnKey,
-                                   confirm_enabled = ConfirmEnabled,
-                                   user            = User}) ->
+                                   confirm_enabled = ConfirmEnabled}) ->
     ExchangeName = rabbit_misc:r(VHostPath, exchange, ExchangeNameBin),
     check_write_permitted(ExchangeName, State),
     Exchange = rabbit_exchange:lookup_or_die(ExchangeName),
@@ -607,7 +605,7 @@ handle_method(#'basic.publish'{exchange    = ExchangeNameBin,
         end,
     case rabbit_basic:message(ExchangeName, RoutingKey, DecodedContent) of
         {ok, Message} ->
-            rabbit_trace:tap_trace_in(Message, User),
+            rabbit_trace:tap_trace_in(Message),
             {RoutingRes, DeliveredQPids} =
                 rabbit_exchange:publish(
                   Exchange,
@@ -657,8 +655,7 @@ handle_method(#'basic.get'{queue = QueueNameBin,
                            no_ack = NoAck},
               _, State = #ch{writer_pid = WriterPid,
                              conn_pid   = ConnPid,
-                             next_tag   = DeliveryTag,
-                             user       = User}) ->
+                             next_tag   = DeliveryTag}) ->
     QueueName = expand_queue_name_shortcut(QueueNameBin, State),
     check_read_permitted(QueueName, State),
     case rabbit_amqqueue:with_exclusive_access_or_die(
@@ -677,7 +674,7 @@ handle_method(#'basic.get'{queue = QueueNameBin,
                                  true  -> get_no_ack;
                                  false -> get
                              end, State),
-            rabbit_trace:tap_trace_out(Msg, none, User),
+            rabbit_trace:tap_trace_out(Msg),
             ok = rabbit_writer:send_command(
                    WriterPid,
                    #'basic.get_ok'{delivery_tag = DeliveryTag,
diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl
index 1e3553cb..2e16b5d0 100644
--- a/src/rabbit_trace.erl
+++ b/src/rabbit_trace.erl
@@ -16,7 +16,7 @@
 
 -module(rabbit_trace).
 
--export([tap_trace_in/2, tap_trace_out/3]).
+-export([tap_trace_in/1, tap_trace_out/1]).
 
 -include("rabbit.hrl").
 -include("rabbit_framing.hrl").
@@ -25,11 +25,8 @@
 
 -ifdef(use_specs).
 
--spec(tap_trace_in/2 :: (rabbit_types:basic_message(), rabbit_types:user())
-                        -> 'ok').
--spec(tap_trace_out/3 :: (rabbit_amqqueue:qmsg(),
-                          rabbit_types:maybe(rabbit_types:ctag()),
-                          rabbit_types:user()) -> 'ok').
+-spec(tap_trace_in/1 :: (rabbit_types:basic_message()) -> 'ok').
+-spec(tap_trace_out/1 :: (rabbit_amqqueue:qmsg()) -> 'ok').
 
 -endif.
 
@@ -37,11 +34,11 @@
 
 tap_trace_in(Message = #basic_message{
                exchange_name = #resource{virtual_host = VHost,
-                                         name         = XName}}, User) ->
+                                         name         = XName}}) ->
     check_trace(
       XName, VHost,
       fun (TraceExchange) ->
-              {EncodedMetadata, Payload} = message_to_table(Message, User),
+              {EncodedMetadata, Payload} = message_to_table(Message),
               publish(TraceExchange, VHost, <<"publish">>, XName,
                       EncodedMetadata, Payload)
       end).
@@ -49,20 +46,14 @@ tap_trace_in(Message = #basic_message{
 tap_trace_out({#resource{name = QName}, _QPid, _QMsgId, Redelivered,
                Message = #basic_message{
                  exchange_name = #resource{virtual_host = VHost,
-                                           name         = XName}}},
-              ConsumerTagOrNone, User) ->
+                                           name         = XName}}}) ->
     check_trace(
       XName, VHost,
       fun (TraceExchange) ->
               RedeliveredNum = case Redelivered of true -> 1; false -> 0 end,
-              {EncodedMetadata, Payload} = message_to_table(Message, User),
-              Fields0 = [{<<"redelivered">>, signedint, RedeliveredNum}]
+              {EncodedMetadata, Payload} = message_to_table(Message),
+              Fields = [{<<"redelivered">>, signedint, RedeliveredNum}]
                   ++ EncodedMetadata,
-              Fields = case ConsumerTagOrNone of
-                           none -> Fields0;
-                           CTag -> [{<<"consumer_tag">>, longstr, CTag} |
-                                    Fields0]
-                       end,
               publish(TraceExchange, VHost, <<"deliver">>, QName,
                       Fields, Payload)
       end).
@@ -86,9 +77,8 @@ publish(TraceExchange, VHost, RKPrefix, RKSuffix, Table, Payload) ->
     ok.
 
 message_to_table(#basic_message{exchange_name = #resource{name = XName},
-                                routing_keys  = RoutingKeys,
-                                content       = Content},
-                 #user{username = Username}) ->
+                                routing_keys = RoutingKeys,
+                                content = Content}) ->
     #content{properties            = Props,
              payload_fragments_rev = PFR} =
         rabbit_binary_parser:ensure_content_decoded(Content),
@@ -102,8 +92,7 @@ message_to_table(#basic_message{exchange_name = #resource{name = XName},
                          end,
                   {NewL, Ix + 1}
           end, {[], 2}, record_info(fields, 'P_basic')),
-    {[{<<"username">>,      longstr, Username},
-      {<<"exchange_name">>, longstr, XName},
+    {[{<<"exchange_name">>, longstr, XName},
       {<<"routing_keys">>,  array,   [{longstr, K} || K <- RoutingKeys]},
       {<<"properties">>,    table,   PropsTable},
       {<<"node">>,          longstr, a2b(node())}],