Merge pull request #447 from aselder/throw-exit

Send Sentry reports on uncaught throws/exits

Author: mitchellhenke

lib/sentry/plug_capture.ex

@@ -45,6 +45,12 @@ defmodule Sentry.PlugCapture do
           e ->
             _ = Sentry.capture_exception(e, stacktrace: __STACKTRACE__, event_source: :plug)
             :erlang.raise(:error, e, __STACKTRACE__)
+        catch
+          kind, reason ->
+            message = "Uncaught #{kind} - #{inspect(reason)}"
+            stack = __STACKTRACE__
+            Sentry.capture_message(message, stacktrace: stack, event_source: :plug)
+            :erlang.raise(kind, reason, stack)
         end
       end
     end

test/plug_capture_test.exs

@@ -7,6 +7,8 @@ defmodule Sentry.PlugCaptureTest do
   defmodule PhoenixController do
     use Phoenix.Controller
     def error(_conn, _params), do: raise("PhoenixError")
+    def exit(_conn, _params), do: exit(:test)
+    def throw(_conn, _params), do: throw(:test)
 
     def assigns(conn, _params) do
       _test = conn.assigns2.test
@@ -17,6 +19,8 @@ defmodule Sentry.PlugCaptureTest do
     use Phoenix.Router
 
     get "/error_route", PhoenixController, :error
+    get "/exit_route", PhoenixController, :exit
+    get "/throw_route", PhoenixController, :throw
     get "/assigns_route", PhoenixController, :assigns
   end
 
@@ -56,6 +60,40 @@ defmodule Sentry.PlugCaptureTest do
     end)
   end
 
+  test "sends throws to Sentry" do
+    bypass = Bypass.open()
+
+    Bypass.expect(bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      _json = Jason.decode!(body)
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end)
+
+    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+
+    catch_throw(
+      conn(:get, "/throw_route")
+      |> Sentry.ExamplePlugApplication.call([])
+    )
+  end
+
+  test "sends exits to Sentry" do
+    bypass = Bypass.open()
+
+    Bypass.expect(bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      _json = Jason.decode!(body)
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end)
+
+    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+
+    catch_exit(
+      conn(:get, "/exit_route")
+      |> Sentry.ExamplePlugApplication.call([])
+    )
+  end
+
   test "works with Sentry.PlugContext" do
     bypass = Bypass.open()
 
@@ -131,6 +169,56 @@ defmodule Sentry.PlugCaptureTest do
     end)
   end
 
+  test "reports exits occurring in Phoenix Endpoint" do
+    bypass = Bypass.open()
+
+    Bypass.expect(bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      json = Jason.decode!(body)
+      assert json["culprit"] == "Sentry.PlugCaptureTest.PhoenixController.exit/2"
+      assert json["message"] == "Uncaught exit - :test"
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end)
+
+    modify_env(:sentry,
+      dsn: "http://public:secret@localhost:#{bypass.port}/1",
+      "#{__MODULE__.PhoenixEndpoint}": [
+        render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
+      ]
+    )
+
+    {:ok, _} = PhoenixEndpoint.start_link()
+
+    capture_log(fn ->
+      catch_exit(conn(:get, "/exit_route") |> PhoenixEndpoint.call([]))
+    end)
+  end
+
+  test "reports throws occurring in Phoenix Endpoint" do
+    bypass = Bypass.open()
+
+    Bypass.expect(bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      json = Jason.decode!(body)
+      assert json["culprit"] == "Sentry.PlugCaptureTest.PhoenixController.throw/2"
+      assert json["message"] == "Uncaught throw - :test"
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end)
+
+    modify_env(:sentry,
+      dsn: "http://public:secret@localhost:#{bypass.port}/1",
+      "#{__MODULE__.PhoenixEndpoint}": [
+        render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
+      ]
+    )
+
+    {:ok, _} = PhoenixEndpoint.start_link()
+
+    capture_log(fn ->
+      catch_throw(conn(:get, "/throw_route") |> PhoenixEndpoint.call([]))
+    end)
+  end
+
   test "can render feedback form in Phoenix ErrorView" do
     bypass = Bypass.open()
 

test/sources_test.exs

@@ -55,7 +55,7 @@ defmodule Sentry.SourcesTest do
   test "exception makes call to Sentry API" do
     correct_context = %{
       "context_line" => "    raise RuntimeError, \"Error\"",
-      "post_context" => ["  end", "", "  post \"/error_route\" do"],
+      "post_context" => ["  end", "", "  get \"/exit_route\" do"],
       "pre_context" => ["", "  get \"/error_route\" do", "    _ = conn"]
     }
 

test/support/example_plug_application.ex

@@ -13,6 +13,16 @@ defmodule Sentry.ExamplePlugApplication do
     raise RuntimeError, "Error"
   end
 
+  get "/exit_route" do
+    _ = conn
+    exit(:test)
+  end
+
+  get "/throw_route" do
+    _ = conn
+    throw(:test)
+  end
+
   post "/error_route" do
     _ = conn
     raise RuntimeError, "Error"