Merge pull request #8873 from rabbitmq/mergify/bp/v3.10.x/pr-8807

Add elixir 1.15.2 (backport #8748) (backport #8807)

Author: HoloRin

MODULE.bazel

@@ -31,7 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.10.5",
+    version = "3.11.1",
 )
 
 bazel_dep(
@@ -105,6 +105,12 @@ elixir_config.internal_elixir_from_github_release(
     version = "1.14.5",
 )
 
+elixir_config.internal_elixir_from_github_release(
+    name = "1_15",
+    sha256 = "3cfadca57c3092ccbd3ec3f17e5eab529bbd2946f50e4941a903c55c39e3c5f5",
+    version = "1.15.2",
+)
+
 use_repo(
     elixir_config,
     "elixir_config",
@@ -126,6 +132,7 @@ register_toolchains(
     "@elixir_config//external:toolchain",
     "@elixir_config//1_13:toolchain",
     "@elixir_config//1_14:toolchain",
+    "@elixir_config//1_15:toolchain",
 )
 
 erlang_package = use_extension(
@@ -389,6 +396,8 @@ erlang_dev_package.hex_package(
     build_file = "@rabbitmq-server//bazel:BUILD.amqp",
     sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
     version = "2.1.1",
+    patch_args = ["-p1"],
+    patches = ["@rabbitmq-server//bazel:amqp.patch"],
 )
 
 erlang_dev_package.git_package(
@@ -440,8 +449,8 @@ erlang_dev_package.hex_package(
 erlang_dev_package.hex_package(
     name = "x509",
     build_file = "@rabbitmq-server//bazel:BUILD.x509",
-    sha256 = "5ff9c79e77d64a62ccffd90aaeb23e8f5b6e47844ef7bc8fed931ecf238662e0",
-    version = "0.7.0",
+    sha256 = "3604125d6a0171da6e8a935810b58c999fccab0e3d20b2ed28d97fa2d9e2f6b4",
+    version = "0.8.7",
 )
 
 use_repo(

WORKSPACE

@@ -19,7 +19,7 @@ rules_pkg_dependencies()
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.10.5",
+    tag = "3.11.1",
 )
 
 load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")
@@ -175,6 +175,11 @@ elixir_config(
             sha256 = "2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd",
             version = "1.14.5",
         ),
+        internal_elixir_from_github_release(
+            name = "1_15",
+            sha256 = "3cfadca57c3092ccbd3ec3f17e5eab529bbd2946f50e4941a903c55c39e3c5f5",
+            version = "1.15.2",
+        ),
     ],
     rabbitmq_server_workspace = "@",
 )

bazel/amqp.patch

@@ -0,0 +1,15 @@
+diff --git a/lib/amqp/core.ex b/lib/amqp/core.ex
+index a7302aa..abf2be6 100644
+--- a/lib/amqp/core.ex
++++ b/lib/amqp/core.ex
+@@ -3,6 +3,10 @@ defmodule AMQP.Core do
+ 
+   require Record
+ 
++  # Elixir 1.15 compiler optimizations require that we explicitly
++  # add the rabbit_common code path
++  true = :code.add_path(:filename.join(:os.getenv(~c"DEPS_DIR"), ~c"rabbit_common/ebin"))
++
+   Record.defrecord(
+     :p_basic,
+     :P_basic,

bazel/platforms/BUILD.bazel

@@ -51,7 +51,7 @@ platform(
     name = "erlang_linux_25_3_platform",
     constraint_values = [
         "@erlang_config//:erlang_25_3",
-        "@elixir_config//:elixir_1_14",
+        "@elixir_config//:elixir_1_15",
     ],
     parents = ["@rbe//config:platform"],
 )
@@ -60,7 +60,7 @@ platform(
     name = "erlang_linux_git_master_platform",
     constraint_values = [
         "@erlang_config//:erlang_26_unknown",
-        "@elixir_config//:elixir_1_14",
+        "@elixir_config//:elixir_1_15",
     ],
     parents = ["@rbe//config:platform"],
 )

deps/rabbitmq_cli/config/config.exs

@@ -24,7 +24,7 @@ import Config
 #
 # Or configure a 3rd-party app:
 #
-config :logger, level: :warn, console: [device: :standard_error]
+config :logger, level: :warning, console: [device: :standard_error]
 #
 
 # It is also possible to import configuration files, relative to this

deps/rabbitmq_cli/lib/rabbit_common/records.ex

@@ -8,6 +8,10 @@ defmodule RabbitCommon.Records do
   require Record
   import Record, only: [defrecord: 2, extract: 2]
 
+  # Elixir 1.15 compiler optimizations require that we explicitly
+  # add the rabbit_common code path
+  true = Code.append_path(Path.join([System.get_env("DEPS_DIR"), "rabbit_common", "ebin"]))
+
   # Important: amqqueue records must not be used directly since they are versioned
   #            for mixed version cluster compatibility. Convert records
   #            to maps on the server end to access the fields of those records. MK.

deps/rabbitmq_cli/lib/rabbitmq/cli/core/listeners.ex

@@ -13,6 +13,11 @@ defmodule RabbitMQ.CLI.Core.Listeners do
   # API
   #
 
+  # TODO: Remove when we require Elixir 1.15
+  if function_exported?(Mix, :ensure_application!, 1) do
+    Mix.ensure_application!(:public_key)
+  end
+
   defrecord :certificate,
             :Certificate,
             extract(:Certificate, from_lib: "public_key/include/public_key.hrl")

deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/remote_shell_command.ex

@@ -7,6 +7,7 @@
 defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
   @behaviour RabbitMQ.CLI.CommandBehaviour
   @dialyzer :no_missing_calls
+  @dialyzer {:nowarn_function, [run: 2, start_shell_on_otp_26_plus: 1, start_shell_on_otp_25: 1]}
 
   use RabbitMQ.CLI.Core.MergesNoDefaults
   use RabbitMQ.CLI.Core.AcceptsNoPositionalArguments
@@ -15,18 +16,9 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
     _ = :c.l(:shell)
 
     if :erlang.function_exported(:shell, :start_interactive, 1) do
-      :shell.start_interactive({node_name, :shell, :start, []})
-      :timer.sleep(:infinity)
+      start_shell_on_otp_26_plus(node_name)
     else
-      _ = Supervisor.terminate_child(:kernel_sup, :user)
-      Process.flag(:trap_exit, true)
-      user_drv = :user_drv.start([~c"tty_sl -c -e", {node_name, :shell, :start, []}])
-      Process.link(user_drv)
-
-      receive do
-        {~c"EXIT", _user_drv, _} ->
-          {:ok, "Disconnected from #{node_name}."}
-      end
+      start_shell_on_otp_25(node_name)
     end
   end
 
@@ -41,4 +33,26 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
   def banner(_, %{node: node_name}) do
     "Starting an interactive Erlang shell on node #{node_name}... Press 'Ctrl+G' then 'q' to exit."
   end
+
+  defp start_shell_on_otp_26_plus(node_name) do
+    case :shell.start_interactive({node_name, {:shell, :start, []}}) do
+      :ok -> :ok
+      {:error, :already_started} -> :ok
+      {error, _} -> {:error, {:badrpc, :nodedown}}
+    end
+
+    :timer.sleep(:infinity)
+  end
+
+  defp start_shell_on_otp_25(node_name) do
+    _ = Supervisor.terminate_child(:kernel_sup, :user)
+    Process.flag(:trap_exit, true)
+    user_drv = :user_drv.start([~c"tty_sl -c -e", {node_name, :shell, :start, []}])
+    Process.link(user_drv)
+
+    receive do
+      {~c"EXIT", _user_drv, _} ->
+        {:ok, "Disconnected from #{node_name}."}
+    end
+  end
 end

deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex

@@ -94,6 +94,10 @@ defmodule RabbitMQ.CLI.Formatters.Csv do
   end
 end
 
+# Elixir 1.15 compiler optimizations require that we explicitly
+# add the csv code path
+true = Code.append_path(Path.join(["_build", Atom.to_string(Mix.env()), "lib", "csv", "ebin"]))
+
 defimpl CSV.Encode, for: PID do
   def encode(pid, env \\ []) do
     FormatterHelpers.format_info_item(pid)

deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/pretty_table.ex

@@ -12,6 +12,10 @@ defmodule RabbitMQ.CLI.Formatters.PrettyTable do
   require Record
   import Record
 
+  # Elixir 1.15 compiler optimizations require that we explicitly
+  # add the stdout_formatter code path
+  true = Code.append_path(Path.join([System.get_env("DEPS_DIR"), "stdout_formatter", "ebin"]))
+
   defrecord :table,
             extract(:table,
               from_lib: "stdout_formatter/include/stdout_formatter.hrl"