Remove Logger wrappers from Utils

Utils.warning/1 and Utils.info/1 were added to support Elixir versions before 1.11. Since we're in the process of dropping support for versions before 1.11, these can be removed. This patch removes both functions and switches all calls to them to use Logger.warning/1 and Logger.info/1 directly.
appsignal · Jun 26, 2024 · 64053ae · 64053ae
1 parent a4095cf
commit 64053ae
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 36 deletions.
diff --git a/lib/appsignal.ex b/lib/appsignal.ex
@@ -15,7 +15,6 @@ defmodule Appsignal do
   use Application
   alias Appsignal.Config
   require Logger
-  import Appsignal.Utils, only: [info: 1, warning: 1]
 
   @doc false
   def start(_type, _args) do
@@ -87,7 +86,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 +100,7 @@ defmodule Appsignal do
         end
 
       {{:error, :invalid_config}, true} ->
-        warning(
+        Logger.warning(
           "Warning: No valid AppSignal configuration found, continuing with " <>
             "AppSignal metrics disabled."
         )

diff --git a/lib/appsignal/absinthe.ex b/lib/appsignal/absinthe.ex
@@ -6,8 +6,6 @@ defmodule Appsignal.Absinthe do
 
   @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,7 @@ 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

diff --git a/lib/appsignal/config.ex b/lib/appsignal/config.ex
@@ -2,7 +2,6 @@ defmodule Appsignal.Config do
   @moduledoc false
   alias Appsignal.Nif
   alias Appsignal.Utils.FileSystem
-  import Appsignal.Utils, only: [warning: 1]
 
   @default_config %{
     active: false,
@@ -64,7 +63,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 +233,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".)

diff --git a/lib/appsignal/ecto.ex b/lib/appsignal/ecto.ex
@@ -3,7 +3,7 @@ defmodule Appsignal.Ecto do
 
   @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]
+  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

diff --git a/lib/appsignal/error/backend.ex b/lib/appsignal/error/backend.ex
@@ -8,14 +8,12 @@ defmodule Appsignal.Error.Backend do
 
   @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
 
       _ ->

diff --git a/lib/appsignal/finch.ex b/lib/appsignal/finch.ex
@@ -6,8 +6,6 @@ defmodule Appsignal.Finch do
 
   @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

diff --git a/lib/appsignal/oban.ex b/lib/appsignal/oban.ex
@@ -7,8 +7,6 @@ defmodule Appsignal.Oban do
 
   @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

diff --git a/lib/appsignal/tesla.ex b/lib/appsignal/tesla.ex
@@ -6,8 +6,6 @@ defmodule Appsignal.Tesla do
 
   @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

diff --git a/lib/appsignal/transmitter.ex b/lib/appsignal/transmitter.ex
@@ -1,8 +1,6 @@
 defmodule Appsignal.Transmitter do
   @moduledoc false
 
-  import Appsignal.Utils, only: [warning: 1]
-
   def request(method, url, headers \\ [], body \\ "") do
     http_client = Application.get_env(:appsignal, :http_client, :hackney)
     :application.ensure_all_started(http_client)
@@ -62,7 +60,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

diff --git a/lib/appsignal/utils.ex b/lib/appsignal/utils.ex
@@ -1,8 +1,6 @@
 defmodule Appsignal.Utils do
   @moduledoc false
 
-  require Logger
-
   @doc """
   Converts module name atoms to strings.
 
@@ -21,14 +19,6 @@ defmodule Appsignal.Utils do
 
   def module_name(module), do: module |> to_string() |> module_name()
 
-  defdelegate info(message), to: Logger
-
-  if Version.compare(System.version(), "1.11.0") == :lt do
-    defdelegate warning(message), to: Logger, as: :warn
-  else
-    defdelegate warning(message), to: Logger
-  end
-
   defmacro compile_env(app, key, default \\ nil) do
     if Version.match?(System.version(), ">= 1.10.0") do
       quote do