diff --git a/lib/plausible/session/store.ex b/lib/plausible/session/store.ex index 1b9410356..0fb8a3ffd 100644 --- a/lib/plausible/session/store.ex +++ b/lib/plausible/session/store.ex @@ -1,6 +1,7 @@ defmodule Plausible.Session.Store do use GenServer use Plausible.Repo + use Appsignal.Instrumentation.Decorators alias Plausible.Session.WriteBuffer import Ecto.Query, only: [from: 2] require Logger @@ -41,6 +42,7 @@ defmodule Plausible.Session.Store do {:ok, %{timer: timer, sessions: sessions}} end + @decorate transaction_event("phoenix_controller") def on_event(event, prev_user_id) do GenServer.call(__MODULE__, {:on_event, event, prev_user_id}) end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index c7cd645e6..b6a754472 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -1,5 +1,6 @@ defmodule PlausibleWeb.Api.ExternalController do use PlausibleWeb, :controller + use Appsignal.Instrumentation.Decorators require Logger def event(conn, _params) do @@ -54,6 +55,12 @@ defmodule PlausibleWeb.Api.ExternalController do }) end + @decorate transaction_event("phoenix_controller") + defp parse_user_agent(conn) do + user_agent = Plug.Conn.get_req_header(conn, "user-agent") |> List.first() + user_agent && UAInspector.parse(user_agent) + end + defp create_event(conn, params) do params = %{ "name" => params["n"] || params["name"], @@ -65,8 +72,7 @@ defmodule PlausibleWeb.Api.ExternalController do "meta" => parse_meta(params) } - user_agent = Plug.Conn.get_req_header(conn, "user-agent") |> List.first() - ua = user_agent && UAInspector.parse(user_agent) + ua = parse_user_agent(conn) if is_bot?(ua) do {:ok, nil} @@ -154,8 +160,10 @@ defmodule PlausibleWeb.Api.ExternalController do end end - defp parse_referrer(_, nil), do: nil + + @decorate transaction_event("phoenix_controller") + defp parse_referrer(_, nil), do: nil defp parse_referrer(uri, referrer_str) do referrer_uri = URI.parse(referrer_str) diff --git a/mix.exs b/mix.exs index 146b1a4cc..cb430a18a 100644 --- a/mix.exs +++ b/mix.exs @@ -38,7 +38,8 @@ defmodule Plausible.MixProject do :ua_inspector, :ref_inspector, :bamboo, - :bamboo_smtp + :bamboo_smtp, + :appsignal ] ] end