diff --git a/lib/plausible/ingestion/event.ex b/lib/plausible/ingestion/event.ex index f11c435ac..93acc5850 100644 --- a/lib/plausible/ingestion/event.ex +++ b/lib/plausible/ingestion/event.ex @@ -160,6 +160,7 @@ defmodule Plausible.Ingestion.Event do |> Keyword.put(:drop_reason, reason) emit_telemetry_dropped(event, reason) + IO.inspect(reason, label: :dropped) struct!(event, fields) end diff --git a/mix.exs b/mix.exs index 95c76fdf5..19ca52e00 100644 --- a/mix.exs +++ b/mix.exs @@ -149,6 +149,12 @@ defmodule Plausible.MixProject do setup: ["deps.get", "ecto.setup", "assets.setup", "assets.build"], "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"], "ecto.reset": ["ecto.drop", "ecto.setup"], + "seed.journey": [ + "ecto.drop", + "ecto.create", + "ecto.migrate", + "run priv/repo/seeds_journey.exs" + ], test: ["ecto.create --quiet", "ecto.migrate", "test", "clean_clickhouse"], sentry_recompile: ["compile", "deps.compile sentry --force"], "assets.setup": ["tailwind.install --if-missing", "esbuild.install --if-missing"], diff --git a/test/support/journey.ex b/test/support/journey.ex index 5ce3b851c..c835fb89c 100644 --- a/test/support/journey.ex +++ b/test/support/journey.ex @@ -36,13 +36,6 @@ defmodule Plausible.Test.Support.Journey do %{name: name, domain: site.domain, url: build_url(site, "/", opts)} |> add_common_body_params(opts) - payload = - if opts[:props] do - Map.put(payload, :props, opts[:props]) - else - payload - end - conn |> conn(:post, "/api/events", payload) |> ingest(state, invoke_if_function(Keyword.get(opts, :idle, 1), state.now)) @@ -57,7 +50,7 @@ defmodule Plausible.Test.Support.Journey do params = params |> Enum.into(%{}) - |> Map.take(~w[referrer]a) + |> Map.take(~w[revenue referrer url props]a) if Enum.empty?(params) do payload @@ -142,7 +135,7 @@ defmodule Plausible.Test.Support.Journey do defp debug(conn, state, idle, now, new_now) do IO.puts("\n[#{now}] Request:" <> IO.ANSI.yellow()) IO.puts(" #{conn.method} #{conn.request_path}?#{conn.query_string}" <> IO.ANSI.cyan()) - IO.puts(" user-agent: #{state.user_agent}") + IO.puts(" user-agent: #{inspect(state.user_agent)}") IO.puts(" x-forwarded-for: #{state.ip}" <> IO.ANSI.green()) IO.puts(" #{Jason.encode!(conn.body_params)}" <> IO.ANSI.reset()) IO.puts("[#{new_now}] Idle complete (#{inspect(idle)})") diff --git a/test/support/test_utils.ex b/test/support/test_utils.ex index 987992d9e..03e3342d5 100644 --- a/test/support/test_utils.ex +++ b/test/support/test_utils.ex @@ -272,4 +272,22 @@ defmodule Plausible.TestUtils do def tomorrow(now) do NaiveDateTime.add(now, 1, :day) end + + def rand_user_agent() do + [ + "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/156.1.368858699 Mobile/18A393 Safari/604.1", + "Mozilla/5.0 (Linux; Android 9; SM-A305G Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.82 Mobile Safari/537.36 GSA/12.14.7.23.arm64", + "Mozilla/5.0 (Linux; Android 10; moto g(8) plus Build/QPIS30.28-Q3-28-26-3-4; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.66 Mobile Safari/537.36 GSA/12.14.7.23.arm64", + "com.google.GoogleMobile/156.1 iPhone/14.0.1 hw/iPhone10_4", + "Mozilla/5.0 (Linux; Android 10; vivo 1819 Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.66 Mobile Safari/537.36 GSA/12.14.7.23.arm64", + "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/7.0; .NET4.0C; .NET4.0E; InfoPath.3; Tablet PC 2.0; HCTE; ms-office; MSOffice 15)", + "Mozilla/5.0 (Linux; Android 5.1; F5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.181 Mobile Safari/537.36", + "Mozilla/5.0 (Linux; Android 9; LM-X420 Build/PKQ1.190522.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.66 Mobile Safari/537.36 GSA/12.14.7.23.arm", + "Mozilla/5.0 (Linux; Android 10; SM-A516B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.82 Mobile Safari/537.36", + "Mozilla/5.0 (Linux; Android 7.0; Mi-4c) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.66 Mobile Safari/537.36" + ] + |> Enum.random() + end + + def rand_idle(_), do: Enum.random(1..100) end