Fix amqp_client & rabbit.snippet tests

Author: LoisSotoLopez

deps/rabbit/test/amqp_client_SUITE.erl

@@ -4380,8 +4380,11 @@ available_messages(QType, Config) ->
 
 incoming_message_interceptors(Config) ->
     Key = ?FUNCTION_NAME,
-    ok = rpc(Config, persistent_term, put, [Key, [{set_header_routing_node, false},
-                                                  {set_header_timestamp, false}]]),
+    ok = rpc(Config,
+             persistent_term,
+             put,
+             [Key, [{rabbit_header_routing_node_interceptor, #{overwrite => false}},
+                    {rabbit_header_timestamp_interceptor, #{overwrite => false}}]]),
     Stream = <<"my stream">>,
     QQName = <<"my quorum queue">>,
     {_, Session, LinkPair} = Init = init(Config),

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1101,7 +1101,7 @@ credential_validator.regexp = ^abc\\d+",
    "message_interceptors.incoming.set_header_timestamp.overwrite = true",
    [{rabbit, [
       {incoming_message_interceptors, [
-        {set_header_timestamp, #{overwrite => true}}
+        {rabbit_header_timestamp_interceptor, #{overwrite => true}}
        ]}
      ]}],
    []},
@@ -1113,8 +1113,8 @@ credential_validator.regexp = ^abc\\d+",
   ",
    [{rabbit, [
       {incoming_message_interceptors, [
-        {set_header_routing_node, #{overwrite => false}},
-        {set_header_timestamp, #{overwrite => false}
+        {rabbit_header_routing_node_interceptor, #{overwrite => false}},
+        {rabbit_header_timestamp_interceptor, #{overwrite => false}}
        ]}
      ]}],
    []},

deps/rabbit/test/mc_unit_SUITE.erl

@@ -348,8 +348,8 @@ amqpl_amqp_bin_amqpl(_Config) ->
     Msg0 = mc:init(mc_amqpl, Content, annotations()),
 
     ok = persistent_term:put(incoming_message_interceptors,
-                             [{set_header_timestamp, false}]),
-    Msg = rabbit_message_interceptor:intercept(Msg0),
+                             [{rabbit_header_timestamp_interceptor, #{overwrite => false}}]),
+    Msg = rabbit_message_interceptor:intercept(Msg0, #{}, incoming),
 
     ?assertEqual(<<"exch">>, mc:exchange(Msg)),
     ?assertEqual([<<"apple">>], mc:routing_keys(Msg)),

deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl

@@ -1764,7 +1764,10 @@ default_queue_type(Config) ->
 
 incoming_message_interceptors(Config) ->
     Key = ?FUNCTION_NAME,
-    ok = rpc(Config, persistent_term, put, [Key, [{set_header_timestamp, false}]]),
+    ok = rpc(Config,
+             persistent_term,
+             put,
+             [Key, [{rabbit_header_timestamp_interceptor, #{overwrite => false}}]]),
     Ch = rabbit_ct_client_helpers:open_channel(Config),
     Payload = ClientId = Topic = atom_to_binary(?FUNCTION_NAME),
     CQName = <<"my classic queue">>,