root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Keep CC header after dead-lettering without routing key 

To avoid mutating the message.

See https://rabbitmq.com/dlx.html#effects
This commit is contained in:
Arnaud Cogoluègnes 2023-09-08 15:08:05 +02:00
parent 9199935c5b
commit 11d528d748
No known key found for this signature in database
GPG Key ID: D5C8C4DFAD43AFA8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/rabbit/test/dead_lettering_SUITE.erl vendored
View File

@ -1214,12 +1214,15 @@ dead_letter_headers_CC(Config) ->
multiple = false, multiple = false,
requeue = false}), requeue = false}),
wait_for_messages(Config, [[DLXQName, <<"2">>, <<"1">>, <<"1">>]]), wait_for_messages(Config, [[DLXQName, <<"2">>, <<"1">>, <<"1">>]]),
{#'basic.get_ok'{}, #amqp_msg{payload = P1, {#'basic.get_ok'{delivery_tag = DTag2}, #amqp_msg{payload = P1,
props = #'P_basic'{headers = Headers3}}} = props = #'P_basic'{headers = Headers3}}} =
amqp_channel:call(Ch, #'basic.get'{queue = DLXQName}), amqp_channel:call(Ch, #'basic.get'{queue = DLXQName}),
consume_empty(Ch, QName), consume_empty(Ch, QName),
?assertEqual({array, [{longstr, DLXQName}]}, rabbit_misc:table_lookup(Headers3, <<"CC">>)), ?assertEqual({array, [{longstr, DLXQName}]}, rabbit_misc:table_lookup(Headers3, <<"CC">>)),
?assertMatch({array, _}, rabbit_misc:table_lookup(Headers3, <<"x-death">>)). ?assertMatch({array, _}, rabbit_misc:table_lookup(Headers3, <<"x-death">>)),
amqp_channel:cast(Ch, #'basic.ack'{delivery_tag = DTag2,
multiple = true}),
wait_for_messages(Config, [[DLXQName, <<"0">>, <<"0">>, <<"0">>]]).
%% 15) CC header is removed when routing key is specified %% 15) CC header is removed when routing key is specified
dead_letter_headers_CC_with_routing_key(Config) -> dead_letter_headers_CC_with_routing_key(Config) ->
@ -1230,7 +1233,6 @@ dead_letter_headers_CC_with_routing_key(Config) ->
Durable = ?config(queue_durable, Config), Durable = ?config(queue_durable, Config),
DLXExchange = ?config(dlx_exchange, Config), DLXExchange = ?config(dlx_exchange, Config),
%% Do not use a specific key for dead lettering, the CC header is passed
DeadLetterArgs = [{<<"x-dead-letter-routing-key">>, longstr, DLXQName}, DeadLetterArgs = [{<<"x-dead-letter-routing-key">>, longstr, DLXQName},
{<<"x-dead-letter-exchange">>, longstr, DLXExchange}], {<<"x-dead-letter-exchange">>, longstr, DLXExchange}],
#'exchange.declare_ok'{} = amqp_channel:call(Ch, #'exchange.declare'{exchange = DLXExchange}), #'exchange.declare_ok'{} = amqp_channel:call(Ch, #'exchange.declare'{exchange = DLXExchange}),
@ -1267,10 +1269,9 @@ dead_letter_headers_CC_with_routing_key(Config) ->
props = #'P_basic'{headers = Headers3}}} = props = #'P_basic'{headers = Headers3}}} =
amqp_channel:call(Ch, #'basic.get'{queue = DLXQName}), amqp_channel:call(Ch, #'basic.get'{queue = DLXQName}),
consume_empty(Ch, QName), consume_empty(Ch, QName),
%% TODO: commented out assert, %% we keep the CC header as of RabbitMQ 3.13 (with message containers)
%% this only checks that the message was mutated, which is bad not that %% to avoid mutating the message
%% it wasn't included in routing ?assertMatch({array, _}, rabbit_misc:table_lookup(Headers3, <<"CC">>)),
% ?assertEqual(undefined, rabbit_misc:table_lookup(Headers3, <<"CC">>)),
?assertMatch({array, _}, rabbit_misc:table_lookup(Headers3, <<"x-death">>)). ?assertMatch({array, _}, rabbit_misc:table_lookup(Headers3, <<"x-death">>)).
%% 16) the BCC header will always be removed %% 16) the BCC header will always be removed