Dont write session parameters to events

These would only be stored on first event anyways. Work remains to be done
on tests which have their own helper
drop-event-columns
Karl-Aksel Puulmann 3 years ago
parent 1cc9a48ca1
commit 9687349a77

@ -13,6 +13,7 @@ defmodule Plausible.Ingestion.Event do
defstruct domain: nil,
site: nil,
clickhouse_event_attrs: %{},
clickhouse_session_attrs: %{},
clickhouse_event: nil,
dropped?: false,
drop_reason: nil,
@ -32,6 +33,7 @@ defmodule Plausible.Ingestion.Event do
domain: String.t() | nil,
site: %Plausible.Site{} | nil,
clickhouse_event_attrs: map(),
clickhouse_session_attrs: %{},
clickhouse_event: %ClickhouseEventV2{} | nil,
dropped?: boolean(),
drop_reason: drop_reason(),
@ -139,10 +141,14 @@ defmodule Plausible.Ingestion.Event do
struct!(event, fields)
end
defp update_attrs(%__MODULE__{} = event, %{} = attrs) do
defp update_event_attrs(%__MODULE__{} = event, %{} = attrs) do
struct!(event, clickhouse_event_attrs: Map.merge(event.clickhouse_event_attrs, attrs))
end
defp update_session_attrs(%__MODULE__{} = event, %{} = attrs) do
struct!(event, clickhouse_session_attrs: Map.merge(event.clickhouse_session_attrs, attrs))
end
defp drop_datacenter_ip(%__MODULE__{} = event) do
case event.request.ip_classification do
"dc_ip" ->
@ -175,7 +181,7 @@ defmodule Plausible.Ingestion.Event do
drop(event, :bot)
%UAInspector.Result{} = user_agent ->
update_attrs(event, %{
update_session_attrs(event, %{
operating_system: os_name(user_agent),
operating_system_version: os_version(user_agent),
browser: browser_name(user_agent),
@ -189,7 +195,7 @@ defmodule Plausible.Ingestion.Event do
end
defp put_basic_info(%__MODULE__{} = event) do
update_attrs(event, %{
update_event_attrs(event, %{
domain: event.domain,
site_id: event.site.id,
timestamp: event.request.timestamp,
@ -202,7 +208,7 @@ defmodule Plausible.Ingestion.Event do
defp put_referrer(%__MODULE__{} = event) do
ref = parse_referrer(event.request.uri, event.request.referrer)
update_attrs(event, %{
update_session_attrs(event, %{
referrer_source: get_referrer_source(event.request, ref),
referrer: clean_referrer(ref)
})
@ -211,7 +217,7 @@ defmodule Plausible.Ingestion.Event do
defp put_utm_tags(%__MODULE__{} = event) do
query_params = event.request.query_params
update_attrs(event, %{
update_session_attrs(event, %{
utm_medium: query_params["utm_medium"],
utm_source: query_params["utm_source"],
utm_campaign: query_params["utm_campaign"],
@ -223,14 +229,14 @@ defmodule Plausible.Ingestion.Event do
defp put_geolocation(%__MODULE__{} = event) do
result = Plausible.Ingestion.Geolocation.lookup(event.request.remote_ip) || %{}
update_attrs(event, result)
update_session_attrs(event, result)
end
defp put_props(%__MODULE__{request: %{props: %{} = props}} = event) do
# defensive: ensuring the keys/values are always in the same order
{keys, values} = Enum.unzip(props)
update_attrs(event, %{
update_event_attrs(event, %{
"meta.key": keys,
"meta.value": values
})
@ -241,7 +247,7 @@ defmodule Plausible.Ingestion.Event do
defp put_revenue(event) do
on_full_build do
attrs = Plausible.Ingestion.Event.Revenue.get_revenue_attrs(event)
update_attrs(event, attrs)
update_event_attrs(event, attrs)
else
event
end
@ -252,7 +258,7 @@ defmodule Plausible.Ingestion.Event do
end
defp put_user_id(%__MODULE__{} = event) do
update_attrs(event, %{
update_event_attrs(event, %{
user_id:
generate_user_id(
event.request,
@ -287,7 +293,12 @@ defmodule Plausible.Ingestion.Event do
event.salts.previous
)
session_id = Plausible.Session.CacheStore.on_event(event.clickhouse_event, previous_user_id)
session_id =
Plausible.Session.CacheStore.on_event(
event.clickhouse_event,
event.clickhouse_session_attrs,
previous_user_id
)
clickhouse_event = Map.put(event.clickhouse_event, :session_id, session_id)
%{event | clickhouse_event: clickhouse_event}

@ -2,7 +2,7 @@ defmodule Plausible.Session.CacheStore do
require Logger
alias Plausible.Session.WriteBuffer
def on_event(event, prev_user_id, buffer \\ WriteBuffer) do
def on_event(event, session_attributes, prev_user_id, buffer \\ WriteBuffer) do
found_session = find_session(event, event.user_id) || find_session(event, prev_user_id)
session =
@ -11,7 +11,7 @@ defmodule Plausible.Session.CacheStore do
buffer.insert([%{found_session | sign: -1}, %{updated_session | sign: 1}])
persist_session(updated_session)
else
new_session = new_session_from_event(event)
new_session = new_session_from_event(event, session_attributes)
buffer.insert([new_session])
persist_session(new_session)
end
@ -59,7 +59,7 @@ defmodule Plausible.Session.CacheStore do
}
end
defp new_session_from_event(event) do
defp new_session_from_event(event, session_attributes) do
%Plausible.ClickhouseSessionV2{
sign: 1,
session_id: Plausible.ClickhouseSessionV2.random_uint64(),
@ -72,22 +72,22 @@ defmodule Plausible.Session.CacheStore do
duration: 0,
pageviews: if(event.name == "pageview", do: 1, else: 0),
events: 1,
referrer: event.referrer,
referrer_source: event.referrer_source,
utm_medium: event.utm_medium,
utm_source: event.utm_source,
utm_campaign: event.utm_campaign,
utm_content: event.utm_content,
utm_term: event.utm_term,
country_code: event.country_code,
subdivision1_code: event.subdivision1_code,
subdivision2_code: event.subdivision2_code,
city_geoname_id: event.city_geoname_id,
screen_size: event.screen_size,
operating_system: event.operating_system,
operating_system_version: event.operating_system_version,
browser: event.browser,
browser_version: event.browser_version,
referrer: Map.get(session_attributes, :referrer),
referrer_source: Map.get(session_attributes, :referrer_source),
utm_medium: Map.get(session_attributes, :utm_medium),
utm_source: Map.get(session_attributes, :utm_source),
utm_campaign: Map.get(session_attributes, :utm_campaign),
utm_content: Map.get(session_attributes, :utm_content),
utm_term: Map.get(session_attributes, :utm_term),
country_code: Map.get(session_attributes, :country_code),
subdivision1_code: Map.get(session_attributes, :subdivision1_code),
subdivision2_code: Map.get(session_attributes, :subdivision2_code),
city_geoname_id: Map.get(session_attributes, :city_geoname_id),
screen_size: Map.get(session_attributes, :screen_size),
operating_system: Map.get(session_attributes, :operating_system),
operating_system_version: Map.get(session_attributes, :operating_system_version),
browser: Map.get(session_attributes, :browser),
browser_version: Map.get(session_attributes, :browser_version),
timestamp: event.timestamp,
start: event.timestamp,
"entry_meta.key": Map.get(event, :"meta.key"),

@ -17,24 +17,27 @@ defmodule Plausible.Session.CacheStoreTest do
event =
build(:event,
name: "pageview",
referrer: "ref",
referrer_source: "refsource",
utm_medium: "medium",
utm_source: "source",
utm_campaign: "campaign",
utm_content: "content",
utm_term: "term",
browser: "browser",
browser_version: "55",
country_code: "EE",
screen_size: "Desktop",
operating_system: "Mac",
operating_system_version: "11",
"meta.key": ["logged_in", "darkmode"],
"meta.value": ["true", "false"]
)
CacheStore.on_event(event, nil, buffer)
session_params = %{
referrer: "ref",
referrer_source: "refsource",
utm_medium: "medium",
utm_source: "source",
utm_campaign: "campaign",
utm_content: "content",
utm_term: "term",
browser: "browser",
browser_version: "55",
country_code: "EE",
screen_size: "Desktop",
operating_system: "Mac",
operating_system_version: "11"
}
CacheStore.on_event(event, session_params, nil, buffer)
assert_receive({WriteBuffer, :insert, [sessions]})
assert [session] = sessions
@ -49,19 +52,19 @@ defmodule Plausible.Session.CacheStoreTest do
assert session.duration == 0
assert session.pageviews == 1
assert session.events == 1
assert session.referrer == event.referrer
assert session.referrer_source == event.referrer_source
assert session.utm_medium == event.utm_medium
assert session.utm_source == event.utm_source
assert session.utm_campaign == event.utm_campaign
assert session.utm_content == event.utm_content
assert session.utm_term == event.utm_term
assert session.country_code == event.country_code
assert session.screen_size == event.screen_size
assert session.operating_system == event.operating_system
assert session.operating_system_version == event.operating_system_version
assert session.browser == event.browser
assert session.browser_version == event.browser_version
assert session.referrer == Map.get(session_params, :referrer)
assert session.referrer_source == Map.get(session_params, :referrer_source)
assert session.utm_medium == Map.get(session_params, :utm_medium)
assert session.utm_source == Map.get(session_params, :utm_source)
assert session.utm_campaign == Map.get(session_params, :utm_campaign)
assert session.utm_content == Map.get(session_params, :utm_content)
assert session.utm_term == Map.get(session_params, :utm_term)
assert session.country_code == Map.get(session_params, :country_code)
assert session.screen_size == Map.get(session_params, :screen_size)
assert session.operating_system == Map.get(session_params, :operating_system)
assert session.operating_system_version == Map.get(session_params, :operating_system_version)
assert session.browser == Map.get(session_params, :browser)
assert session.browser_version == Map.get(session_params, :browser_version)
assert session.timestamp == event.timestamp
assert session.start === event.timestamp
# assert Map.get(session, :"entry.meta.key") == ["logged_in", "darkmode"]
@ -77,8 +80,8 @@ defmodule Plausible.Session.CacheStoreTest do
| timestamp: timestamp
}
CacheStore.on_event(event1, nil, buffer)
CacheStore.on_event(event2, nil, buffer)
CacheStore.on_event(event1, %{}, nil, buffer)
CacheStore.on_event(event2, %{}, nil, buffer)
assert_receive({WriteBuffer, :insert, [[_negative_record, session]]})
assert session.is_bounce == false
assert session.duration == 10
@ -92,8 +95,8 @@ defmodule Plausible.Session.CacheStoreTest do
event2 = %{event1 | timestamp: timestamp}
CacheStore.on_event(event1, nil, buffer)
CacheStore.on_event(event2, nil, buffer)
CacheStore.on_event(event1, %{}, nil, buffer)
CacheStore.on_event(event2, %{}, nil, buffer)
assert_receive({WriteBuffer, :insert, [[_negative_record, session]]})
assert session.duration == 10
@ -108,7 +111,7 @@ defmodule Plausible.Session.CacheStoreTest do
end
defp flush(events) do
for e <- events, do: CacheStore.on_event(e, nil)
for e <- events, do: CacheStore.on_event(e, %{}, nil)
Plausible.Session.WriteBuffer.flush()
end

@ -223,13 +223,13 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.operating_system == "Mac"
assert pageview.operating_system_version == "10.13"
assert pageview.browser == "Chrome"
assert pageview.browser_version == "70.0"
assert session.operating_system == "Mac"
assert session.operating_system_version == "10.13"
assert session.browser == "Chrome"
assert session.browser_version == "70.0"
end
test "parses referrer", %{conn: conn, site: site} do
@ -245,10 +245,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == "Facebook"
assert session.referrer_source == "Facebook"
end
test "strips trailing slash from referrer", %{conn: conn, site: site} do
@ -264,11 +264,11 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer == "facebook.com/page"
assert pageview.referrer_source == "Facebook"
assert session.referrer == "facebook.com/page"
assert session.referrer_source == "Facebook"
end
test "ignores event when referrer is a spammer", %{conn: conn, site: site} do
@ -321,10 +321,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == ""
assert session.referrer_source == ""
end
test "ignores localhost referrer", %{conn: conn, site: site} do
@ -340,10 +340,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == ""
assert session.referrer_source == ""
end
test "parses subdomain referrer", %{conn: conn, site: site} do
@ -359,10 +359,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == "blog.example.com"
assert session.referrer_source == "blog.example.com"
end
test "referrer is cleaned", %{conn: conn, site: site} do
@ -376,9 +376,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
conn
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.referrer == "indiehackers.com/page"
assert session.referrer == "indiehackers.com/page"
end
test "utm_source overrides referrer source", %{conn: conn, site: site} do
@ -392,9 +392,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
conn
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.referrer_source == "betalist"
assert session.referrer_source == "betalist"
end
test "utm tags are stored", %{conn: conn, site: site} do
@ -408,11 +408,11 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
conn
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.utm_medium == "ads"
assert pageview.utm_source == "instagram"
assert pageview.utm_campaign == "video_story"
assert session.utm_medium == "ads"
assert session.utm_source == "instagram"
assert session.utm_campaign == "video_story"
end
test "if it's an :unknown referrer, just the domain is used", %{conn: conn, site: site} do
@ -428,10 +428,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == "indiehackers.com"
assert session.referrer_source == "indiehackers.com"
end
test "if the referrer is not http or https, it is ignored", %{conn: conn, site: site} do
@ -447,10 +447,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.referrer_source == ""
assert session.referrer_source == ""
end
test "screen size is calculated from user agent", %{conn: conn, site: site} do
@ -465,10 +465,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent_mobile)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.screen_size == "Mobile"
assert session.screen_size == "Mobile"
end
test "screen size is nil if user agent is unknown", %{conn: conn, site: site} do
@ -483,10 +483,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", "unknown UA")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.screen_size == ""
assert session.screen_size == ""
end
test "screen size is calculated from user_agent when is tablet", %{conn: conn, site: site} do
@ -501,10 +501,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent_tablet)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.screen_size == "Tablet"
assert session.screen_size == "Tablet"
end
test "screen size is calculated from user_agent when is desktop", %{
@ -522,10 +522,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert pageview.screen_size == "Desktop"
assert session.screen_size == "Desktop"
end
test "can trigger a custom event", %{conn: conn, site: site} do
@ -792,10 +792,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
event = get_event(site)
session = get_created_session(site)
assert response(conn, 202) == "ok"
assert event.referrer == ""
assert session.referrer == ""
end
# Fake geo is loaded from test/priv/GeoLite2-City-Test.mmdb
@ -810,12 +810,12 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "2.125.160.216")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "GB"
assert pageview.subdivision1_code == "GB-ENG"
assert pageview.subdivision2_code == "GB-WBK"
assert pageview.city_geoname_id == 2_655_045
assert session.country_code == "GB"
assert session.subdivision1_code == "GB-ENG"
assert session.subdivision2_code == "GB-WBK"
assert session.city_geoname_id == 2_655_045
end
test "ignores unknown country code ZZ", %{conn: conn, site: site} do
@ -829,12 +829,12 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "0.0.0.0")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == <<0, 0>>
assert pageview.subdivision1_code == ""
assert pageview.subdivision2_code == ""
assert pageview.city_geoname_id == 0
assert session.country_code == <<0, 0>>
assert session.subdivision1_code == ""
assert session.subdivision2_code == ""
assert session.city_geoname_id == 0
end
test "ignores disputed territory code XX", %{conn: conn, site: site} do
@ -848,12 +848,12 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "0.0.0.1")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == <<0, 0>>
assert pageview.subdivision1_code == ""
assert pageview.subdivision2_code == ""
assert pageview.city_geoname_id == 0
assert session.country_code == <<0, 0>>
assert session.subdivision1_code == ""
assert session.subdivision2_code == ""
assert session.city_geoname_id == 0
end
test "ignores TOR exit node country code T1", %{conn: conn, site: site} do
@ -867,12 +867,12 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "0.0.0.2")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == <<0, 0>>
assert pageview.subdivision1_code == ""
assert pageview.subdivision2_code == ""
assert pageview.city_geoname_id == 0
assert session.country_code == <<0, 0>>
assert session.subdivision1_code == ""
assert session.subdivision2_code == ""
assert session.city_geoname_id == 0
end
test "scrubs port from x-forwarded-for", %{conn: conn, site: site} do
@ -886,9 +886,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "216.160.83.56:123")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "US"
assert session.country_code == "US"
end
test "works with ipv6 without port in x-forwarded-for", %{conn: conn, site: site} do
@ -902,9 +902,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "2001:218:1:1:1:1:1:1")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "JP"
assert session.country_code == "JP"
end
test "works with ipv6 with a port number in x-forwarded-for", %{conn: conn, site: site} do
@ -918,9 +918,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-forwarded-for", "[2001:218:1:1:1:1:1:1]:123")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "JP"
assert session.country_code == "JP"
end
test "uses cloudflare's special header for client IP address if present", %{
@ -938,9 +938,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("cf-connecting-ip", "216.160.83.56")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "US"
assert session.country_code == "US"
end
test "uses BunnyCDN's custom header for client IP address if present", %{
@ -958,9 +958,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("b-forwarded-for", "216.160.83.56,9.9.9.9")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "US"
assert session.country_code == "US"
end
test "prioritizes x-plausible-ip header over everything else", %{
@ -981,9 +981,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("x-plausible-ip", "216.160.83.56")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "US"
assert session.country_code == "US"
end
test "Uses the Forwarded header when cf-connecting-ip and x-forwarded-for are missing", %{
@ -999,9 +999,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> put_req_header("forwarded", "by=0.0.0.0;for=216.160.83.56;host=somehost.com;proto=https")
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "US"
assert session.country_code == "US"
end
test "Forwarded header can parse ipv6", %{site: site} do
@ -1018,9 +1018,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
)
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.country_code == "JP"
assert session.country_code == "JP"
end
test "URL is decoded", %{conn: conn, site: site} do
@ -1051,10 +1051,11 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.pathname == "/opportunity"
assert pageview.referrer_source == "Facebook"
assert pageview.referrer == "facebook.com/page"
assert session.referrer_source == "Facebook"
assert session.referrer == "facebook.com/page"
end
test "records hash when in hash mode", %{conn: conn, site: site} do
@ -1102,10 +1103,11 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.hostname == "test.com"
assert pageview.pathname == "/ﺝﻭﺎﺋﺯ-ﻮﻤﺳﺎﺒﻗﺎﺗ"
assert pageview.utm_source == "%balle%"
assert session.utm_source == "%balle%"
end
test "can use double quotes in query params", %{conn: conn, site: site} do
@ -1121,9 +1123,9 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
conn
|> post("/api/event", params)
pageview = get_event(site)
session = get_created_session(site)
assert pageview.utm_source == "Something \"quoted\""
assert session.utm_source == "Something \"quoted\""
end
test "responds 400 when required fields are missing", %{conn: conn, site: site} do
@ -1377,6 +1379,17 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
)
end
defp get_created_session(site) do
Plausible.Session.WriteBuffer.flush()
ClickhouseRepo.one(
from(s in Plausible.ClickhouseSessionV2,
where: s.site_id == ^site.id and s.sign == 1,
order_by: [desc: s.timestamp]
)
)
end
defp get_events(site) do
Plausible.Event.WriteBuffer.flush()

@ -196,7 +196,8 @@ defmodule Plausible.TestUtils do
defp populate_native_stats(events) do
sessions =
Enum.reduce(events, %{}, fn event, sessions ->
session_id = Plausible.Session.CacheStore.on_event(event, nil)
# :TODO: Handle session parameters separately
session_id = Plausible.Session.CacheStore.on_event(event, event, nil)
Map.put(sessions, {event.site_id, event.user_id}, session_id)
end)

Loading…
Cancel
Save