OTP27 support (#11366)

* "maybe" is now a keyword
* Bump horus to 0.2.5 and switch to hex
* Get rid of some deprecated callbacks/functions

Author: mkuratczyk

MODULE.bazel

@@ -188,11 +188,11 @@ erlang_package.hex_package(
     version = "1.3.3",
 )
 
-erlang_package.git_package(
+erlang_package.hex_package(
     name = "horus",
     build_file = "@rabbitmq-server//bazel:BUILD.horus",
-    commit = "253f9af23e539b7370a5105df19dcbb66762b247",
-    repository = "rabbitmq/horus",
+    sha256 = "f75317a5f15dd153395d0ee40401a126a87360af0f995c3377b8042eb222d082",
+    version = "0.2.5",
 )
 
 erlang_package.hex_package(

deps/rabbit/src/rabbit.erl

@@ -1686,7 +1686,7 @@ ensure_working_fhc() ->
                   #{domain => ?RMQLOG_DOMAIN_GLOBAL}),
         ?LOG_INFO("FHC write buffering: ~ts", [WriteBuf],
                   #{domain => ?RMQLOG_DOMAIN_GLOBAL}),
-        Filename = filename:join(code:lib_dir(kernel, ebin), "kernel.app"),
+        Filename = filename:join(code:lib_dir(kernel), "ebin/kernel.app"),
         {ok, Fd} = file_handle_cache:open(Filename, [raw, binary, read], []),
         {ok, _} = file_handle_cache:read(Fd, 1),
         ok = file_handle_cache:close(Fd),

deps/rabbit/src/rabbit_amqqueue.erl

@@ -192,7 +192,7 @@ find_recoverable_queues() ->
               boolean(),
               boolean(),
               rabbit_framing:amqp_table(),
-              rabbit_types:maybe(pid()),
+              rabbit_types:'maybe'(pid()),
               rabbit_types:username()) ->
     {'new' | 'existing' | 'owner_died', amqqueue:amqqueue()} |
     {'new', amqqueue:amqqueue(), rabbit_fifo_client:state()} |
@@ -211,7 +211,7 @@ declare(QueueName, Durable, AutoDelete, Args, Owner, ActingUser) ->
               boolean(),
               boolean(),
               rabbit_framing:amqp_table(),
-              rabbit_types:maybe(pid()),
+              rabbit_types:'maybe'(pid()),
               rabbit_types:username(),
               node() | {'ignore_location', node()}) ->
     {'new' | 'existing' | 'owner_died', amqqueue:amqqueue()} |
@@ -658,7 +658,7 @@ priv_absent(QueueName, QPid, _IsDurable, alive) ->
 
 -spec assert_equivalence
         (amqqueue:amqqueue(), boolean(), boolean(),
-         rabbit_framing:amqp_table(), rabbit_types:maybe(pid())) ->
+         rabbit_framing:amqp_table(), rabbit_types:'maybe'(pid())) ->
             'ok' | rabbit_types:channel_exit() | rabbit_types:connection_exit().
 
 assert_equivalence(Q, DurableDeclare, AutoDeleteDeclare, Args1, Owner) ->

deps/rabbit/src/rabbit_channel.erl

@@ -265,15 +265,15 @@ do(Pid, Method) ->
 
 -spec do
         (pid(), rabbit_framing:amqp_method_record(),
-         rabbit_types:maybe(rabbit_types:content())) ->
+         rabbit_types:'maybe'(rabbit_types:content())) ->
             'ok'.
 
 do(Pid, Method, Content) ->
     rabbit_channel_common:do(Pid, Method, Content).
 
 -spec do_flow
         (pid(), rabbit_framing:amqp_method_record(),
-         rabbit_types:maybe(rabbit_types:content())) ->
+         rabbit_types:'maybe'(rabbit_types:content())) ->
             'ok'.
 
 do_flow(Pid, Method, Content) ->

deps/rabbit/src/rabbit_channel_interceptor.erl

@@ -18,8 +18,8 @@
 -type(method_name() :: rabbit_framing:amqp_method_name()).
 -type(original_method() :: rabbit_framing:amqp_method_record()).
 -type(processed_method() :: rabbit_framing:amqp_method_record()).
--type(original_content() :: rabbit_types:maybe(rabbit_types:content())).
--type(processed_content() :: rabbit_types:maybe(rabbit_types:content())).
+-type(original_content() :: rabbit_types:'maybe'(rabbit_types:content())).
+-type(processed_content() :: rabbit_types:'maybe'(rabbit_types:content())).
 -type(interceptor_state() :: term()).
 
 -callback description() -> [proplists:property()].

deps/rabbit/src/rabbit_fifo_dlx_worker.erl

