A platform for community discussion. Free, open, simple.
PERF: Lower the Site Traffic Explorer event limit (#42640)
Alan Guo Xiang Tanc71a2d1442f9
diff --git a/app/services/admin_dashboard_site_traffic_explorer.rb b/app/services/admin_dashboard_site_traffic_explorer.rbindex 49aee6a2b35..b1799569c43 100644--- a/app/services/admin_dashboard_site_traffic_explorer.rb+++ b/app/services/admin_dashboard_site_traffic_explorer.rb@@ -132,7 +132,7 @@ class AdminDashboardSiteTrafficExplorerdef query_params(start_date:, end_date:, filters:)retention_cutoff = BrowserPageviewEvent.retention_cutoff.to_dateeffective_start_date = [start_date, retention_cutoff].max- cap = SiteSetting.admin_site_traffic_event_cap+ cap = SiteSetting.site_traffic_explorer_event_limit{start_date: effective_start_date,@@ -565,7 +565,7 @@ class AdminDashboardSiteTrafficExplorer{reason: "retention_and_pageview_limit",available_start_date: BrowserPageviewEvent.retention_cutoff.to_date.iso8601,- pageview_limit: SiteSetting.admin_site_traffic_event_cap,+ pageview_limit: SiteSetting.site_traffic_explorer_event_limit,}elsif retention_limited{@@ -573,7 +573,7 @@ class AdminDashboardSiteTrafficExploreravailable_start_date: BrowserPageviewEvent.retention_cutoff.to_date.iso8601,}else- { reason: "pageview_limit", pageview_limit: SiteSetting.admin_site_traffic_event_cap }+ { reason: "pageview_limit", pageview_limit: SiteSetting.site_traffic_explorer_event_limit }endenddiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 80958d64dfc..404103dc39f 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -2913,6 +2913,7 @@ en:dashboard_visible_tabs: "Choose which dashboard tabs are visible."dashboard_general_tab_activity_metrics: "Choose reports to be displayed as activity metrics on the general tab."enable_site_traffic_explorer: "Link the admin dashboard's site traffic details action to the Site Traffic Explorer."+ site_traffic_explorer_event_limit: "Controls the maximum number of recent pageviews the Site Traffic Explorer processes. Higher limits cover more traffic but may take longer to load or time out on lower-resource database servers."gravatar_enabled: "Use the <a href='https://gravatar.com/'>Gravatar</a> service for user avatars. Disabling this will prevent users from switching to Gravatar for their avatars, but will not impact users who already use it."gravatar_name: "Specify the name of the Gravatar service provider. This name is typically used to identify the source providing Gravatar avatars to the site."diff --git a/config/site_settings.yml b/config/site_settings.ymlindex f037f0eaad0..f8e1885ab8a 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -621,12 +621,6 @@ basic:min: 1max: 20000hidden: true- admin_site_traffic_event_cap:- default: 1000000- type: integer- min: 1- max: 1000000- hidden: truebrowser_pageview_max_engaged_seconds:default: 1800type: integer@@ -4653,6 +4647,12 @@ dashboard:- user_to_user_private_messages_with_replies- signupsarea: "reports"+ site_traffic_explorer_event_limit:+ default: 200000+ type: integer+ min: 1+ max: 1000000+ area: "reports"enable_site_traffic_explorer:default: falseclient: truediff --git a/db/migrate/20260817054353_rename_admin_site_traffic_event_cap_setting.rb b/db/migrate/20260817054353_rename_admin_site_traffic_event_cap_setting.rbnew file mode 100644index 00000000000..08231cfb584--- /dev/null+++ b/db/migrate/20260817054353_rename_admin_site_traffic_event_cap_setting.rb@@ -0,0 +1,11 @@+# frozen_string_literal: true++class RenameAdminSiteTrafficEventCapSetting < ActiveRecord::Migration[7.0]+ def up+ execute "UPDATE site_settings SET name = 'site_traffic_explorer_event_limit' WHERE name = 'admin_site_traffic_event_cap'"+ end++ def down+ execute "UPDATE site_settings SET name = 'admin_site_traffic_event_cap' WHERE name = 'site_traffic_explorer_event_limit'"+ end+enddiff --git a/db/structure.sql b/db/structure.sqlindex ad4351edaca..8b2473269eb 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -23159,6 +23159,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groupsSET search_path TO "$user", public;INSERT INTO "schema_migrations" (version) VALUES+('20260817054353'),('20260812094609'),('20260811231259'),('20260810154331'),diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rbindex 7fd6953059d..30f13fe2397 100644--- a/spec/requests/admin/dashboard_controller_spec.rb+++ b/spec/requests/admin/dashboard_controller_spec.rb@@ -1753,7 +1753,7 @@ RSpec.describe Admin::DashboardController dobefore dosign_in(admin)- SiteSetting.admin_site_traffic_event_cap = 2+ SiteSetting.site_traffic_explorer_event_limit = 2endit "returns no more than the configured pageview cap" do@@ -1848,7 +1848,7 @@ RSpec.describe Admin::DashboardController doit "returns both partial-data reasons" dosign_in(admin)- SiteSetting.admin_site_traffic_event_cap = 2+ SiteSetting.site_traffic_explorer_event_limit = 2get "/admin/dashboard/site-traffic-explorer.json",params: request_params.merge(start_date: "2026-01-01")diff --git a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb b/spec/services/admin_dashboard_site_traffic_explorer_spec.rbindex 702352348ff..53a232ed2ec 100644--- a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb+++ b/spec/services/admin_dashboard_site_traffic_explorer_spec.rb@@ -262,7 +262,7 @@ RSpec.describe AdminDashboardSiteTrafficExplorer doendit "does not report partial data when the population exactly matches the cap" do- SiteSetting.admin_site_traffic_event_cap = 11+ SiteSetting.site_traffic_explorer_event_limit = 11expect(result.traffic.slice(:partial_data, :summary)).to eq(partial_data: nil,@@ -277,7 +277,7 @@ RSpec.describe AdminDashboardSiteTrafficExplorer doendit "does not promote a capped session continuation to an entry" do- SiteSetting.admin_site_traffic_event_cap = 1+ SiteSetting.site_traffic_explorer_event_limit = 1Fabricate(:browser_pageview_event,url: "/capped-session-entry",diff --git a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rbindex 5ed07f0d022..fafdb68833b 100644--- a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb+++ b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb@@ -405,7 +405,7 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" doit "warns an admin when the selected range has incomplete traffic data",time: Time.zone.local(2026, 5, 14, 12, 0, 0) dosign_in(admin)- SiteSetting.admin_site_traffic_event_cap = 2+ SiteSetting.site_traffic_explorer_event_limit = 2[["/first-retained", "2026-02-15 09:00:00"],