Merge pull request #953 from appsignal/drop-elixir-versions

Drop Elixir versions before 1.11

lib/appsignal.ex

@@ -8,14 +8,11 @@ defmodule Appsignal do
   helper functions for sending metrics to AppSignal.
   """
 
-  require Mix.Appsignal.Utils
-
-  @os Mix.Appsignal.Utils.compile_env(:appsignal, :os_internal, :os)
+  @os Application.compile_env(:appsignal, :os_internal, :os)
 
   use Application
   alias Appsignal.Config
   require Logger
-  import Appsignal.Utils, only: [info: 1, warning: 1]
 
   @doc false
   def start(_type, _args) do
@@ -87,7 +84,7 @@ defmodule Appsignal do
   def initialize do
     case {Config.initialize(), Config.configured_as_active?()} do
       {_, false} ->
-        info("AppSignal disabled.")
+        Logger.info("AppSignal disabled.")
 
       {:ok, true} ->
         Appsignal.IntegrationLogger.debug("AppSignal starting.")
@@ -101,7 +98,7 @@ defmodule Appsignal do
         end
 
       {{:error, :invalid_config}, true} ->
-        warning(
+        Logger.warning(
           "Warning: No valid AppSignal configuration found, continuing with " <>
             "AppSignal metrics disabled."
         )

lib/appsignal/absinthe.ex

@@ -1,13 +1,11 @@
 defmodule Appsignal.Absinthe do
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def attach do
     handlers = %{
       [:absinthe, :execute, :operation, :start] => &__MODULE__.absinthe_execute_operation_start/4,
@@ -34,7 +32,9 @@ defmodule Appsignal.Absinthe do
           :ok
 
         {_, {:error, _} = error} ->
-          warning("Appsignal.Absinthe not attached to #{inspect(event)}: #{inspect(error)}")
+          Logger.warning(
+            "Appsignal.Absinthe not attached to #{inspect(event)}: #{inspect(error)}"
+          )
 
           error
       end

lib/appsignal/config.ex

@@ -2,7 +2,8 @@ defmodule Appsignal.Config do
   @moduledoc false
   alias Appsignal.Nif
   alias Appsignal.Utils.FileSystem
-  import Appsignal.Utils, only: [warning: 1]
+
+  require Logger
 
   @default_config %{
     active: false,
@@ -64,7 +65,7 @@ defmodule Appsignal.Config do
     config = Map.merge(config, sources[:override])
 
     if !empty?(config[:working_dir_path]) do
-      warning(fn ->
+      Logger.warning(fn ->
         "'working_dir_path' is deprecated, please use " <>
           "'working_directory_path' instead and specify the " <>
           "full path to the working directory"
@@ -234,7 +235,7 @@ defmodule Appsignal.Config do
             "all"
 
           unknown ->
-            warning(
+            Logger.warning(
               "Unknown value #{inspect(unknown)} for report_oban_errors config " <>
                 ~s(option. Valid values are "discard", "none", "all". ) <>
                 ~s(Defaulting to "all".)

lib/appsignal/demo.ex

@@ -7,9 +7,7 @@ defmodule Appsignal.Demo do
   @moduledoc false
   import Appsignal.Instrumentation, only: [instrument: 2, instrument: 3]
 
-  require Appsignal.Utils
-
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   def send_performance_sample do
     instrument("DemoController#hello", "call.phoenix", fn span ->

lib/appsignal/diagnose/agent.ex

@@ -1,9 +1,7 @@
 defmodule Appsignal.Diagnose.Agent do
   @moduledoc false
 
-  require Appsignal.Utils
-
-  @nif Appsignal.Utils.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
+  @nif Application.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
 
   def report do
     if @nif.loaded?() do

lib/appsignal/diagnose/host.ex

@@ -1,10 +1,8 @@
 defmodule Appsignal.Diagnose.Host do
   @moduledoc false
 
-  require Appsignal.Utils
-
-  @system Appsignal.Utils.compile_env(:appsignal, :appsignal_system, Appsignal.System)
-  @nif Appsignal.Utils.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
+  @system Application.compile_env(:appsignal, :appsignal_system, Appsignal.System)
+  @nif Application.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
 
   def info do
     {_, os} = :os.type()

lib/appsignal/diagnose/library.ex

@@ -1,11 +1,9 @@
 defmodule Appsignal.Diagnose.Library do
   @moduledoc false
 
-  require Appsignal.Utils
-
   @appsignal_version Mix.Project.config()[:version]
   @agent_version Appsignal.Agent.version()
-  @nif Appsignal.Utils.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
+  @nif Application.compile_env(:appsignal, :appsignal_nif, Appsignal.Nif)
 
   def info do
     %{

lib/appsignal/ecto.ex

@@ -1,9 +1,9 @@
 defmodule Appsignal.Ecto do
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
-  import Appsignal.Utils, only: [module_name: 1, warning: 1]
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  import Appsignal.Utils, only: [module_name: 1]
 
   @doc """
   Attaches `Appsignal.Ecto` to the Ecto telemetry channel configured in the
