Merge pull request #421 from letscolife/chore-elixir-1-15-compatible

elixir 1.15 and OTP 26 compatibility

Author: tpitale

.github/workflows/elixir.yml

@@ -12,12 +12,19 @@ jobs:
   unit_test:
     name: Unit Tests - Elixir ${{matrix.elixir}} / OTP ${{matrix.otp}}
     runs-on: ubuntu-20.04
+    continue-on-error: true
 
     strategy:
       matrix:
         include:
+          - elixir: '1.15'
+            otp: '26'
+          - elixir: '1.15'
+            otp: '25'
           - elixir: '1.14'
             otp: '26'
+          - elixir: '1.13'
+            otp: '25'
           - elixir: '1.12'
             otp: '24'
           - elixir: '1.11'
@@ -71,13 +78,18 @@ jobs:
 
   integration_test:
     name: Integration Tests - Elixir ${{matrix.elixir}} / OTP ${{matrix.otp}}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    continue-on-error: true
 
     strategy:
       matrix:
         include:
+          - elixir: '1.15'
+            otp: '26'
           - elixir: '1.14'
             otp: '26'
+          - elixir: '1.13'
+            otp: '25'
           - elixir: '1.12'
             otp: '24'
 

config/config.exs

@@ -1,4 +1,6 @@
-use Mix.Config
+import Config
+
+config :logger, handle_sasl_reports: true
 
 if Mix.env() == :test, do: import_config("test.exs")
 if File.exists?("config/secret.exs"), do: import_config("secret.exs")

config/test.exs

@@ -1,6 +1,6 @@
-use Mix.Config
+import Config
 
-config :logger, level: :warn
+config :logger, level: :warning
 
 config :new_relic_agent,
   app_name: "ElixirAgentTest",

examples/apps/ecto_example/config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :ecto_example,
   http_port: 4001,

examples/apps/ecto_example/mix.exs

@@ -29,7 +29,7 @@ defmodule EctoExample.MixProject do
       {:new_relic_agent, path: "../../../"},
       {:test_support, in_umbrella: true},
       {:plug_cowboy, "~> 2.0"},
-      {:ecto_sql, "~> 3.4"},
+      {:ecto_sql, "~> 3.9"},
       {:postgrex, ">= 0.0.0"},
       {:myxql, ">= 0.0.0"},
       {:ecto_sqlite3, ">= 0.0.0"}

examples/apps/ecto_example/test/ecto_example_test.exs

