Handle changes to crash reports in OTP 20 (#6185)

* :message_queue_len and :current_stacktrace added
* :messages and :dictionary not always present

Signed-off-by: José Valim <[email protected]>

Author: fishcakez

lib/logger/lib/logger/translator.ex

@@ -257,7 +257,17 @@ defmodule Logger.Translator do
   defp crash_info(min_level,
                   [{:ancestors, ancestors} | debug], prefix) do
     [prefix, "Ancestors: ", inspect(ancestors) |
-     crash_debug(min_level, debug, prefix)]
+     crash_info(min_level, debug, prefix)]
+  end
+
+  defp crash_info(:debug, debug, prefix) do
+    for {key, value} <- debug do
+      crash_debug(key, value, prefix)
+    end
+  end
+
+  defp crash_info(_, _, _) do
+    []
   end
 
   defp crash_call(mod, fun, arity) when is_integer(arity) do
@@ -268,22 +278,28 @@ defmodule Logger.Translator do
     format_mfa(mod, fun, length(args))
   end
 
-  defp crash_debug(:debug,
-                   [messages: msgs, links: links, dictionary: dict,
-                    trap_exit: trap, status: status, heap_size: heap_size,
-                    stack_size: stack_size, reductions: reductions], prefix) do
-    [prefix, "Messages: ", inspect(msgs),
-     prefix, "Links: ", inspect(links),
-     prefix, "Dictionary: ", inspect(dict),
-     prefix, "Trapping Exits: ", inspect(trap),
-     prefix, "Status: ", inspect(status),
-     prefix, "Heap Size: ", inspect(heap_size),
-     prefix, "Stack Size: ", inspect(stack_size),
-     prefix, "Reductions: ", inspect(reductions)]
+  defp crash_debug(:current_stacktrace, stack, prefix) do
+    stack_prefix = [prefix | "    "]
+    [prefix, "Current Stacktrace:" |
+     Enum.map(stack, &[stack_prefix | Exception.format_stacktrace_entry(&1)])]
   end
 
-  defp crash_debug(_min_level, _info, _prefix) do
-    []
+  defp crash_debug(key, value, prefix) do
+    [prefix, crash_debug_key(key), ?:, ?\s, inspect(value)]
+  end
+
+  defp crash_debug_key(key) do
+    case key do
+      :message_queue_len -> "Message Queue Length"
+      :messages -> "Messages"
+      :links -> "Links"
+      :dictionary -> "Dictionary"
+      :trap_exit -> "Trapping Exits"
+      :status -> "Status"
+      :heap_size -> "Heap Size"
+      :stack_size -> "Stack Size"
+      :reductions -> "Reductions"
+    end
   end
 
   defp crash_linked(_min_level, []), do: []

lib/logger/test/logger/translator_test.exs

@@ -472,7 +472,8 @@ defmodule Logger.TranslatorTest do
       send(pid, :go)
       receive do: ({:DOWN, ^ref, _, _, _} -> :ok)
     end) =~ ~r"""
-    Ancestors: \[#PID<\d+\.\d+\.\d+>\]
+    Ancestors: \[#PID<\d+\.\d+\.\d+>\](?:
+    Message Queue Length: 1(?#TODO: Require once depend on 20)|)
     Messages: \[:message\]
     Links: \[\]
     Dictionary: \[\]
@@ -493,15 +494,18 @@ defmodule Logger.TranslatorTest do
       send(pid, :go)
       receive do: ({:DOWN, ^ref, _, _, _} -> :ok)
     end) =~ ~r"""
-            Ancestors: \[#PID<\d+\.\d+\.\d+>, #PID<\d+\.\d+\.\d+>\]
-            Messages: \[\]
-            Links: \[#PID<\d+\.\d+\.\d+>\]
-            Dictionary: \[\]
+            Ancestors: \[#PID<\d+\.\d+\.\d+>, #PID<\d+\.\d+\.\d+>\](?:
+            Message Queue Length: 0|
+            Messages: \[\](?# TODO: Remove once depend on 20))
+            Links: \[#PID<\d+\.\d+\.\d+>\](?:|
+            Dictionary: \[\](?# TODO: Remove once depend on 20))
             Trapping Exits: false
             Status: :waiting
             Heap Size: \d+
             Stack Size: \d+
-            Reductions: \d+
+            Reductions: \d+(?:
+            Current Stacktrace:
+                test/logger/translator_test.exs:\d+: Logger.TranslatorTest.sleep/1(?#TODO: Require once depend on 20)|)
     """
   end