Merge pull request #301 from getsentry/fix-deps

Bring back report_deps

Author: mitchellhenke

README.md

@@ -102,7 +102,7 @@ For optional settings check the [docs](https://hexdocs.pm/sentry/readme.html).
 | `after_send_event` | False | | |
 | `sample_rate` | False | 1.0 | |
 | `in_app_module_whitelist` | False | `[]` | |
-| `report_deps` | False | False | Will attempt to load Mix dependencies at compile time to report alongside events. This was switched to default to false following a bug in the parallel compiler ([#232](https://github.com/getsentry/sentry-elixir/issues/232) / [elixir-lang/elixir#7699](https://github.com/elixir-lang/elixir/issues/7699)) |
+| `report_deps` | False | True | Will attempt to load Mix dependencies at compile time to report alongside events |
 | `enable_source_code_context` | False | False | |
 | `root_source_code_path` | Required if `enable_source_code_context` is enabled | | Should generally be set to `File.cwd!`|
 | `context_lines` | False  | 3 | |

config/test.exs

@@ -4,5 +4,4 @@ config :sentry,
   environment_name: :test,
   included_environments: [:test],
   client: Sentry.TestClient,
-  hackney_opts: [recv_timeout: 50],
-  report_deps: true
+  hackney_opts: [recv_timeout: 50]

lib/sentry/config.ex

@@ -120,7 +120,7 @@ defmodule Sentry.Config do
   end
 
   def report_deps do
-    get_config(:report_deps, default: false, check_dsn: false)
+    get_config(:report_deps, default: true, check_dsn: false)
   end
 
   defp get_config(key, opts \\ []) when is_atom(key) do

lib/sentry/event.ex

@@ -41,7 +41,7 @@ defmodule Sentry.Event do
   @enable_deps_reporting Config.report_deps()
   @deps if(
           @enable_deps_reporting,
-          do: Util.mix_deps_to_map(Mix.Dep.loaded(env: Mix.env())),
+          do: Util.mix_deps(),
           else: %{}
         )
 

lib/sentry/util.ex

@@ -25,18 +25,15 @@ defmodule Sentry.Util do
     |> String.trim_trailing("Z")
   end
 
-  @spec mix_deps_to_map([Mix.Dep.t()]) :: map()
-  def mix_deps_to_map([%Mix.Dep{} | _rest] = modules) do
-    Enum.reduce(modules, %{}, fn x, acc ->
-      case x.status do
-        {:ok, version} -> Map.put(acc, x.app, version)
-        _ -> acc
-      end
+  @spec mix_deps() :: map()
+  def mix_deps() do
+    Mix.Project.deps_paths()
+    |> Map.keys()
+    |> Enum.reduce(%{}, fn app, acc ->
+      Map.put(acc, app, Application.spec(app, :vsn))
     end)
   end
 
-  def mix_deps_to_map(modules), do: modules
-
   @doc """
   Per http://www.ietf.org/rfc/rfc4122.txt
   """

mix.exs

@@ -30,7 +30,7 @@ defmodule Sentry.Mixfile do
       {:phoenix, "~> 1.3", optional: true},
       {:dialyxir, "> 0.0.0", only: [:dev], runtime: false},
       {:ex_doc, "~> 0.18.0", only: :dev},
-      {:credo, "~> 0.8", only: [:dev, :test], runtime: false},
+      {:credo, "~> 0.9.0", only: [:dev, :test], runtime: false},
       {:bypass, "~> 0.8.0", only: [:test]}
     ]
   end

mix.lock

@@ -6,17 +6,17 @@
   "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], [], "hexpm"},
   "credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.18.3", "f4b0e4a2ec6f333dccf761838a4b253d75e11f714b85ae271c9ae361367897b7", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "hackney": {:hex, :hackney, "1.12.1", "8bf2d0e11e722e533903fe126e14d6e7e94d9b7983ced595b75f532e04b7fdc7", [:rebar3], [{:certifi, "2.3.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.1", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
-  "idna": {:hex, :idna, "5.1.1", "cbc3b2fa1645113267cc59c760bafa64b2ea0334635ef06dbac8801e42f7279c", [:rebar3], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
+  "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.18.4", "4406b8891cecf1352f49975c6d554e62e4341ceb41b9338949077b0d4a97b949", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
+  "hackney": {:hex, :hackney, "1.13.0", "24edc8cd2b28e1c652593833862435c80661834f6c9344e84b6a2255e7aeef03", [:rebar3], [{:certifi, "2.3.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.2", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
+  "idna": {:hex, :idna, "5.1.2", "e21cb58a09f0228a9e0b95eaa1217f1bcfc31a1aaa6e1fdf2f53a33f7dbd9494", [:rebar3], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
   "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm"},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"},
   "parse_trans": {:hex, :parse_trans, "3.2.0", "2adfa4daf80c14dc36f522cf190eb5c4ee3e28008fc6394397c16f62a26258c2", [:rebar3], [], "hexpm"},
   "phoenix": {:hex, :phoenix, "1.3.3", "bafb5fa408d202e8d9f739e781bdb908446a2c1c1e00797c1158918ed55566a4", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.0.2", "bfa7fd52788b5eaa09cb51ff9fcad1d9edfeb68251add458523f839392f034c1", [:mix], [], "hexpm"},
-  "plug": {:hex, :plug, "1.6.0", "90d338a44c8cd762c32d3ea324f6728445c6145b51895403854b77f1536f1617", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm"},
+  "plug": {:hex, :plug, "1.6.1", "c62fe7623d035020cf989820b38490460e6903ab7eee29e234b7586e9b6c91d6", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
   "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"},

test/event_test.exs

@@ -447,26 +447,31 @@ defmodule Sentry.EventTest do
     exception = RuntimeError.exception("error")
     event = Sentry.Event.transform_exception(exception, [])
 
-    assert event.modules == %{
-             phoenix: "1.3.3",
-             phoenix_pubsub: "1.0.2",
-             bunt: "0.2.0",
-             bypass: "0.8.1",
-             certifi: "2.3.1",
-             cowboy: "1.1.2",
-             cowlib: "1.0.2",
-             credo: "0.9.3",
-             hackney: "1.12.1",
-             idna: "5.1.1",
-             metrics: "1.0.1",
-             mime: "1.3.0",
-             mimerl: "1.0.2",
-             parse_trans: "3.2.0",
-             plug: "1.6.0",
-             poison: "3.1.0",
-             ranch: "1.3.2",
-             ssl_verify_fun: "1.1.1",
-             unicode_util_compat: "0.3.1"
-           }
+    modules =
+      event.modules
+      |> Map.keys()
+      |> Enum.sort()
+
+    assert modules == [
+             :bunt,
+             :bypass,
+             :certifi,
+             :cowboy,
+             :cowlib,
+             :credo,
+             :hackney,
+             :idna,
+             :metrics,
+             :mime,
+             :mimerl,
+             :parse_trans,
+             :phoenix,
+             :phoenix_pubsub,
+             :plug,
+             :poison,
+             :ranch,
+             :ssl_verify_fun,
+             :unicode_util_compat
+           ]
   end
 end