Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix CE tracker script cache issue (#5956)

Artur Pata121ef8de14f0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee1c4a618..3449d20d48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
- To make internal stats API requests for password-protected shared links, shared link auth cookie must be set in the requests
- Fixed issue with site guests in Editor role and team members in Editor role not being able to change the domain of site
- Fixed direct dashboard links that use legacy dashboard filters containing URL encoded special characters (e.g. character `ê` in the legacy filter `?page=%C3%AA`)
+- Fix bug with tracker script config cache that made requests for certain cached scripts give error 500
## v3.1.0 - 2025-11-13
diff --git a/extra/lib/plausible/site/tracker_script_id_cache.ex b/extra/lib/plausible/site/tracker_script_id_cache.ex
new file mode 100644
index 0000000000..9711a57568
--- /dev/null
+++ b/extra/lib/plausible/site/tracker_script_id_cache.ex
@@ -0,0 +1,50 @@
+defmodule Plausible.Site.TrackerScriptIdCache do
+ @moduledoc """
+ Cache for tracker script IDs to avoid excessive database lookups when the
+ script API endpoint is bombarded with random IDs.
+ """
+ alias Plausible.Site.TrackerScriptConfiguration
+ alias PlausibleWeb.Tracker
+
+ import Ecto.Query
+ use Plausible
+ use Plausible.Cache
+
+ @cache_name :tracker_script_id_cache
+
+ @impl true
+ def name(), do: @cache_name
+
+ @impl true
+ def child_id(), do: :cache_tracker_script_id
+
+ @impl true
+ def count_all() do
+ Plausible.Repo.aggregate(TrackerScriptConfiguration, :count)
+ end
+
+ @impl true
+ def base_db_query(), do: Tracker.get_tracker_script_configuration_base_query()
+
+ @impl true
+ def get_from_source(id) do
+ case Tracker.get_tracker_script_configuration_by_id(id) do
+ %TrackerScriptConfiguration{site: %{domain: _domain}} ->
+ true
+
+ _ ->
+ nil
+ end
+ end
+
+ @impl true
+ def unwrap_cache_keys(items) do
+ Enum.reduce(items, [], fn
+ tracker_script_configuration, acc ->
+ [
+ {tracker_script_configuration.id, true}
+ | acc
+ ]
+ end)
+ end
+end
diff --git a/lib/plausible/application.ex b/lib/plausible/application.ex
index 2bae31a2c3..b94441217c 100644
--- a/lib/plausible/application.ex
+++ b/lib/plausible/application.ex
@@ -160,20 +160,38 @@ defmodule Plausible.Application do
]
)
end,
- warmed_cache(PlausibleWeb.TrackerScriptCache,
- adapter_opts: [
- n_lock_partitions: 1,
- ttl_check_interval: false,
- ets_options: [:bag, read_concurrency: true]
- ],
- warmers: [
- refresh_all:
- {PlausibleWeb.TrackerScriptCache.All,
- interval: :timer.minutes(180) + Enum.random(1..:timer.seconds(10))},
- refresh_updated_recently:
- {PlausibleWeb.TrackerScriptCache.RecentlyUpdated, interval: :timer.seconds(30)}
- ]
- ),
+ on_ee do
+ warmed_cache(Plausible.Site.TrackerScriptIdCache,
+ adapter_opts: [
+ n_lock_partitions: 1,
+ ttl_check_interval: false,
+ ets_options: [read_concurrency: true]
+ ],
+ warmers: [
+ refresh_all:
+ {Plausible.Site.TrackerScriptIdCache.All,
+ interval: :timer.minutes(180) + Enum.random(1..:timer.seconds(10))},
+ refresh_updated_recently:
+ {Plausible.Site.TrackerScriptIdCache.RecentlyUpdated,
+ interval: :timer.seconds(30)}
+ ]
+ )
+ else
+ warmed_cache(Plausible.Site.TrackerScriptCache,
+ adapter_opts: [
+ n_lock_partitions: 1,
+ ttl_check_interval: false,
+ ets_options: [read_concurrency: true]
+ ],
+ warmers: [
+ refresh_all:
+ {Plausible.Site.TrackerScriptCache.All,
+ interval: :timer.minutes(180) + Enum.random(1..:timer.seconds(10))},
+ refresh_updated_recently:
+ {Plausible.Site.TrackerScriptCache.RecentlyUpdated, interval: :timer.seconds(30)}
+ ]
+ )
+ end,
Plausible.Ingestion.Counters,
Plausible.Session.Salts,
Supervisor.child_spec(Plausible.Event.WriteBuffer, id: Plausible.Event.WriteBuffer),
diff --git a/lib/plausible/cache.ex b/lib/plausible/cache.ex
index c03c96b5fa..496c02784f 100644
--- a/lib/plausible/cache.ex
+++ b/lib/plausible/cache.ex
@@ -64,6 +64,12 @@ defmodule Plausible.Cache do
alias Plausible.Cache.Adapter
require Logger
+ @spec put(any(), any(), Keyword.t()) :: any()
+ def put(key, value, opts \\ []) do
+ cache_name = Keyword.get(opts, :cache_name, name())
+ Adapter.put(cache_name, key, value)
+ end
+
@spec broadcast_put(any(), any(), Keyword.t()) :: :ok
def broadcast_put(key, value, opts \\ []) do
cache_name = Keyword.get(opts, :cache_name, name())
diff --git a/lib/plausible_web/tracker_script_cache.ex b/lib/plausible/site/tracker_script_cache.ex
similarity index 63%
rename from lib/plausible_web/tracker_script_cache.ex
rename to lib/plausible/site/tracker_script_cache.ex
index 89e894dd82..1e86efa220 100644
--- a/lib/plausible_web/tracker_script_cache.ex
+++ b/lib/plausible/site/tracker_script_cache.ex
@@ -1,9 +1,7 @@
-defmodule PlausibleWeb.TrackerScriptCache do
+defmodule Plausible.Site.TrackerScriptCache do
@moduledoc """
- Cache for tracker script.
-
- On self-hosted instances, we cache the entire tracker script.
- On EE instances, we cache valid tracker script ids to avoid database lookups.
+ Caches the full tracker script.
+ Must be refreshed whenever the TrackerScriptConfiguration associated with the script changes.
"""
alias Plausible.Site.TrackerScriptConfiguration
alias PlausibleWeb.Tracker
@@ -20,16 +18,10 @@ defmodule PlausibleWeb.TrackerScriptCache do
@impl true
def child_id(), do: :cache_tracker_script
- on_ee do
- @doc "Caches that the config exists"
- def cache_content(%TrackerScriptConfiguration{} = _tracker_script_configuration), do: true
- else
- @doc "Caches the full tracker script"
- def cache_content(
- %TrackerScriptConfiguration{site: %{domain: _domain}} = tracker_script_configuration
- ),
- do: Tracker.build_script(tracker_script_configuration)
- end
+ def cache_content(
+ %TrackerScriptConfiguration{site: %{domain: _domain}} = tracker_script_configuration
+ ),
+ do: Tracker.build_script(tracker_script_configuration)
@impl true
def count_all() do
diff --git a/lib/plausible/telemetry/plausible_metrics.ex b/lib/plausible/telemetry/plausible_metrics.ex
index 08f1eb3d40..6ed2543ea4 100644
--- a/lib/plausible/telemetry/plausible_metrics.ex
+++ b/lib/plausible/telemetry/plausible_metrics.ex
@@ -55,7 +55,12 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
),
distribution(
metric_prefix ++ [:cache_warmer, :tracker_script, :refresh, :all],
- event_name: PlausibleWeb.TrackerScriptCache.telemetry_event_refresh(:all),
+ event_name:
+ on_ee do
+ Plausible.Site.TrackerScriptIdCache.telemetry_event_refresh(:all)
+ else
+ Plausible.Site.TrackerScriptCache.telemetry_event_refresh(:all)
+ end,
reporter_options: [
buckets: [500, 1000, 2000, 5000, 10_000]
],
@@ -64,7 +69,12 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
),
distribution(
metric_prefix ++ [:cache_warmer, :tracker_script, :refresh, :updated_recently],
- event_name: PlausibleWeb.TrackerScriptCache.telemetry_event_refresh(:updated_recently),
+ event_name:
+ on_ee do
+ Plausible.Site.TrackerScriptIdCache.telemetry_event_refresh(:updated_recently)
+ else
+ Plausible.Site.TrackerScriptCache.telemetry_event_refresh(:updated_recently)
+ end,
reporter_options: [
buckets: [500, 1000, 2000, 5000, 10_000]
],
diff --git a/lib/plausible_web/controllers/api/system_controller.ex b/lib/plausible_web/controllers/api/system_controller.ex
index 3fdd993fa9..4e5c756482 100644
--- a/lib/plausible_web/controllers/api/system_controller.ex
+++ b/lib/plausible_web/controllers/api/system_controller.ex
@@ -1,4 +1,5 @@
defmodule PlausibleWeb.Api.SystemController do
+ use Plausible
use PlausibleWeb, :controller
require Logger
@@ -25,8 +26,13 @@ defmodule PlausibleWeb.Api.SystemController do
@critical_caches [
Plausible.Site.Cache,
Plausible.Shield.IPRuleCache,
- PlausibleWeb.TrackerScriptCache
+ on_ee do
+ Plausible.Site.TrackerScriptIdCache
+ else
+ Plausible.Site.TrackerScriptCache
+ end
]
+
def readiness(conn, _params) do
postgres_health_task =
Task.async(fn ->
diff --git a/lib/plausible_web/tracker.ex b/lib/plausible_web/tracker.ex
index 6003613533..7e0f53c8a6 100644
--- a/lib/plausible_web/tracker.ex
+++ b/lib/plausible_web/tracker.ex
@@ -23,13 +23,13 @@ defmodule PlausibleWeb.Tracker do
# 2. If it is, generate the script on the fly
#
# Note that EE is relying on CDN caching the script
- if PlausibleWeb.TrackerScriptCache.get(id, cache_opts) do
+ if Plausible.Site.TrackerScriptIdCache.get(id, cache_opts) do
get_tracker_script_configuration_by_id(id)
|> build_script()
end
else
# On self-hosted, we have a pre-warmed cache for the script
- PlausibleWeb.TrackerScriptCache.get(id, cache_opts)
+ Plausible.Site.TrackerScriptCache.get(id, cache_opts)
end
end
@@ -68,11 +68,20 @@ defmodule PlausibleWeb.Tracker do
def build_script(nil), do: nil
- defp broadcast_script_upsert(tracker_script_configuration) do
- PlausibleWeb.TrackerScriptCache.broadcast_put(
- tracker_script_configuration.id,
- PlausibleWeb.TrackerScriptCache.cache_content(tracker_script_configuration)
- )
+ on_ee do
+ defp broadcast_script_insert(tracker_script_configuration),
+ do: Plausible.Site.TrackerScriptIdCache.broadcast_put(tracker_script_configuration.id, true)
+ end
+
+ on_ce do
+ defp broadcast_script_upsert(tracker_script_configuration) do
+ case Plausible.Site.TrackerScriptCache.put(
+ tracker_script_configuration.id,
+ Plausible.Site.TrackerScriptCache.cache_content(tracker_script_configuration)
+ ) do
+ script when is_binary(script) -> :ok
+ end
+ end
end
def update_script_configuration(site, config_update, changeset_type) do
@@ -148,7 +157,12 @@ defmodule PlausibleWeb.Tracker do
maybe_reload_tracker_script_configuration(created_config) do
sync_goals(site, %{}, reloaded_config)
- :ok = broadcast_script_upsert(reloaded_config)
+ on_ee do
+ :ok = broadcast_script_insert(reloaded_config)
+ else
+ :ok = broadcast_script_upsert(reloaded_config)
+ end
+
{:ok, reloaded_config}
end
end)
diff --git a/test/plausible/cache_test.exs b/test/plausible/cache_test.exs
index b8c62be294..6ed629f20d 100644
--- a/test/plausible/cache_test.exs
+++ b/test/plausible/cache_test.exs
@@ -116,6 +116,15 @@ defmodule Plausible.CacheTest do
assert :item2 == ExampleCache.get("item2", cache_name: test, force?: true)
end
+ test "put puts into local cache, overwriting as appropriate", %{test: test} do
+ {:ok, _} = start_test_cache(test)
+ opts = [cache_name: test, force?: true]
+ assert ExampleCache.put("key", :item1, opts)
+ assert ExampleCache.get("key", opts) == :item1
+ assert ExampleCache.put("key", :updated, opts)
+ assert ExampleCache.get("key", opts) == :updated
+ end
+
test "broadcast_put puts into local cache", %{test: test} do
{:ok, _} = start_test_cache(test)
:ok = ExampleCache.broadcast_put("item1", :item1, cache_name: test)
diff --git a/test/plausible/site/tracker_script_cache_test.exs b/test/plausible/site/tracker_script_cache_test.exs
new file mode 100644
index 0000000000..934b448b13
--- /dev/null
+++ b/test/plausible/site/tracker_script_cache_test.exs
@@ -0,0 +1,141 @@
+defmodule Plausible.Site.TrackerScriptCacheTest do
+ use Plausible.DataCase, async: false
+ @moduletag :ce_build_only
+
+ on_ce do
+ alias Plausible.Site.TrackerScriptConfiguration
+ alias Plausible.Site.TrackerScriptCache
+
+ describe "public cache interface" do
+ test "cache caches tracker scripts by id", %{test: test} do
+ {:ok, _} =
+ Supervisor.start_link(
+ [
+ {TrackerScriptCache,
+ [
+ cache_name: test,
+ child_id: :test_cache_tracker_script,
+ ets_options: [read_concurrency: true]
+ ]}
+ ],
+ strategy: :one_for_one,
+ name: :"cache_supervisor_#{test}"
+ )
+
+ site = new_site(domain: "site1.example.com")
+ config = create_config(site)
+
+ :ok = TrackerScriptCache.refresh_all(cache_name: test)
+
+ {:ok, _} = Plausible.Repo.delete(config)
+
+ assert TrackerScriptCache.size(test) == 1
+
+ assert result = TrackerScriptCache.get(config.id, force?: true, cache_name: test)
+
+ assert is_binary(result)
+ assert result =~ ~r/domain:\"#{site.domain}\"/
+
+ refute TrackerScriptCache.get("nonexistent", cache_name: test, force?: true)
+ end
+
+ test "refresh all and broadcast put works", %{test: test} do
+ {:ok, _} = start_test_cache(test)
+ site1 = new_site()
+ site2 = new_site()
+
+ configs = [create_config(site1), create_config(site2)]
+ cache_opts = [cache_name: test, force?: true]
+
+ for config <- configs do
+ assert TrackerScriptCache.get(config.id, cache_opts) == nil
+ end
+
+ assert :ok = TrackerScriptCache.refresh_all(cache_opts)
+
+ for config <- configs do
+ result = TrackerScriptCache.get(config.id, cache_opts)
+
+ assert is_binary(result)
+ assert result =~ ~r/domain:\"#{config.site.domain}\"/
+ assert result =~ ~r/fileDownloads:\!0/
+ end
+
+ [%TrackerScriptConfiguration{} = updated_config | _] = configs
+
+ TrackerScriptCache.broadcast_put(
+ updated_config.id,
+ TrackerScriptCache.cache_content(%TrackerScriptConfiguration{
+ updated_config
+ | file_downloads: false
+ }),
+ cache_opts
+ )
+
+ assert eventually(fn ->
+ result = TrackerScriptCache.get(updated_config.id, cache_opts)
+
+ {!(result =~ ~r/fileDownloads:\!0/), result}
+ end)
+
+ for config <- configs do
+ result = TrackerScriptCache.get(config.id, cache_opts)
+
+ on_ee do
+ assert result == true
+ else
+ assert result =~
+ ~r/domain:\"#{config.site.domain}\"/
+ end
+ end
+ end
+
+ test "refreshes only recently added configurations", %{test: test} do
+ {:ok, _} = start_test_cache(test)
+
+ site1 = new_site()
+ site2 = new_site()
+
+ past_date = ~N[2021-01-01 00:00:00]
+ old_config = create_config(site1, inserted_at: past_date, updated_at: past_date)
+ new_config = create_config(site2)
+
+ cache_opts = [cache_name: test, force?: true]
+
+ assert TrackerScriptCache.get(old_config.id, cache_opts) == nil
+ assert TrackerScriptCache.get(new_config.id, cache_opts) == nil
+
+ assert :ok = TrackerScriptCache.refresh_updated_recently(cache_opts)
+
+ refute TrackerScriptCache.get(old_config.id, cache_opts)
+ assert TrackerScriptCache.get(new_config.id, cache_opts)
+ end
+ end
+
+ defp start_test_cache(cache_name) do
+ %{start: {m, f, a}} =
+ TrackerScriptCache.child_spec(
+ cache_name: cache_name,
+ ets_options: [read_concurrency: true]
+ )
+
+ apply(m, f, a)
+ end
+
+ defp create_config(site, opts \\ []) do
+ config = %TrackerScriptConfiguration{
+ site_id: site.id,
+ installation_type: :manual,
+ hash_based_routing: true,
+ outbound_links: true,
+ file_downloads: true,
+ form_submissions: true
+ }
+
+ config
+ |> Ecto.Changeset.change(opts)
+ |> Repo.insert!()
+ |> Repo.preload(:site)
+ end
+ end
+end
diff --git a/test/plausible/site/tracker_script_id_cache_test.exs b/test/plausible/site/tracker_script_id_cache_test.exs
new file mode 100644
index 0000000000..0384e051cc
--- /dev/null
+++ b/test/plausible/site/tracker_script_id_cache_test.exs
@@ -0,0 +1,123 @@
+defmodule Plausible.Site.TrackerScriptIdCacheTest do
+ use Plausible.DataCase, async: false
+ @moduletag :ee_only
+ on_ee do
+ alias Plausible.Site.TrackerScriptConfiguration
+ alias Plausible.Site.TrackerScriptIdCache
+
+ describe "public cache interface" do
+ test "cache caches tracker scripts by id", %{test: test} do
+ {:ok, _} =
+ Supervisor.start_link(
+ [
+ {TrackerScriptIdCache,
+ [
+ cache_name: test,
+ child_id: :test_cache_tracker_script,
+ ets_options: [read_concurrency: true]
+ ]}
+ ],
+ strategy: :one_for_one,
+ name: :"cache_supervisor_#{test}"
+ )
+
+ site = new_site(domain: "site1.example.com")
+ config = create_config(site)
+
+ :ok = TrackerScriptIdCache.refresh_all(cache_name: test)
+
+ {:ok, _} = Plausible.Repo.delete(config)
+
+ assert TrackerScriptIdCache.size(test) == 1
+
+ assert TrackerScriptIdCache.get(config.id, force?: true, cache_name: test) == true
+
+ refute TrackerScriptIdCache.get("nonexistent", cache_name: test, force?: true)
+ end
+
+ test "refresh all and put works", %{test: test} do
+ {:ok, _} = start_test_cache(test)
+ site1 = new_site()
+ site2 = new_site()
+ site3 = new_site()
+
+ configs = [create_config(site1), create_config(site2)]
+ cache_opts = [cache_name: test, force?: true]
+
+ for config <- configs do
+ assert TrackerScriptIdCache.get(config.id, cache_opts) == nil
+ end
+
+ assert :ok = TrackerScriptIdCache.refresh_all(cache_opts)
+
+ for config <- configs do
+ result = TrackerScriptIdCache.get(config.id, cache_opts)
+ assert result == true
+ end
+
+ new_config = create_config(site3)
+
+ TrackerScriptIdCache.broadcast_put(
+ new_config.id,
+ true,
+ cache_opts
+ )
+
+ # wait for broadcast put to take effect
+ assert eventually(fn ->
+ result = TrackerScriptIdCache.get(new_config.id, cache_opts)
+ {result == true, result}
+ end)
+
+ for config <- [new_config | configs] do
+ result = TrackerScriptIdCache.get(config.id, cache_opts)
+ assert result == true
+ end
+ end
+
+ test "refreshes only recently added configurations", %{test: test} do
+ {:ok, _} = start_test_cache(test)
+
+ site1 = new_site()
+ site2 = new_site()
+
+ past_date = ~N[2021-01-01 00:00:00]
+ old_config = create_config(site1, inserted_at: past_date, updated_at: past_date)
+ new_config = create_config(site2)
+
+ cache_opts = [cache_name: test, force?: true]
+
+ assert TrackerScriptIdCache.get(old_config.id, cache_opts) == nil
+ assert TrackerScriptIdCache.get(new_config.id, cache_opts) == nil
+
+ assert :ok = TrackerScriptIdCache.refresh_updated_recently(cache_opts)
+
+ refute TrackerScriptIdCache.get(old_config.id, cache_opts)
+ assert TrackerScriptIdCache.get(new_config.id, cache_opts)
+ end
+ end
+
+ defp start_test_cache(cache_name) do
+ %{start: {m, f, a}} =
+ TrackerScriptIdCache.child_spec(cache_name: cache_name, ets_options: [:bag])
+
+ apply(m, f, a)
+ end
+
+ defp create_config(site, opts \\ []) do
+ config = %TrackerScriptConfiguration{
+ site_id: site.id,
+ installation_type: :manual,
+ hash_based_routing: true,
+ outbound_links: true,
+ file_downloads: true,
+ form_submissions: true
+ }
+
+ config
+ |> Ecto.Changeset.change(opts)
+ |> Repo.insert!()
+ |> Repo.preload(:site)
+ end
+ end
+end
diff --git a/test/plausible_web/tracker_script_cache_test.exs b/test/plausible_web/tracker_script_cache_test.exs
deleted file mode 100644
index a7fb7ca239..0000000000
--- a/test/plausible_web/tracker_script_cache_test.exs
+++ /dev/null
@@ -1,81 +0,0 @@
-defmodule PlausibleWeb.TrackerScriptCacheTest do
- use Plausible.DataCase, async: true
-
- alias Plausible.Site.TrackerScriptConfiguration
- alias PlausibleWeb.TrackerScriptCache
-
- describe "public cache interface" do
- test "cache caches tracker scripts by id", %{test: test} do
- {:ok, _} =
- Supervisor.start_link(
- [{TrackerScriptCache, [cache_name: test, child_id: :test_cache_tracker_script]}],
- strategy: :one_for_one,
- name: :"cache_supervisor_#{test}"
- )
-
- site = new_site(domain: "site1.example.com")
- config = create_config(site)
-
- :ok = TrackerScriptCache.refresh_all(cache_name: test)
-
- {:ok, _} = Plausible.Repo.delete(config)
-
- assert TrackerScriptCache.size(test) == 1
-
- assert result = TrackerScriptCache.get(config.id, force?: true, cache_name: test)
-
- on_ee do
- assert result == true
- else
- # it's the script
- assert is_binary(result)
- # the config has been expanded into the script template
- assert result =~ ~r/domain:\"#{site.domain}\"/
- end
-
- refute TrackerScriptCache.get("nonexistent", cache_name: test, force?: true)
- end
-
- test "refreshes only recently added configurations", %{test: test} do
- {:ok, _} = start_test_cache(test)
-
- site1 = new_site()
- site2 = new_site()
-
- past_date = ~N[2021-01-01 00:00:00]
- old_config = create_config(site1, inserted_at: past_date, updated_at: past_date)
- new_config = create_config(site2)
-
- cache_opts = [cache_name: test, force?: true]
-
- assert TrackerScriptCache.get(old_config.id, cache_opts) == nil
- assert TrackerScriptCache.get(new_config.id, cache_opts) == nil
-
- assert :ok = TrackerScriptCache.refresh_updated_recently(cache_opts)
-
- refute TrackerScriptCache.get(old_config.id, cache_opts)
- assert TrackerScriptCache.get(new_config.id, cache_opts)
- end
- end
-
- defp start_test_cache(cache_name) do
- %{start: {m, f, a}} = TrackerScriptCache.child_spec(cache_name: cache_name)
- apply(m, f, a)
- end
-
- defp create_config(site, opts \\ []) do
- config = %TrackerScriptConfiguration{
- site_id: site.id,
- installation_type: :manual,
- hash_based_routing: true,
- outbound_links: true,
- file_downloads: true,
- form_submissions: true
- }
-
- config
- |> Ecto.Changeset.change(opts)
- |> Repo.insert!()
- |> Repo.preload(:site)
- end
-end
diff --git a/test/plausible_web/tracker_test.exs b/test/plausible_web/tracker_test.exs
index 8c152e4f51..0a870cca68 100644
--- a/test/plausible_web/tracker_test.exs
+++ b/test/plausible_web/tracker_test.exs
@@ -4,7 +4,6 @@ defmodule PlausibleWeb.TrackerTest do
alias Plausible.Site.TrackerScriptConfiguration
alias PlausibleWeb.Tracker
- alias PlausibleWeb.TrackerScriptCache
@example_config %{
installation_type: :manual,
@@ -183,14 +182,36 @@ defmodule PlausibleWeb.TrackerTest do
)
end
- defp start_test_cache(cache_name) do
- opts = [cache_name: cache_name, force?: true]
+ on_ee do
+ defp start_test_cache(cache_name) do
+ opts = [cache_name: cache_name, force?: true]
- %{start: {m, f, a}} = TrackerScriptCache.child_spec(cache_name: cache_name)
- {:ok, _} = apply(m, f, a)
- TrackerScriptCache.refresh_all(opts)
+ %{start: {m, f, a}} =
+ Plausible.Site.TrackerScriptIdCache.child_spec(
+ cache_name: cache_name,
+ ets_options: [read_concurrency: true]
+ )
+
+ {:ok, _} = apply(m, f, a)
+ Plausible.Site.TrackerScriptIdCache.refresh_all(opts)
- opts
+ opts
+ end
+ else
+ defp start_test_cache(cache_name) do
+ opts = [cache_name: cache_name, force?: true]
+
+ %{start: {m, f, a}} =
+ Plausible.Site.TrackerScriptCache.child_spec(
+ cache_name: cache_name,
+ ets_options: [read_concurrency: true]
+ )
+
+ {:ok, _} = apply(m, f, a)
+ Plausible.Site.TrackerScriptCache.refresh_all(opts)
+
+ opts
+ end
end
defp attach_query_counter() do