@@ -64,7 +64,7 @@ defmodule EctoExampleTest do
     assert TestSupport.find_metric(
              metrics,
              "Datastore/statement/SQLite3/counts/select",
-             6
+             4
            )
 
     assert TestSupport.find_metric(
@@ -97,19 +97,19 @@ defmodule EctoExampleTest do
     assert TestSupport.find_metric(
              metrics,
              "Datastore/SQLite3/allWeb",
-             13
+             11
            )
 
     assert TestSupport.find_metric(
              metrics,
              "Datastore/allWeb",
-             37
+             35
            )
 
     assert TestSupport.find_metric(
              metrics,
              "Datastore/all",
-             37
+             35
            )
   end
 

examples/apps/phx_example/config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :phx_example, PhxExampleWeb.Endpoint,
   url: [host: "localhost"],

examples/apps/redix_example/config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :redix_example,
   http_port: 4003

examples/apps/w3c_trace_context_validation/config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :w3c_trace_context_validation,
   http_port: 4002

examples/config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :logger, level: :debug
 
@@ -8,6 +8,8 @@ config :new_relic_agent,
   license_key: "license_key",
   trusted_account_key: "trusted_account_key"
 
-import_config "../apps/*/config/config.exs"
+for config <- "../apps/*/config/config.exs" |> Path.expand(__DIR__) |> Path.wildcard() do
+  import_config config
+end
 
 if File.exists?("../../config/secret.exs"), do: import_config("secret.exs")

examples/mix.lock

@@ -1,5 +1,6 @@
 %{
   "castore": {:hex, :castore, "0.1.9", "eb08a94c12ebff92a92d844c6ccd90728dc7662aab9bdc8b3b785ba653c499d5", [:mix], [], "hexpm", "99c3a38ad9c0bab03fee1418c98390da1a31f3b85e317db5840d51a1443d26c8"},
+  "cc_precompiler": {:hex, :cc_precompiler, "0.1.9", "e8d3364f310da6ce6463c3dd20cf90ae7bbecbf6c5203b98bf9b48035592649b", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "9dcab3d0f3038621f1601f13539e7a9ee99843862e66ad62827b0c42b2f58a54"},
   "certifi": {:hex, :certifi, "2.5.3", "70bdd7e7188c804f3a30ee0e7c99655bc35d8ac41c23e12325f36ab449b70651", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "ed516acb3929b101208a9d700062d520f3953da3b6b918d866106ffa980e1c10"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cowboy": {:hex, :cowboy, "2.8.0", "f3dc62e35797ecd9ac1b50db74611193c29815401e53bac9a5c0577bd7bc667d", [:rebar3], [{:cowlib, "~> 2.9.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a"},
@@ -9,9 +10,9 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
   "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"},
-  "ecto_sqlite3": {:hex, :ecto_sqlite3, "0.6.1", "3ad4efed19b637b810c8ca755fa0fd520fff4898a9e59c2cb57b51f0fe486a81", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exqlite, "~> 0.5", [hex: :exqlite, repo: "hexpm", optional: false]}], "hexpm", "65796e14f5e685afce28b712287df5f4ee02471f8471097591b7fe83c1e4597d"},
-  "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"},
-  "exqlite": {:hex, :exqlite, "0.5.7", "e78c1256cb47eba4d679e60dbd25249fb004fcfac2ddab9c7fc57c89e20faad4", [:make, :mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f0322f6f59989a024a808f2ed2b7e42deab0164e40ea47c338ae042a673a1e80"},
+  "ecto_sqlite3": {:hex, :ecto_sqlite3, "0.14.0", "8710aa6de137a9c428fc86306b574777e9d545534b0259030a325948d43fc740", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.11", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exqlite, "~> 0.9", [hex: :exqlite, repo: "hexpm", optional: false]}], "hexpm", "4f69e5df5bdf8b98d80797b1a88b1d24b13ad9f187a553241c2aa6cb7447a672"},
+  "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
+  "exqlite": {:hex, :exqlite, "0.17.0", "865ab503debde7913ffa02b58838ab92885165978f4c88d8169ee8688c655d1e", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "719fa7986fed242839629a907d60f774000c1d2dc03ba6ba05fcd30579f2ab45"},
   "hackney": {:hex, :hackney, "1.17.0", "717ea195fd2f898d9fe9f1ce0afcc2621a41ecfe137fae57e7fe6e9484b9aa99", [:rebar3], [{:certifi, "~>2.5", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "64c22225f1ea8855f584720c0e5b3cd14095703af1c9fbc845ba042811dc671c"},
   "httpoison": {:hex, :httpoison, "1.8.0", "6b85dea15820b7804ef607ff78406ab449dd78bed923a49c7160e1886e987a3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "28089eaa98cf90c66265b6b5ad87c59a3729bea2e74e9d08f9b51eb9729b3c3a"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
@@ -30,7 +31,7 @@
   "postgrex": {:hex, :postgrex, "0.17.4", "5777781f80f53b7c431a001c8dad83ee167bcebcf3a793e3906efff680ab62b3", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"},
   "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm", "451d8527787df716d99dc36162fca05934915db0b6141bbdac2ea8d3c7afc7d7"},
   "redix": {:hex, :redix, "1.0.0", "4f310341744ffceab3031394450a4e603d4d1001a697c3f18ae57ae776cbd3fb", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8c8d9b33b5491737adcd5bb9e0f43b85212a384ac0042f64c156113518266ecb"},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
 }

lib/new_relic/conditional_compile.ex

@@ -0,0 +1,19 @@
+defmodule NewRelic.ConditionalCompile do
+  @moduledoc false
+
+  defmacro before_elixir_version(version, code) do
+    if Version.compare(System.version(), version) == :lt do
+      quote do
+        unquote(code)
+      end
+    end
+  end
+
+  defmacro after_elixir_version(version, code) do
+    if Version.compare(System.version(), version) != :lt do
+      quote do
+        unquote(code)
+      end
+    end
+  end
+end

lib/new_relic/error/logger_handler.ex

@@ -1,30 +1,33 @@
 defmodule NewRelic.Error.LoggerHandler do
   @moduledoc false
 
-  # http://erlang.org/doc/man/logger.html
-
   def add_handler() do
-    :logger.remove_handler(:new_relic)
-    :logger.add_handler(:new_relic, NewRelic.Error.LoggerHandler, %{})
+    Logger.add_translator({__MODULE__, :translator})
   end
 
   def remove_handler() do
-    :logger.remove_handler(:new_relic)
+    Logger.remove_translator({__MODULE__, :translator})
   end
 
-  def log(
-        %{
-          meta: %{error_logger: %{tag: :error_report, type: :crash_report}},
-          msg: {:report, %{report: [report | _]}}
-        },
-        _config
-      ) do
+  def translator(_level, _message, _timestamp, {_, [report | _]}) when is_list(report) do
     if NewRelic.Transaction.Sidecar.tracking?() do
       NewRelic.Error.Reporter.report_error(:transaction, report)
     else
       NewRelic.Error.Reporter.report_error(:process, report)
     end
+
+    :none
+  end
+
+  def translator(_level, :error, _timestamp, {_, %{args: _, function: _}} = metadata) do
+    if NewRelic.Transaction.Sidecar.tracking?() do
+      NewRelic.Error.MetadataReporter.report_error(:transaction, metadata)
+    else
+      NewRelic.Error.MetadataReporter.report_error(:process, metadata)
+    end
+
+    :none
   end
 
-  def log(_log, _config), do: :ignore
+  def translator(_level, _message, _timestamp, _metadata), do: :none
 end

lib/new_relic/error/metadata_reporter.ex

@@ -0,0 +1,86 @@
+defmodule NewRelic.Error.MetadataReporter do
+  @moduledoc false
+
+  alias NewRelic.Util
+  alias NewRelic.Harvest.Collector
+
+  import NewRelic.ConditionalCompile
+
+  # Before elixir 1.15, ignore terminating errors so they don't get reported twice
+  before_elixir_version("1.15.0", def(report_error(_, {{_, :terminating}, _}), do: nil))
+
+  def report_error(:transaction, {_cause, metadata}) do
+    kind = :error
+    {_exception_type, reason, stacktrace, _expected} = parse_reason(metadata.reason)
+    process_name = parse_process_name(metadata[:registered_name], stacktrace)
+
+    NewRelic.add_attributes(process: process_name)
+
+    NewRelic.Transaction.Reporter.error(%{
+      kind: kind,
+      reason: reason,
+      stack: stacktrace
+    })
+  end
+
+  def report_error(:process, {_cause, metadata}) do
+    {exception_type, reason, stacktrace, expected} = parse_reason(metadata.reason)
+
+    process_name = parse_process_name(metadata[:registered_name], stacktrace)
+    automatic_attributes = NewRelic.Config.automatic_attributes()
+    formatted_stacktrace = Util.Error.format_stacktrace(stacktrace, nil)
+
+    Collector.ErrorTrace.Harvester.report_error(%NewRelic.Error.Trace{
+      timestamp: System.system_time(:millisecond) / 1_000,
+      error_type: exception_type,
+      message: reason,
+      expected: expected,
+      stack_trace: formatted_stacktrace,
+      transaction_name: "OtherTransaction/Elixir/ElixirProcess//#{process_name}",
+      user_attributes:
+        Map.merge(automatic_attributes, %{
+          process: process_name
+        })
+    })
+
+    Collector.TransactionErrorEvent.Harvester.report_error(%NewRelic.Error.Event{
+      timestamp: System.system_time(:millisecond) / 1_000,
+      error_class: exception_type,
+      error_message: reason,
+      expected: expected,
+      transaction_name: "OtherTransaction/Elixir/ElixirProcess//#{process_name}",
+      user_attributes:
+        Map.merge(automatic_attributes, %{
+          process: process_name,
+          stacktrace: Enum.join(formatted_stacktrace, "\n")
+        })
+    })
+
+    unless expected do
+      NewRelic.report_metric({:supportability, :error_event}, error_count: 1)
+      NewRelic.report_metric(:error, error_count: 1)
+    end
+  end
+
+  defp parse_reason({exception, stacktrace}) do
+    type = parse_type(exception)
+    expected = parse_error_expected(exception)
+    message = Map.get(exception, :message)
+    reason = "(#{type}) #{message}"
+
+    {type, reason, stacktrace, expected}
+  end
+
+  defp parse_type(%type{}) do
+    type
+    |> Module.split()
+    |> Enum.join(".")
+  end
+
+  defp parse_process_name([], [{module, _f, _a, _} | _]), do: inspect(module)
+  defp parse_process_name([], _stacktrace), do: "UnknownProcess"
+  defp parse_process_name(registered_name, _stacktrace), do: inspect(registered_name)
+
+  defp parse_error_expected(%{expected: true}), do: true
+  defp parse_error_expected(_), do: false
+end

lib/new_relic/harvest/harvest_cycle.ex

@@ -52,7 +52,7 @@ defmodule NewRelic.Harvest.HarvestCycle do
 
         receive do
           {:DOWN, _ref, _, ^harvester, _reason} ->
-            NewRelic.log(:warn, "Completed shutdown #{inspect(harvest_cycle)}")
+            NewRelic.log(:warning, "Completed shutdown #{inspect(harvest_cycle)}")
         end
     end
   end

lib/new_relic/logger.ex

@@ -23,7 +23,7 @@ defmodule NewRelic.Logger do
 
   # API
 
-  @levels [:debug, :info, :warn, :error]
+  @levels [:debug, :info, :warning, :error]
   def log(level, message) when level in @levels do
     GenServer.cast(__MODULE__, {:log, level, message})
   end
@@ -83,7 +83,7 @@ defmodule NewRelic.Logger do
   def formatted(level, message), do: [formatted(level), @sep, timestamp(), @sep, message, "\n"]
   def formatted(:debug), do: "[DEBUG]"
   def formatted(:info), do: "[INFO]"
-  def formatted(:warn), do: "[WARN]"
+  def formatted(:warning), do: "[WARN]"
   def formatted(:error), do: "[ERROR]"
 
   def timestamp do

lib/new_relic/tracer/macro.ex

@@ -48,7 +48,7 @@ defmodule NewRelic.Tracer.Macro do
         |> Enum.map(&"`#{&1}`")
         |> Enum.join(", ")
 
-      Logger.warn(
+      Logger.warning(
         "[New Relic] Unable to trace `#{inspect(module)}.#{name}/#{length(args)}` " <>
           "due to additional function-level clauses: #{found} -- please remove @trace"
       )
@@ -81,7 +81,7 @@ defmodule NewRelic.Tracer.Macro do
   end
 
   def trace_deprecated?({_, category: :datastore}, module, name) do
-    Logger.warn(
+    Logger.warning(
       "[New Relic] Trace `:datastore` deprecated in favor of automatic ecto instrumentation. " <>
         "Please remove @trace from #{inspect(module)}.#{name}"
     )