entry-exit-hostnames-schema
Adam Rutkowski 3 years ago
parent a7ceec21ec
commit cf59c1e572

@ -51,8 +51,7 @@ defmodule Plausible.Session.CacheStore do
if(event.name == "pageview" and session.hostname != event.hostname,
do: event.hostname,
else: session.hostname
)
|> IO.inspect(label: "updated_hostname_for user #{event.user_id}"),
),
exit_page: if(event.name == "pageview", do: event.pathname, else: session.exit_page),
exit_page_hostname:
if(event.name == "pageview", do: event.hostname, else: session.exit_page_hostname),
@ -68,9 +67,7 @@ defmodule Plausible.Session.CacheStore do
%Plausible.ClickhouseSessionV2{
sign: 1,
session_id: Plausible.ClickhouseSessionV2.random_uint64(),
hostname:
if(event.name == "pageview", do: event.hostname, else: "")
|> IO.inspect(label: "new hostname_for user #{event.user_id}"),
hostname: if(event.name == "pageview", do: event.hostname, else: ""),
site_id: event.site_id,
user_id: event.user_id,
entry_page: if(event.name == "pageview", do: event.pathname, else: ""),

@ -19,7 +19,7 @@ defmodule Plausible.Stats.Aggregate do
@session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit, :sample_percent]
def aggregate(site, query, metrics) do
IO.inspect(metrics, label: :metrics)
# IO.inspect(metrics, label: :metrics)
{currency, metrics} =
on_full_build do
@ -39,7 +39,7 @@ defmodule Plausible.Stats.Aggregate do
session_metrics =
Enum.filter(metrics, &(&1 in @session_metrics))
|> IO.inspect(label: :session_metrics)
# |> IO.inspect(label: :session_metrics)
session_task = fn -> aggregate_sessions(site, query, session_metrics) end
@ -63,7 +63,7 @@ defmodule Plausible.Stats.Aggregate do
defp aggregate_events(site, query, metrics) do
from(e in base_event_query(site, query), select: ^select_event_metrics(metrics))
|> IO.inspect(label: :agg_query)
# |> IO.inspect(label: :agg_query)
|> merge_imported(site, query, :aggregate, metrics)
|> maybe_add_conversion_rate(site, query, metrics, include_imported: query.include_imported)
|> ClickhouseRepo.one()

@ -384,7 +384,7 @@ defmodule PlausibleWeb.Api.StatsController do
current_results =
Stats.aggregate(site, query, metrics)
|> IO.inspect(label: :current)
# |> IO.inspect(label: :current)
prev_results = comparison_query && Stats.aggregate(site, comparison_query, metrics)

@ -89,6 +89,124 @@ defmodule Plausible.Session.CacheStoreTest do
assert session.events == 2
end
describe "hostname-related attributes" do
test "initial for non-pageview" do
site_id = new_site_id()
event =
build(:event,
name: "custom_event",
site_id: site_id,
pathname: "/path/1",
hostname: "example.com"
)
flush([event])
session = get_session(site_id)
assert session.hostname == ""
assert session.exit_page_hostname == ""
end
test "initial for pageview" do
site_id = new_site_id()
event =
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/path/1",
hostname: "example.com"
)
flush([event])
session = get_session(site_id)
assert session.hostname == "example.com"
assert session.exit_page_hostname == "example.com"
end
test "subsequent pageview after custom_event" do
site_id = new_site_id()
events = [
build(:event,
name: "custom_event",
site_id: site_id,
pathname: "/path/1",
hostname: "example.com",
timestamp: Timex.shift(Timex.now(), seconds: -5)
),
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/path/2",
hostname: "example.com"
)
]
flush(events)
session = get_session(site_id)
assert session.hostname == "example.com"
assert session.exit_page_hostname == "example.com"
end
test "hostname change" do
site_id = new_site_id()
events = [
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/landing",
hostname: "example.com",
timestamp: Timex.shift(Timex.now(), seconds: -5)
),
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/post/1",
hostname: "blog.example.com"
)
]
flush(events)
session = get_session(site_id)
assert session.hostname == "blog.example.com"
assert session.exit_page_hostname == "blog.example.com"
end
test "hostname change with custom event in the middle" do
site_id = new_site_id()
events = [
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/landing",
hostname: "example.com",
timestamp: Timex.shift(Timex.now(), seconds: -5)
),
build(:event,
name: "custom_event",
site_id: site_id,
pathname: "/path/1",
hostname: "analytics.example.com",
timestamp: Timex.shift(Timex.now(), seconds: -3)
),
build(:event,
name: "pageview",
site_id: site_id,
pathname: "/post/1",
hostname: "blog.example.com"
)
]
flush(events)
session = get_session(site_id)
assert session.hostname == "blog.example.com"
assert session.exit_page_hostname == "blog.example.com"
end
end
test "initial pageview-specific attributes" do
site_id = new_site_id()
@ -231,7 +349,12 @@ defmodule Plausible.Session.CacheStoreTest do
end
defp get_session(site_id) do
session_q = from s in Plausible.ClickhouseSessionV2, where: s.site_id == ^site_id
session_q =
from s in Plausible.ClickhouseSessionV2,
where: s.site_id == ^site_id,
order_by: [desc: :timestamp],
limit: 1
Plausible.ClickhouseRepo.one!(session_q)
end
end

@ -69,7 +69,7 @@ defmodule Plausible.Stats.DashboardFilterParserTest do
|> assert_parsed(%{"event:props:cta" => {:is, "Top"}})
%{"hostname" => "dummy.site"}
|> assert_parsed(%{"visit:hostname" => {:is, "dummy.site"}})
|> assert_parsed(%{"event:hostname" => {:is, "dummy.site"}})
end
end

@ -663,7 +663,7 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res =
json_response(conn, 200)
|> IO.inspect(label: :huh)
# |> IO.inspect(label: :huh)
assert %{"name" => "Unique visitors", "value" => 2} in res["top_stats"]
assert %{"name" => "Total visits", "value" => 2} in res["top_stats"]

Loading…
Cancel
Save