Merge pull request #185 from getsentry/fix-logger-and-context-usage

Fix logger and context usage

Author: mitchellhenke

lib/sentry/logger.ex

@@ -26,7 +26,7 @@ defmodule Sentry.Logger do
       {kind, exception, stacktrace, module} = get_exception_and_stacktrace(message[:error_info])
                                       |> get_initial_call_and_module(message)
 
-      opts = get_in(message, ~w[dictionary sentry_context]a) || %{}
+      opts = (get_in(message, ~w[dictionary sentry_context]a) || %{})
              |> Map.take(Sentry.Context.context_keys)
              |> Map.to_list()
              |> Keyword.put(:event_source, :logger)

test/logger_test.exs

@@ -110,4 +110,32 @@ defmodule Sentry.LoggerTest do
     end
     :error_logger.delete_report_handler(Sentry.Logger)
   end
+
+  test "error_logger passes context properly" do
+    bypass = Bypass.open
+    pid = self()
+    Bypass.expect bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      body = Poison.decode!(body)
+      assert get_in(body, ["extra", "fruit"]) == "apples"
+      assert conn.request_path == "/api/1/store/"
+      assert conn.method == "POST"
+      send(pid, "API called")
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end
+
+    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    :error_logger.add_report_handler(Sentry.Logger)
+
+    capture_log fn ->
+      Task.start( fn ->
+        Sentry.Context.set_extra_context(%{fruit: "apples"})
+        raise "Unique Error"
+      end)
+
+      assert_receive "API called"
+    end
+
+    :error_logger.delete_report_handler(Sentry.Logger)
+  end
 end