Merge branch 'main' into message-interceptors

Author: LoisSotoLopez

deps/rabbit/src/rabbit_amqp_management.erl

@@ -127,15 +127,15 @@ handle_http_req(HttpMethod = <<"PUT">>,
     PermCache1 = check_resource_access(QName, configure, User, PermCache0),
     rabbit_core_metrics:queue_declared(QName),
 
-    {Q1, NumMsgs, NumConsumers, StatusCode, PermCache} =
     case rabbit_amqqueue:with(
            QName,
            fun(Q) ->
                    try rabbit_amqqueue:assert_equivalence(
                          Q, Durable, AutoDelete, QArgs, Owner) of
                        ok ->
                            {ok, Msgs, Consumers} = rabbit_amqqueue:stat(Q),
-                           {ok, {Q, Msgs, Consumers, <<"200">>, PermCache1}}
+                           RespPayload = encode_queue(Q, Msgs, Consumers),
+                           {ok, {<<"200">>, RespPayload, {PermCache1, TopicPermCache}}}
                    catch exit:#amqp_error{name = precondition_failed,
                                           explanation = Expl} ->
                              throw(<<"409">>, Expl, []);
@@ -146,23 +146,26 @@ handle_http_req(HttpMethod = <<"PUT">>,
         {ok, Result} ->
             Result;
         {error, not_found} ->
-            PermCache2 = check_dead_letter_exchange(QName, QArgs, User, PermCache1),
+            PermCache = check_dead_letter_exchange(QName, QArgs, User, PermCache1),
+            PermCaches = {PermCache, TopicPermCache},
             try rabbit_amqqueue:declare(
                   QName, Durable, AutoDelete, QArgs, Owner, Username) of
                 {new, Q} ->
                     rabbit_core_metrics:queue_created(QName),
-                    {Q, 0, 0, <<"201">>, PermCache2};
+                    RespPayload = encode_queue(Q, 0, 0),
+                    {<<"201">>, RespPayload, PermCaches};
                 {owner_died, Q} ->
                     %% Presumably our own days are numbered since the
                     %% connection has died. Pretend the queue exists though,
                     %% just so nothing fails.
-                    {Q, 0, 0, <<"201">>, PermCache2};
+                    RespPayload = encode_queue(Q, 0, 0),
+                    {<<"201">>, RespPayload, PermCaches};
                 {absent, Q, Reason} ->
                     absent(Q, Reason);
                 {existing, _Q} ->
                     %% Must have been created in the meantime. Loop around again.
                     handle_http_req(HttpMethod, PathSegments, Query, ReqPayload,
-                                    Vhost, User, ConnPid, {PermCache2, TopicPermCache});
+                                    Vhost, User, ConnPid, PermCaches);
                 {error, queue_limit_exceeded, Reason, ReasonArgs} ->
                     throw(<<"403">>,
                           Reason,
@@ -177,10 +180,7 @@ handle_http_req(HttpMethod = <<"PUT">>,
             end;
         {error, {absent, Q, Reason}} ->
             absent(Q, Reason)
-    end,
-
-    RespPayload = encode_queue(Q1, NumMsgs, NumConsumers),
-    {StatusCode, RespPayload, {PermCache, TopicPermCache}};
+    end;
 
 handle_http_req(<<"PUT">>,
                 [<<"exchanges">>, XNameBinQuoted],

deps/rabbit/src/rabbit_prelaunch_logging.erl

@@ -527,12 +527,7 @@ configure_logger(Context) ->
     %% We can now install the new handlers. The function takes care of
     %% removing previously configured handlers (after installing the new
     %% ones to ensure we don't loose a message).
-    ok = install_handlers(Handlers),
-
-    %% Let's log a message per log level (if debug logging is enabled). This
-    %% is handy if the user wants to verify the configuration is what he
-    %% expects.
-    ok = maybe_log_test_messages(LogConfig3).
+    ok = install_handlers(Handlers).
 
 -spec get_log_configuration_from_app_env() -> log_config().
 
@@ -1690,34 +1685,3 @@ get_less_severe_level(LevelA, LevelB) ->
         lt -> LevelA;
         _  -> LevelB
     end.
-
--spec maybe_log_test_messages(log_config()) -> ok.
-
-maybe_log_test_messages(
-  #{per_category := #{prelaunch := #{level := debug}}}) ->
-    log_test_messages();
-maybe_log_test_messages(
-  #{global := #{level := debug}}) ->
-    log_test_messages();
-maybe_log_test_messages(_) ->
-    ok.
-
--spec log_test_messages() -> ok.
-
-log_test_messages() ->
-    ?LOG_DEBUG("Logging: testing debug log level",
-               #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_INFO("Logging: testing info log level",
-              #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_NOTICE("Logging: testing notice log level",
-                #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_WARNING("Logging: testing warning log level",
-                 #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_ERROR("Logging: testing error log level",
-               #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_CRITICAL("Logging: testing critical log level",
-                  #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_ALERT("Logging: testing alert log level",
-               #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
-    ?LOG_EMERGENCY("Logging: testing emergency log level",
-                   #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}).

deps/rabbit/test/amqp_jms_SUITE_data/pom.xml

@@ -8,12 +8,12 @@
   <name>rabbitmq-amqp-jms-tests</name>
   <url>https://www.rabbitmq.com</url>
   <properties>
-    <junit.jupiter.version>5.12.1</junit.jupiter.version>
+    <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <assertj.version>3.27.3</assertj.version>
     <qpid-jms-client.version>2.7.0</qpid-jms-client.version>
     <amqp-client.version>[0.6.0-SNAPSHOT,)</amqp-client.version>
     <logback.version>1.5.18</logback.version>
-    <spotless.version>2.44.3</spotless.version>
+    <spotless.version>2.44.4</spotless.version>
     <google-java-format.version>1.26.0</google-java-format.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>

deps/rabbitmq_amqp_client/test/management_SUITE.erl

@@ -52,6 +52,7 @@ groups() ->
        bad_exchange_property,
        bad_exchange_type,
        get_queue_not_found,
+       declare_queues_concurrently,
        declare_queue_default_queue_type,
        declare_queue_empty_name,
        declare_queue_line_feed,
@@ -432,6 +433,40 @@ get_queue_not_found(Config) ->
                  amqp10_msg:body(Resp)),
     ok = cleanup(Init).
 
+declare_queues_concurrently(Config) ->
+    NumQueues = 5,
+    {Pid1, Ref1} = spawn_monitor(?MODULE, declare_queues, [Config, NumQueues]),
+    {Pid2, Ref2} = spawn_monitor(?MODULE, declare_queues, [Config, NumQueues]),
+    receive {'DOWN', Ref1, process, Pid1, Reason1} ->
+                ?assertEqual(normal, Reason1)
+    end,
+    receive {'DOWN', Ref2, process, Pid2, Reason2} ->
+                ?assertEqual(normal, Reason2)
+    end,
+
+    ?assertEqual(NumQueues, count_queues(Config)),
+
+    Init = {_, LinkPair} = init(Config),
+    lists:foreach(fun(N) ->
+                          Bin = integer_to_binary(N),
+                          QName = <<"queue-", Bin/binary>>,
+                          {ok, _} = rabbitmq_amqp_client:delete_queue(LinkPair, QName)
+                  end, lists:seq(1, NumQueues)),
+    ok = cleanup(Init).
+
+declare_queues(Config, Num) ->
+    Init = {_, LinkPair} = init(Config),
+    ok = declare_queues0(LinkPair, Num),
+    ok = cleanup(Init).
+
+declare_queues0(_LinkPair, 0) ->
+    ok;
+declare_queues0(LinkPair, Left) ->
+    Bin = integer_to_binary(Left),
+    QName = <<"queue-", Bin/binary>>,
+    ?assertMatch({ok, _}, rabbitmq_amqp_client:declare_queue(LinkPair, QName, #{})),
+    declare_queues0(LinkPair, Left - 1).
+
 declare_queue_default_queue_type(Config) ->
     Node = get_node_config(Config, 0, nodename),
     Vhost = QName = atom_to_binary(?FUNCTION_NAME),
@@ -871,11 +906,11 @@ pipeline(Config) ->
     %% because RabbitMQ grants us 8 link credits initially.
     Num = 8,
     pipeline0(Num, LinkPair, <<"PUT">>, {map, []}),
-    eventually(?_assertEqual(Num, rpc(Config, rabbit_amqqueue, count, [])), 200, 20),
+    eventually(?_assertEqual(Num, count_queues(Config)), 200, 20),
     flush(queues_created),
 
     pipeline0(Num, LinkPair, <<"DELETE">>, null),
-    eventually(?_assertEqual(0, rpc(Config, rabbit_amqqueue, count, [])), 200, 20),
+    eventually(?_assertEqual(0, count_queues(Config)), 200, 20),
     flush(queues_deleted),
 
     ok = cleanup(Init).
@@ -1127,3 +1162,6 @@ gen_server_state(Pid) ->
     L1 = lists:last(L0),
     {data, L2} = lists:last(L1),
     proplists:get_value("State", L2).
+
+count_queues(Config) ->
+    rpc(Config, rabbit_amqqueue, count, []).

deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot/pom.xml

@@ -35,7 +35,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
     </properties>
 
     <groupId>com.rabbitmq.examples</groupId>

deps/rabbitmq_mqtt/test/java_SUITE_data/pom.xml

@@ -16,14 +16,14 @@
     <paho.v5.version>[1.2.5,)</paho.v5.version>
     <paho.v3.version>[1.2.5,)</paho.v3.version>
     <amqp-client.version>5.25.0</amqp-client.version>
-    <junit.version>5.12.1</junit.version>
+    <junit.version>5.12.2</junit.version>
     <assertj.version>3.27.3</assertj.version>
     <logback.version>1.2.13</logback.version>
     <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
     <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
     <groovy.version>2.4.21</groovy.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-    <spotless.version>2.44.3</spotless.version>
+    <spotless.version>2.44.4</spotless.version>
     <google-java-format.version>1.17.0</google-java-format.version>
     <test-keystore.ca>${project.build.directory}/ca.keystore</test-keystore.ca>
     <test-keystore.password>bunnychow</test-keystore.password>

deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml

@@ -27,12 +27,12 @@
 
     <properties>
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <assertj.version>3.27.3</assertj.version>
         <logback.version>1.2.13</logback.version>
         <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-        <spotless.version>2.44.3</spotless.version>
+        <spotless.version>2.44.4</spotless.version>
         <google-java-format.version>1.17.0</google-java-format.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml

@@ -27,15 +27,15 @@
 
     <properties>
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <assertj.version>3.27.3</assertj.version>
         <logback.version>1.2.13</logback.version>
         <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-        <spotless.version>2.44.3</spotless.version>
+        <spotless.version>2.44.4</spotless.version>
         <google-java-format.version>1.18.1</google-java-format.version>
         <okhttp.version>4.12.0</okhttp.version>
-        <gson.version>2.12.1</gson.version>
+        <gson.version>2.13.0</gson.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

rabbitmq-components.mk

@@ -49,9 +49,9 @@ dep_jose = hex 1.11.10
 dep_khepri = hex 0.17.1
 dep_khepri_mnesia_migration = hex 0.8.0
 dep_meck = hex 1.0.0
-dep_osiris = git https://github.com/rabbitmq/osiris v1.8.6
+dep_osiris = git https://github.com/rabbitmq/osiris v1.8.7
 dep_prometheus = hex 4.11.0
-dep_ra = hex 2.16.7
+dep_ra = hex 2.16.8
 dep_ranch = hex 2.2.0
 dep_recon = hex 2.5.6
 dep_redbug = hex 2.0.7

release-notes/4.1.0.md

@@ -1,6 +1,6 @@
-## RabbitMQ 4.1.0-rc.1
+## RabbitMQ 4.1.0-rc.2
 
-RabbitMQ 4.1.0-rc.1 is a candidate of a new feature release.
+RabbitMQ 4.1.0-rc.2 is a candidate of a new feature release.
 
 See Compatibility Notes below to learn about **breaking or potentially breaking changes** in this release.
 
@@ -229,6 +229,11 @@ This section can be incomplete and will be expanded as 4.1 approaches its releas
 
    GitHub issues: [#12801](https://github.com/rabbitmq/rabbitmq-server/pull/12801), [#12809](https://github.com/rabbitmq/rabbitmq-server/pull/12809)
 
+ * Quorum queue's [continuous membership reconciliation mechanism](https://www.rabbitmq.com/docs/quorum-queues#replica-reconciliation) (CMR) efficiency
+   and resilience improvements.
+
+   GitHub issue: [#13703](https://github.com/rabbitmq/rabbitmq-server/pull/13703)
+
  * AMQP 1.0 and AMQP 0-9-1 connections now produce more specific error messages when an incorrect data is sent
    by the client during connection negotiation.
 
@@ -544,6 +549,11 @@ This section can be incomplete and will be expanded as 4.1 approaches its releas
 
    GitHub issue: [#13657](https://github.com/rabbitmq/rabbitmq-server/pull/13657)
 
+ * A TCP connection to the stream protocol port that sent no data (e.g. a TCP load balancer check)
+   produced a harmless but scary looking exception in the log.
+
+   GitHub issue: [#13701](https://github.com/rabbitmq/rabbitmq-server/pull/13674)
+
 
 ### OAuth 2 AuthN and AuthZ Plugin
 
@@ -613,6 +623,10 @@ This section can be incomplete and will be expanded as 4.1 approaches its releas
 
    GitHub issue: [#12713](https://github.com/rabbitmq/rabbitmq-server/pull/12713)
 
+ * Federation status command and HTTP API endpoint could run into an exception.
+
+   GitHub issue: [#13701](https://github.com/rabbitmq/rabbitmq-server/pull/13701)
+
 
 ### Shovel Plugin
 
@@ -728,8 +742,10 @@ This section can be incomplete and will be expanded as 4.1 approaches its releas
 
 ### Dependency Changes
 
- * `ra` was upgraded to [`2.16.6`](https://github.com/rabbitmq/ra/releases)
- * `osiris` was upgraded to [`1.8.6`](https://github.com/rabbitmq/osiris/releases)
+ * `ra` was upgraded to [`2.16.8`](https://github.com/rabbitmq/ra/releases)
+ * `osiris` was upgraded to [`1.8.7`](https://github.com/rabbitmq/osiris/releases)
+ * `khepri` was upgraded to [`0.16.0`](https://github.com/rabbitmq/khepri/releases)
+ * `khepri_mnesia_migration` was upgraded to [`0.7.2`](https://github.com/rabbitmq/khepri_mnesia_migration/releases)
  * `observer_cli` was upgraded to [`1.8.2`](https://github.com/zhongwencool/observer_cli/releases)
  * `eetcd` was upgraded to [`0.5.0`](https://github.com/zhongwencool/eetcd/releases)
  * `gun` was upgraded to [`2.1.0`](https://github.com/ninenines/gun/releases)