@@ -34,7 +34,7 @@ defmodule Appsignal.Ecto do
         :ok
 
       {:error, _} = error ->
-        warning("Appsignal.Ecto not attached to #{inspect(event)}: #{inspect(error)}")
+        Logger.warning("Appsignal.Ecto not attached to #{inspect(event)}: #{inspect(error)}")
 
         error
     end

lib/appsignal/ecto_repo.ex

@@ -1,6 +1,5 @@
 defmodule Appsignal.Ecto.Repo do
-  require Appsignal.Utils
-  @ecto_repo Appsignal.Utils.compile_env(:appsignal, :ecto_repo, Ecto.Repo)
+  @ecto_repo Application.compile_env(:appsignal, :ecto_repo, Ecto.Repo)
 
   defmacro __using__(opts) do
     quote do

lib/appsignal/error/backend.ex

@@ -1,21 +1,19 @@
 defmodule Appsignal.Error.Backend do
   @moduledoc false
 
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   @behaviour :gen_event
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def init(opts), do: {:ok, opts}
 
   def attach do
     case Logger.add_backend(Appsignal.Error.Backend) do
       {:error, error} ->
-        warning("Appsignal.Error.Backend not attached to Logger: #{error}")
+        Logger.warning("Appsignal.Error.Backend not attached to Logger: #{error}")
         :error
 
       _ ->

lib/appsignal/finch.ex

