Use Utils.compile_env in Appsignal.Phoenix (#44)

to avoid warnings on Elixir 1.14+
appsignal · Mar 28, 2022 · 42b2cdd · 42b2cdd
1 parent e203a91
commit 42b2cdd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/.changesets/fix-application-environment-warnings-on-elixir-1-14.md b/.changesets/fix-application-environment-warnings-on-elixir-1-14.md
@@ -0,0 +1,6 @@
+---
+bump: "patch"
+type: "fix"
+---
+
+Fix application environment warnings on Elixir 1.14
diff --git a/lib/appsignal_phoenix/channel.ex b/lib/appsignal_phoenix/channel.ex
@@ -28,8 +28,9 @@ defmodule Appsignal.Phoenix.Channel do
 
   """
 
-  @tracer Application.get_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Application.get_env(:appsignal, :appsignal_span, Appsignal.Span)
+  require Appsignal.Utils
+  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   def instrument(module, name, socket, fun) do
     instrument(module, name, %{}, socket, fun)

diff --git a/lib/appsignal_phoenix/event_handler.ex b/lib/appsignal_phoenix/event_handler.ex
@@ -1,6 +1,7 @@
 defmodule Appsignal.Phoenix.EventHandler do
-  @tracer Application.get_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Application.get_env(:appsignal, :appsignal_span, Appsignal.Span)
+  require Appsignal.Utils
+  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
   @moduledoc false
 
   require Logger

diff --git a/lib/appsignal_phoenix/live_view.ex b/lib/appsignal_phoenix/live_view.ex
@@ -1,6 +1,7 @@
 defmodule Appsignal.Phoenix.LiveView do
-  @tracer Application.get_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
-  @span Application.get_env(:appsignal, :appsignal_span, Appsignal.Span)
+  require Appsignal.Utils
+  @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
 
   def instrument(module, name, socket, fun) do
     instrument(module, name, %{}, socket, fun)

diff --git a/lib/appsignal_phoenix/template.ex b/lib/appsignal_phoenix/template.ex
@@ -1,5 +1,6 @@
 defmodule Appsignal.Phoenix.Template do
-  @span Application.get_env(:appsignal, :appsignal_span, Appsignal.Span)
+  require Appsignal.Utils
+  @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
   @moduledoc false
 
   def compile(fun, path) do

diff --git a/lib/appsignal_phoenix/view.ex b/lib/appsignal_phoenix/view.ex
@@ -40,8 +40,9 @@ defmodule Appsignal.Phoenix.View do
 
   defmacro __before_compile__(_env) do
     quote do
-      @span Application.get_env(:appsignal, :appsignal_span, Appsignal.Span)
-      @tracer Application.get_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
+      require Appsignal.Utils
+      @span Appsignal.Utils.compile_env(:appsignal, :appsignal_span, Appsignal.Span)
+      @tracer Appsignal.Utils.compile_env(:appsignal, :appsignal_tracer, Appsignal.Tracer)
 
       defoverridable render: 2
 

diff --git a/mix.exs b/mix.exs
@@ -55,7 +55,7 @@ defmodule Appsignal.Phoenix.MixProject do
       end
 
     [
-      {:appsignal_plug, ">= 2.0.8 and < 3.0.0"},
+      {:appsignal_plug, ">= 2.0.9 and < 3.0.0"},
       {:phoenix, "~> 1.4"},
       {:phoenix_html, "~> 2.11 or ~> 3.0", optional: true},
       {:phoenix_live_view, "~> 0.9", optional: true},