Fix crash with custom scrubber in Sentry.PlugContext (#678)

Author: paulstatezny

lib/sentry/plug_capture.ex

@@ -72,7 +72,7 @@ defmodule Sentry.PlugCapture do
 
   defmacro __using__(opts) do
     quote do
-      opts = unquote(Macro.escape(opts))
+      opts = unquote(opts)
       default_scrubber = {unquote(__MODULE__), :default_scrubber, []}
 
       scrubber =

test/plug_capture_test.exs

@@ -34,6 +34,22 @@ defmodule Sentry.PlugCaptureTest do
     plug PhoenixRouter
   end
 
+  defmodule Scrubber do
+    def scrub_conn(conn) do
+      conn
+    end
+  end
+
+  defmodule PhoenixEndpointWithScrubber do
+    use Sentry.PlugCapture, scrubber: {Scrubber, :scrub_conn, []}
+    use Phoenix.Endpoint, otp_app: :sentry
+    use Plug.Debugger, otp_app: :sentry
+
+    plug Plug.Parsers, parsers: [:json], pass: ["*/*"], json_decoder: Jason
+    plug Sentry.PlugContext
+    plug PhoenixRouter
+  end
+
   setup do
     bypass = Bypass.open()
     put_test_config(dsn: "http://public:secret@localhost:#{bypass.port}/1")
@@ -239,6 +255,33 @@ defmodule Sentry.PlugCaptureTest do
         |> call_phoenix_endpoint()
       end
     end
+
+    test "modifies conn with custom scrubber", %{bypass: bypass} do
+      Application.put_env(:sentry, PhoenixEndpointWithScrubber,
+        render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
+      )
+
+      pid = start_supervised!(PhoenixEndpointWithScrubber)
+      Process.link(pid)
+
+      Bypass.expect(bypass, fn conn ->
+        {:ok, body, conn} = Plug.Conn.read_body(conn)
+
+        event = decode_event_from_envelope!(body)
+
+        assert event["culprit"] == "Sentry.PlugCaptureTest.PhoenixController.error/2"
+
+        assert List.first(event["exception"])["type"] == "RuntimeError"
+        assert List.first(event["exception"])["value"] == "PhoenixError"
+
+        Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+      end)
+
+      assert_raise RuntimeError, "PhoenixError", fn ->
+        conn(:get, "/error_route")
+        |> Plug.run([{PhoenixEndpointWithScrubber, []}])
+      end
+    end
   end
 
   defp call_plug_app(conn), do: Plug.run(conn, [{Sentry.ExamplePlugApplication, []}])