@@ -1,13 +1,11 @@
 defmodule Appsignal.Finch do
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def attach do
     handlers = %{
       [:finch, :request, :start] => &__MODULE__.finch_request_start/4,
@@ -23,7 +21,7 @@ defmodule Appsignal.Finch do
           :ok
 
         {:error, _} = error ->
-          warning("Appsignal.Finch not attached to #{inspect(event)}: #{inspect(error)}")
+          Logger.warning("Appsignal.Finch not attached to #{inspect(event)}: #{inspect(error)}")
 
           error
       end

lib/appsignal/heartbeat.ex

@@ -1,9 +1,8 @@
 defmodule Appsignal.Heartbeat do
   alias __MODULE__
   alias Appsignal.Heartbeat.Event
-  require Appsignal.Utils
 
-  @transmitter Appsignal.Utils.compile_env(
+  @transmitter Application.compile_env(
                  :appsignal,
                  :appsignal_transmitter,
                  Appsignal.Transmitter

lib/appsignal/instrumentation.ex

@@ -1,8 +1,6 @@
 defmodule Appsignal.Instrumentation do
-  require Appsignal.Utils
-
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   @spec instrument(function()) :: any()
   @doc false

lib/appsignal/instrumentation/decorators.ex

@@ -1,9 +1,7 @@
 defmodule Appsignal.Instrumentation.Decorators do
   @moduledoc false
 
-  require Appsignal.Utils
-
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   use Decorator.Define,
     instrument: 0,

lib/appsignal/integration_logger.ex

@@ -1,8 +1,6 @@
 defmodule Appsignal.IntegrationLogger do
-  require Appsignal.Utils
-
-  @io Appsignal.Utils.compile_env(:appsignal, :io, IO)
-  @file_module Appsignal.Utils.compile_env(:appsignal, :file, File)
+  @io Application.compile_env(:appsignal, :io, IO)
+  @file_module Application.compile_env(:appsignal, :file, File)
 
   @log_levels [:trace, :debug, :info, :warn, :error]
 

lib/appsignal/logger.ex

@@ -1,7 +1,5 @@
 defmodule Appsignal.Logger do
-  require Appsignal.Utils
-
-  @nif Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer_nif, Appsignal.Nif)
+  @nif Application.compile_env(:appsignal, :appsignal_tracer_nif, Appsignal.Nif)
 
   @type log_level ::
           :debug | :info | :notice | :warning | :error | :critical | :alert | :emergency

lib/appsignal/monitor.ex

@@ -1,10 +1,8 @@
 defmodule Appsignal.Monitor do
   @moduledoc false
 
-  require Appsignal.Utils
-
-  @deletion_delay Appsignal.Utils.compile_env(:appsignal, :deletion_delay, 5_000)
-  @sync_interval Appsignal.Utils.compile_env(:appsignal, :sync_interval, 60_000)
+  @deletion_delay Application.compile_env(:appsignal, :deletion_delay, 5_000)
+  @sync_interval Application.compile_env(:appsignal, :sync_interval, 60_000)
 
   use GenServer
   alias Appsignal.Tracer

lib/appsignal/oban.ex

@@ -1,14 +1,12 @@
 defmodule Appsignal.Oban do
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
-  @appsignal Appsignal.Utils.compile_env(:appsignal, :appsignal, Appsignal)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @appsignal Application.compile_env(:appsignal, :appsignal, Appsignal)
 
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def attach do
     exception_handler =
       case Appsignal.Config.report_oban_errors() do
@@ -42,7 +40,7 @@ defmodule Appsignal.Oban do
           :ok
 
         {_, {:error, _} = error} ->
-          warning("Appsignal.Oban not attached to #{inspect(event)}: #{inspect(error)}")
+          Logger.warning("Appsignal.Oban not attached to #{inspect(event)}: #{inspect(error)}")
 
           error
       end

lib/appsignal/probes/erlang_probe.ex

@@ -1,6 +1,5 @@
 defmodule Appsignal.Probes.ErlangProbe do
   @moduledoc false
-  require Appsignal.Utils
 
   def call(sample \\ nil) do
     next_sample = sample_schedulers()

lib/appsignal/probes/probes.ex

@@ -2,9 +2,8 @@ defmodule Appsignal.Probes do
   @moduledoc false
   use GenServer
   require Logger
-  require Appsignal.Utils
 
-  @integration_logger Appsignal.Utils.compile_env(
+  @integration_logger Application.compile_env(
                         :appsignal,
                         :appsignal_integration_logger,
                         Appsignal.IntegrationLogger

lib/appsignal/span.ex

@@ -3,9 +3,7 @@ defmodule Appsignal.Span do
 
   defstruct [:reference, :pid]
 
-  require Appsignal.Utils
-
-  @nif Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer_nif, Appsignal.Nif)
+  @nif Application.compile_env(:appsignal, :appsignal_tracer_nif, Appsignal.Nif)
 
   @type t() :: %__MODULE__{
           reference: reference(),

lib/appsignal/tesla.ex

@@ -1,13 +1,11 @@
 defmodule Appsignal.Tesla do
-  require Appsignal.Utils
+  require Logger
 
-  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+  @tracer Application.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Application.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def attach do
     handlers = %{
       [:tesla, :request, :start] => &__MODULE__.tesla_request_start/4,
@@ -23,7 +21,7 @@ defmodule Appsignal.Tesla do
           :ok
 
         {:error, _} = error ->
-          warning("Appsignal.Tesla not attached to #{inspect(event)}: #{inspect(error)}")
+          Logger.warning("Appsignal.Tesla not attached to #{inspect(event)}: #{inspect(error)}")
 
           error
       end

lib/appsignal/tracer.ex

@@ -1,9 +1,7 @@
 defmodule Appsignal.Tracer do
   alias Appsignal.Span
 
-  require Appsignal.Utils
-
-  @monitor Appsignal.Utils.compile_env(:appsignal, :appsignal_monitor, Appsignal.Monitor)
+  @monitor Application.compile_env(:appsignal, :appsignal_monitor, Appsignal.Monitor)
 
   @table :"$appsignal_registry"
 

lib/appsignal/transmitter.ex

@@ -1,7 +1,7 @@
 defmodule Appsignal.Transmitter do
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
+  require Logger
 
   def request(method, url, headers \\ [], body \\ "") do
     http_client = Application.get_env(:appsignal, :http_client, :hackney)
@@ -62,7 +62,7 @@ defmodule Appsignal.Transmitter do
 
       {:error, message} ->
         unless ca_file_path == packaged_ca_file_path() do
-          warning(
+          Logger.warning(
             "Ignoring non-existing or unreadable ca_file_path (#{ca_file_path}): #{inspect(message)}"
           )
         end