diff --git a/lib/plausible/session/store.ex b/lib/plausible/session/store.ex index 0fb8a3ffd..1b9410356 100644 --- a/lib/plausible/session/store.ex +++ b/lib/plausible/session/store.ex @@ -1,7 +1,6 @@ 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 @@ -42,7 +41,6 @@ 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/session/write_buffer.ex b/lib/plausible/session/write_buffer.ex index 24e9222c9..7d3713740 100644 --- a/lib/plausible/session/write_buffer.ex +++ b/lib/plausible/session/write_buffer.ex @@ -51,7 +51,10 @@ defmodule Plausible.Session.WriteBuffer do sessions -> Logger.info("Flushing #{length(sessions)} sessions") - sessions = Enum.map(sessions, &(Map.from_struct(&1) |> Map.delete(:__meta__))) + sessions = sessions + |> Enum.map(&(Map.from_struct(&1) |> Map.delete(:__meta__))) + |> Enum.reverse + Plausible.ClickhouseRepo.insert_all(Plausible.ClickhouseSession, sessions) end end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index b6a754472..ea37b9010 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -1,6 +1,5 @@ defmodule PlausibleWeb.Api.ExternalController do use PlausibleWeb, :controller - use Appsignal.Instrumentation.Decorators require Logger def event(conn, _params) do @@ -55,7 +54,6 @@ 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) @@ -162,7 +160,6 @@ defmodule PlausibleWeb.Api.ExternalController do - @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/lib/plausible_web/templates/auth/register_form.html.eex b/lib/plausible_web/templates/auth/register_form.html.eex index 5d43b1494..1bc494d40 100644 --- a/lib/plausible_web/templates/auth/register_form.html.eex +++ b/lib/plausible_web/templates/auth/register_form.html.eex @@ -45,7 +45,7 @@ <%= if PlausibleWeb.Captcha.enabled?() do %>