Merge pull request #11704 from rabbitmq/mergify/bp/v4.0.x/pr-11701

Fix queue type consumer arguments (backport #11701)

Author: michaelklishin

deps/rabbit/src/rabbit_classic_queue.erl

@@ -572,7 +572,7 @@ capabilities() ->
                                  true -> [<<"x-queue-leader-locator">>];
                                  false -> []
                              end,
-      consumer_arguments => [<<"x-priority">>, <<"x-credit">>],
+      consumer_arguments => [<<"x-priority">>],
       server_named => true}.
 
 notify_decorators(Q) when ?is_amqqueue(Q) ->

deps/rabbit/src/rabbit_stream_queue.erl

@@ -1267,7 +1267,9 @@ capabilities() ->
       queue_arguments => [<<"x-max-length-bytes">>, <<"x-queue-type">>,
                           <<"x-max-age">>, <<"x-stream-max-segment-size-bytes">>,
                           <<"x-initial-cluster-size">>, <<"x-queue-leader-locator">>],
-      consumer_arguments => [<<"x-stream-offset">>],
+      consumer_arguments => [<<"x-stream-offset">>,
+                             <<"x-stream-filter">>,
+                             <<"x-stream-match-unfiltered">>],
       server_named => false}.
 
 notify_decorators(Q) when ?is_amqqueue(Q) ->