@@ -33,7 +33,7 @@
 %% gen_server callbacks
 -export([init/1, terminate/2, handle_continue/2,
          handle_cast/2, handle_call/3, handle_info/2,
-         code_change/3, format_status/2]).
+         code_change/3, format_status/1]).
 
 -define(HIBERNATE_AFTER, 4*60*1000).
 
@@ -581,31 +581,32 @@ queue_names(Qs)
   when is_list(Qs) ->
     lists:map(fun amqqueue:get_name/1, Qs).
 
-format_status(_Opt, [_PDict, #state{
-                                queue_ref = QueueRef,
-                                exchange_ref = ExchangeRef,
-                                routing_key = RoutingKey,
-                                dlx_client_state = DlxClientState,
-                                queue_type_state = QueueTypeState,
-                                pendings = Pendings,
-                                settled_ids = SettledIds,
-                                next_out_seq = NextOutSeq,
-                                settle_timeout = SettleTimeout,
-                                timer = Timer,
-                                logged = Logged
-                               }]) ->
-    S = #{queue_ref => QueueRef,
-          exchange_ref => ExchangeRef,
-          routing_key => RoutingKey,
-          dlx_client_state => rabbit_fifo_dlx_client:overview(DlxClientState),
-          queue_type_state => QueueTypeState,
-          pendings => maps:map(fun(_, P) -> format_pending(P) end, Pendings),
-          settled_ids => SettledIds,
-          next_out_seq => NextOutSeq,
-          settle_timeout => SettleTimeout,
-          timer_is_active => Timer =/= undefined,
-          logged => Logged},
-    [{data, [{"State", S}]}].
+format_status(#{state := #state{
+                            queue_ref = QueueRef,
+                            exchange_ref = ExchangeRef,
+                            routing_key = RoutingKey,
+                            dlx_client_state = DlxClientState,
+                            queue_type_state = QueueTypeState,
+                            pendings = Pendings,
+                            settled_ids = SettledIds,
+                            next_out_seq = NextOutSeq,
+                            settle_timeout = SettleTimeout,
+                            timer = Timer,
+                            logged = Logged
+                           }} = Status) ->
+    Status#{state :=
+             #{queue_ref => QueueRef,
+               exchange_ref => ExchangeRef,
+               routing_key => RoutingKey,
+               dlx_client_state => rabbit_fifo_dlx_client:overview(DlxClientState),
+               queue_type_state => QueueTypeState,
+               pendings => maps:map(fun(_, P) -> format_pending(P) end, Pendings),
+               settled_ids => SettledIds,
+               next_out_seq => NextOutSeq,
+               settle_timeout => SettleTimeout,
+               timer_is_active => Timer =/= undefined,
+               logged => Logged}
+           }.
 
 format_pending(#pending{consumed_msg_id = ConsumedMsgId,
                         delivery = _DoNotLogLargeBinary,

deps/rabbit/src/rabbit_networking_store.erl

@@ -13,7 +13,7 @@
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3, format_status/2]).
+         terminate/2, code_change/3]).
 
 -define(SERVER, ?MODULE).
 
@@ -41,6 +41,3 @@ terminate(_Reason, _State) ->
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
-
-format_status(_Opt, Status) ->
-    Status.

deps/rabbit/src/rabbit_tracking_store.erl

@@ -13,7 +13,7 @@
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3, format_status/2]).
+         terminate/2, code_change/3]).
 
 -define(SERVER, ?MODULE).
 
@@ -42,6 +42,3 @@ terminate(_Reason, _State) ->
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
-
-format_status(_Opt, Status) ->
-    Status.

deps/rabbit_common/src/supervisor2.erl

@@ -71,7 +71,7 @@
 
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3, format_status/2]).
+         terminate/2, code_change/3]).
 
 %% For release_handler only
 -export([get_callback_module/1]).
@@ -1606,12 +1606,6 @@ report_progress(Child, SupName) ->
                 logger_formatter=>#{title=>"PROGRESS REPORT"},
                 error_logger=>#{tag=>info_report,type=>progress}}).
 
-format_status(terminate, [_PDict, State]) ->
-    State;
-format_status(_, [_PDict, State]) ->
-    [{data, [{"State", State}]},
-     {supervisor, [{"Callback", State#state.module}]}].
-
 %%%-----------------------------------------------------------------
 %%% Dynamics database access
 dyn_size(#state{dynamics = {Mod,Db}}) ->

deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl

@@ -417,8 +417,7 @@ ensure_rabbitmq_run_secondary_cmd(Config) ->
     end.
 
 ensure_erl_call_cmd(Config) ->
-    ErlCallDir = code:lib_dir(erl_interface, bin),
-    ErlCall = filename:join(ErlCallDir, "erl_call"),
+    ErlCall = filename:join(code:lib_dir(erl_interface), "bin/erl_call"),
     Cmd = [ErlCall],
     case exec(Cmd, [{match_stdout, "Usage: "}]) of
         {ok, _} -> set_config(Config, {erl_call_cmd, ErlCall});