A platform for community discussion. Free, open, simple.
PERF: Precompute browsers for Site Traffic Explorer (#42617)
Alan Guo Xiang Tanc4326eee8c75
diff --git a/app/jobs/scheduled/maintain_browser_pageview_rollups.rb b/app/jobs/scheduled/maintain_browser_pageview_rollups.rbindex d054875c959..49ea0395527 100644--- a/app/jobs/scheduled/maintain_browser_pageview_rollups.rb+++ b/app/jobs/scheduled/maintain_browser_pageview_rollups.rb@@ -14,6 +14,7 @@ module Jobsaggregate_crawlersbackfill_referrersbackfill_urls+ backfill_browsersendprivate@@ -210,6 +211,42 @@ module Jobs)end+ def backfill_browsers+ rows = browser_batch+ return if rows.empty?++ ids = rows.map(&:id)+ browsers =+ rows.map do |row|+ BrowserPageviewEvent.browsers.fetch(+ BrowserDetection.browser(row.user_agent).to_s,+ BrowserPageviewEvent::BROWSER_UNKNOWN,+ )+ end++ DB.exec(<<~SQL, ids: ids, browsers: browsers)+ UPDATE browser_pageview_events AS e+ SET browser = data.browser+ FROM unnest(+ ARRAY[:ids]::bigint[],+ ARRAY[:browsers]::smallint[]+ ) AS data(id, browser)+ WHERE e.id = data.id+ SQL+ end++ def browser_batch+ DB.query(<<~SQL, retention_cutoff: BrowserPageviewEvent.retention_cutoff, limit: batch_size)+ SELECT id, user_agent+ FROM browser_pageview_events+ WHERE created_at >= :retention_cutoff+ AND #{BrowserPageviewEvent.rollup_source_condition}+ AND browser IS NULL+ ORDER BY created_at DESC, id DESC+ LIMIT :limit+ SQL+ end+def url_batchDB.query(<<~SQL,diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rbindex fd002cf48d1..2ef513b8abc 100644--- a/app/mailers/user_notifications.rb+++ b/app/mailers/user_notifications.rb@@ -79,7 +79,7 @@ class UserNotifications < ActionMailer::Baselocale: user_locale(user),client_ip: opts[:client_ip],location: location.presence || I18n.t("staff_action_logs.unknown"),- browser: I18n.t("user_auth_tokens.browser.#{browser}"),+ browser: I18n.t("browsers.#{browser}"),device: I18n.t("user_auth_tokens.device.#{device}"),os: I18n.t("user_auth_tokens.os.#{os}"),recipient_user: user,diff --git a/app/models/browser_pageview_event.rb b/app/models/browser_pageview_event.rbindex be71fdf1e42..2ba7fc58234 100644--- a/app/models/browser_pageview_event.rb+++ b/app/models/browser_pageview_event.rb@@ -10,6 +10,22 @@ class BrowserPageviewEvent < ActiveRecord::BaseRETENTION_PERIOD = 3.monthsSOURCE_PIGGYBACK = 1SOURCE_BEACON = 2+ BROWSER_UNKNOWN = 0+ BROWSERS = {+ unknown: BROWSER_UNKNOWN,+ chrome: 1,+ edge: 2,+ safari: 3,+ firefox: 4,+ opera: 5,+ ie: 6,+ samsung_browser: 7,+ uc_browser: 8,+ android_browser: 9,+ qq_browser: 10,+ baidu_browser: 11,+ kaios_browser: 12,+ }.freezeREDIS_QUEUE_KEY = "browser_pageview_events:pending"REDIS_FLUSH_LOCK_KEY = "browser_pageview_events:flush"REDIS_FLUSH_BATCH_SIZE = 1000@@ -17,6 +33,7 @@ class BrowserPageviewEvent < ActiveRecord::BaseREDIS_QUEUE_TTL = 1.dayenum :source, { piggyback: SOURCE_PIGGYBACK, beacon: SOURCE_BEACON }, scopes: false+ enum :browser, BROWSERS, prefix: true, scopes: falseclass << selfdef enqueue_for_later(payload)@@ -171,6 +188,7 @@ class BrowserPageviewEvent < ActiveRecord::Basedef attributes_from_payload(payload)normalized_referrer = BrowserPageviewEventUrlNormalizer.normalize_referrer(payload[:referrer])normalized_url = BrowserPageviewEventUrlNormalizer.normalize_site_path(payload[:url])+ user_agent = payload[:user_agent]&.slice(0, MAX_USER_AGENT_LENGTH){url: payload[:url]&.slice(0, MAX_URL_LENGTH),@@ -182,7 +200,8 @@ class BrowserPageviewEvent < ActiveRecord::Basereferrer: payload[:referrer]&.slice(0, MAX_REFERRER_LENGTH),normalized_referrer: normalized_referrer&.slice(0, MAX_NORMALIZED_REFERRER_LENGTH),normalized_referrer_version: BrowserPageviewEventUrlNormalizer::REFERRER_VERSION,- user_agent: payload[:user_agent]&.slice(0, MAX_USER_AGENT_LENGTH),+ user_agent: user_agent,+ browser: BROWSERS.fetch(BrowserDetection.browser(user_agent), BROWSER_UNKNOWN),session_id: payload[:session_id]&.slice(0, MAX_SESSION_ID_LENGTH),user_id: payload[:user_id],topic_id: payload[:topic_id],@@ -257,6 +276,7 @@ end## id :bigint not null, primary key# asn :integer+# browser :integer# country_code :string(2)# ip_address :inet not null# normalized_referrer :string(2000)@@ -276,6 +296,7 @@ end# Indexes## idx_bpe_beacon_created_at_id (created_at,id) WHERE (source = 2)+# idx_bpe_browser_backfill (source,created_at DESC,id DESC) WHERE (browser IS NULL)# idx_bpe_created_at_country_code (created_at,country_code)# idx_bpe_created_at_normalized_referrer (created_at,normalized_referrer)# idx_bpe_ip_ua_created_at (ip_address,user_agent,created_at)diff --git a/app/models/concerns/reports/suspicious_logins.rb b/app/models/concerns/reports/suspicious_logins.rbindex 7c30c7d15f7..e65ab8f8696 100644--- a/app/models/concerns/reports/suspicious_logins.rb+++ b/app/models/concerns/reports/suspicious_logins.rb@@ -58,7 +58,7 @@ module Reports::SuspiciousLoginsdata[:avatar_template] = User.avatar_template(row.username, row.uploaded_avatar_id)data[:client_ip] = row.client_ip.to_s if can_see_ipdata[:location] = ipinfo[:location]- data[:browser] = I18n.t("user_auth_tokens.browser.#{browser}")+ data[:browser] = I18n.t("browsers.#{browser}")data[:device] = I18n.t("user_auth_tokens.device.#{device}")data[:os] = I18n.t("user_auth_tokens.os.#{os}")data[:login_time] = row.login_timediff --git a/app/serializers/concerns/user_auth_tokens_mixin.rb b/app/serializers/concerns/user_auth_tokens_mixin.rbindex b2b1774fe5f..ef4465425bd 100644--- a/app/serializers/concerns/user_auth_tokens_mixin.rb+++ b/app/serializers/concerns/user_auth_tokens_mixin.rb@@ -20,7 +20,7 @@ module UserAuthTokensMixindef browserval = BrowserDetection.browser(object.user_agent)- I18n.t("user_auth_tokens.browser.#{val}")+ I18n.t("browsers.#{val}")enddef devicediff --git a/app/services/admin_dashboard_site_traffic_explorer.rb b/app/services/admin_dashboard_site_traffic_explorer.rbindex b1799569c43..65445c6ddcd 100644--- a/app/services/admin_dashboard_site_traffic_explorer.rb+++ b/app/services/admin_dashboard_site_traffic_explorer.rb@@ -23,7 +23,7 @@ class AdminDashboardSiteTrafficExplorer}.freezeprivate_constant :FILTER_DIMENSIONS- BROWSER_VALUES = %w[edge firefox chrome safari unknown].freeze+ BROWSER_VALUES = BrowserPageviewEvent.browsers.keys.freezeprivate_constant :BROWSER_VALUESTRAFFIC_TYPE_VALUES = %w[logged_in anonymous likely_crawler].freeze@@ -144,7 +144,7 @@ class AdminDashboardSiteTrafficExplorerreferrer: filters[:referrer],country: filters[:country],network_asn: filters[:network],- browser: filters[:browser],+ browser: filters[:browser] && BrowserPageviewEvent.browsers.fetch(filters[:browser]),ip_address: filters[:ip],traffic_type_filtered: filters[:traffic_type].present?,include_logged_in: filters[:traffic_type]&.include?("logged_in"),@@ -174,7 +174,7 @@ class AdminDashboardSiteTrafficExplorerbpe.country_code,bpe.asn,bpe.ip_address,- bpe.user_agent,+ COALESCE(bpe.browser, #{BrowserPageviewEvent::BROWSER_UNKNOWN}) AS browser,bpe.scoreFROM browser_pageview_events bpeWHERE bpe.created_at >= :start_date@@ -201,20 +201,6 @@ class AdminDashboardSiteTrafficExplorerpopulation_stats.row_count,population_stats.oldest_created_at),- browser_values AS MATERIALIZED (- SELECT- user_agent,- CASE- WHEN user_agent ~* 'Edg' THEN 'edge'- WHEN user_agent ~* '(Opera|OPR)' THEN 'unknown'- WHEN user_agent ~* 'Firefox' THEN 'firefox'- WHEN user_agent ~* '(Chrome|CriOS)' THEN 'chrome'- WHEN user_agent ~* 'Safari' THEN 'safari'- ELSE 'unknown'- END AS browser- FROM population- GROUP BY user_agent- ),classified AS (SELECTpopulation.created_at,@@ -225,7 +211,7 @@ class AdminDashboardSiteTrafficExplorerpopulation.country_code,population.asn,population.ip_address,- browser_values.browser,+ population.browser,(population.normalized_referrer IS NULLOR split_part(@@ -239,8 +225,6 @@ class AdminDashboardSiteTrafficExplorerAND COALESCE(population.score, 0) > :crawler_threshold) AS likely_crawlerFROM population- JOIN browser_values- ON browser_values.user_agent = population.user_agent),dimensioned AS (SELECT@@ -624,6 +608,7 @@ class AdminDashboardSiteTrafficExplorerdef decorate_dimension_row(dimension, row)value = row.fetch("value")+ value = BrowserPageviewEvent.browsers.key(value.to_i) || "unknown" if dimension == "browsers"{value: value,label: dimension_label(dimension, value, row["representative_ip"]),@@ -640,7 +625,7 @@ class AdminDashboardSiteTrafficExplorerwhen "networks"network_label(value, representative_ip)when "browsers"- I18n.t("admin_site_traffic_explorer.browsers.#{value}", default: value)+ I18n.t("browsers.#{value}", default: value)elsevalueenddiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 404103dc39f..baabec23889 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -1096,17 +1096,23 @@ en:email_login_code:invalid_code: "That code is incorrect or has expired. Request a new code and try again."- user_auth_tokens:- browser:- chrome: "Google Chrome"- discoursehub: "DiscourseHub app"- edge: "Microsoft Edge"- firefox: "Firefox"- ie: "Internet Explorer"- opera: "Opera"- safari: "Safari"- unknown: "unknown browser"+ browsers:+ android_browser: "Android Browser"+ baidu_browser: "Baidu Browser"+ chrome: "Google Chrome"+ discoursehub: "DiscourseHub app"+ edge: "Microsoft Edge"+ firefox: "Firefox"+ ie: "Internet Explorer"+ kaios_browser: "KaiOS Browser"+ opera: "Opera"+ qq_browser: "QQ Browser"+ safari: "Safari"+ samsung_browser: "Samsung Browser"+ uc_browser: "UC Browser"+ unknown: "Unknown browser"+ user_auth_tokens:device:android: "Android Device"chromebook: "Chrome OS"@@ -1133,13 +1139,6 @@ en:logged_in: "Logged in"anonymous: "Anonymous"likely_crawler: "Likely crawlers"- browsers:- chrome: "Chrome"- edge: "Microsoft Edge"- firefox: "Firefox"- safari: "Safari"- unknown: "Unknown browser"-change_email:error: "There was an error changing your email address. Perhaps the address is already in use?"doesnt_exist: "That email address is not associated with your account."diff --git a/db/migrate/20260814060000_add_browser_to_browser_pageview_events.rb b/db/migrate/20260814060000_add_browser_to_browser_pageview_events.rbnew file mode 100644index 00000000000..15eb2b9cea4--- /dev/null+++ b/db/migrate/20260814060000_add_browser_to_browser_pageview_events.rb@@ -0,0 +1,7 @@+# frozen_string_literal: true++class AddBrowserToBrowserPageviewEvents < ActiveRecord::Migration[8.0]+ def change+ add_column :browser_pageview_events, :browser, :smallint+ end+enddiff --git a/db/migrate/20260814060100_add_browser_backfill_index_to_browser_pageview_events.rb b/db/migrate/20260814060100_add_browser_backfill_index_to_browser_pageview_events.rbnew file mode 100644index 00000000000..d80b4c8dae2--- /dev/null+++ b/db/migrate/20260814060100_add_browser_backfill_index_to_browser_pageview_events.rb@@ -0,0 +1,30 @@+# frozen_string_literal: true++class AddBrowserBackfillIndexToBrowserPageviewEvents < ActiveRecord::Migration[8.0]+ disable_ddl_transaction!++ INDEX_NAME = "idx_bpe_browser_backfill"++ def up+ remove_index :browser_pageview_events,+ name: INDEX_NAME,+ algorithm: :concurrently,+ if_exists: true+ add_index :browser_pageview_events,+ %i[source created_at id],+ order: {+ created_at: :desc,+ id: :desc,+ },+ where: "browser IS NULL",+ name: INDEX_NAME,+ algorithm: :concurrently+ end++ def down+ remove_index :browser_pageview_events,+ name: INDEX_NAME,+ algorithm: :concurrently,+ if_exists: true+ end+enddiff --git a/db/structure.sql b/db/structure.sqlindex 8b2473269eb..6b09b9507ea 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -2071,7 +2071,8 @@ CREATE TABLE public.browser_pageview_events (normalized_referrer_version smallint,source smallint DEFAULT 1 NOT NULL,normalized_url character varying(2000),- normalized_url_version integer+ normalized_url_version integer,+ browser smallint);@@ -17592,6 +17593,13 @@ CREATE UNIQUE INDEX idx_bpcrawler_rollups_date_logged_in_unique ON public.browseCREATE INDEX idx_bpe_beacon_created_at_id ON public.browser_pageview_events USING btree (created_at DESC, id DESC) WHERE (source = 2);+--+-- Name: idx_bpe_browser_backfill; Type: INDEX; Schema: public; Owner: -+--++CREATE INDEX idx_bpe_browser_backfill ON public.browser_pageview_events USING btree (source, created_at DESC, id DESC) WHERE (browser IS NULL);++---- Name: idx_bpe_created_at_country_code; Type: INDEX; Schema: public; Owner: ---@@ -23160,6 +23168,8 @@ SET search_path TO "$user", public;INSERT INTO "schema_migrations" (version) VALUES('20260817054353'),+('20260814060100'),+('20260814060000'),('20260812094609'),('20260811231259'),('20260810154331'),diff --git a/frontend/discourse/admin/components/site-traffic-explorer-dimension-label.gjs b/frontend/discourse/admin/components/site-traffic-explorer-dimension-label.gjsindex 08654db518e..430aaf80f28 100644--- a/frontend/discourse/admin/components/site-traffic-explorer-dimension-label.gjs+++ b/frontend/discourse/admin/components/site-traffic-explorer-dimension-label.gjs@@ -5,10 +5,14 @@ import { eq } from "discourse/truth-helpers";import dIcon from "discourse/ui-kit/helpers/d-icon";const BROWSER_ICONS = {- edge: "fab-microsoft",+ android_browser: "fab-android",+ edge: "fab-edge",firefox: "fab-firefox-browser",chrome: "fab-chrome",- safari: "fab-apple",+ ie: "fab-internet-explorer",+ opera: "fab-opera",+ qq_browser: "fab-qq",+ safari: "fab-safari",unknown: "globe",};diff --git a/lib/browser_detection.rb b/lib/browser_detection.rbindex 7cfbaffe3be..0194e252fba 100644--- a/lib/browser_detection.rb+++ b/lib/browser_detection.rb@@ -7,14 +7,26 @@ module BrowserDetection:edgewhen /Opera/i, /OPR/i:opera- when /Firefox/i+ when %r{SamsungBrowser/}i+ :samsung_browser+ when %r{(?:UCBrowser|UC Browser)[/ ]}i+ :uc_browser+ when %r{(?:MQQBrowser|QQBrowser)/}i+ :qq_browser+ when %r{(?:BIDUBrowser|BaiduBrowser)/}i+ :baidu_browser+ when %r{KaiOS/}i+ :kaios_browser+ when /MSIE|Trident|IEMobile/i+ :ie+ when /Firefox/i, /FxiOS/i:firefoxwhen /Chrome/i, /CriOS/i:chrome+ when %r{Android.+Version/[\d.]+.+Safari/}i+ :android_browserwhen /Safari/i:safari- when /MSIE/i, /Trident/i- :iewhen /Discourse/i:discoursehubelsediff --git a/lib/discourse_dev/browser_pageview_event.rb b/lib/discourse_dev/browser_pageview_event.rbindex 13e858e5f84..2e7a42516fb 100644--- a/lib/discourse_dev/browser_pageview_event.rb+++ b/lib/discourse_dev/browser_pageview_event.rb@@ -75,6 +75,7 @@ module DiscourseDevurl: "https://forum.example.com/t/sample-topic/#{rand(1000)}",ip_address: "192.0.2.#{rand(1..254)}",user_agent: "Mozilla/5.0 (X11; Linux x86_64) Chrome/123",+ browser: ::BrowserPageviewEvent.browsers.fetch("chrome"),session_id: SecureRandom.hex(16),country_code: country_pool.sample,normalized_referrer: normalized,diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rbindex ac2a8879f14..cfb4c111c47 100644--- a/lib/svg_sprite.rb+++ b/lib/svg_sprite.rb@@ -123,16 +123,21 @@ module SvgSpritefab-chromefab-discordfab-discourse+ fab-edgefab-facebookfab-facebook-squarefab-firefox-browserfab-githubfab-googlefab-instagram+ fab-internet-explorerfab-linkedin-infab-linuxfab-microsoftfab-markdown+ fab-opera+ fab-qq+ fab-safarifab-threadsfab-threads-squarefab-twitterdiff --git a/spec/fabricators/browser_pageview_event_fabricator.rb b/spec/fabricators/browser_pageview_event_fabricator.rbindex a3aaa548f70..87110c2dc3a 100644--- a/spec/fabricators/browser_pageview_event_fabricator.rb+++ b/spec/fabricators/browser_pageview_event_fabricator.rb@@ -6,6 +6,12 @@ Fabricator(:browser_pageview_event) donormalized_url_version BrowserPageviewEventUrlNormalizer::SITE_PATH_VERSIONip_address "1.2.3.4"user_agent "test"+ browser do |attrs|+ BrowserPageviewEvent::BROWSERS.fetch(+ BrowserDetection.browser(attrs[:user_agent]),+ BrowserPageviewEvent::BROWSER_UNKNOWN,+ )+ endsession_id { SecureRandom.hex(16) }enddiff --git a/spec/jobs/maintain_browser_pageview_rollups_spec.rb b/spec/jobs/maintain_browser_pageview_rollups_spec.rbindex 55197c963d2..5806f29d303 100644--- a/spec/jobs/maintain_browser_pageview_rollups_spec.rb+++ b/spec/jobs/maintain_browser_pageview_rollups_spec.rb@@ -588,5 +588,31 @@ RSpec.describe Jobs::MaintainBrowserPageviewRollups doexpect(event.reload.normalized_url_version).to be_nilendend++ context "when backfilling browsers" do+ it "resumes bounded batches and classifies unknown user agents" do+ SiteSetting.browser_pageview_referrer_backfill_batch_size = 1+ edge =+ Fabricate(+ :browser_pageview_event,+ user_agent: "Mozilla/5.0 Chrome/124.0 Safari/537.36 Edg/124.0",+ browser: nil,+ )+ unknown =+ Fabricate(+ :browser_pageview_event,+ user_agent: "Discourse/163 CFNetwork/978.0.7 Darwin/18.6.0",+ browser: nil,+ )++ job.execute({})++ expect([edge.reload.browser, unknown.reload.browser]).to eq([nil, "unknown"])++ job.execute({})++ expect(edge.reload.browser).to eq("edge")+ end+ endendenddiff --git a/spec/lib/browser_detection_spec.rb b/spec/lib/browser_detection_spec.rbindex 0232020c7c9..0252d80d11f 100644--- a/spec/lib/browser_detection_spec.rb+++ b/spec/lib/browser_detection_spec.rb@@ -147,4 +147,90 @@ RSpec.describe BrowserDetection doexpect(BrowserDetection.os(user_agent)).to eq(os)endend++ describe ".browser" do+ it "detects Edge" do+ user_agent = "Mozilla/5.0 Chrome/124.0 Safari/537.36 Edg/124.0"++ expect(described_class.browser(user_agent)).to eq(:edge)+ end++ it "detects Opera" do+ user_agent = "Mozilla/5.0 Chrome/124.0 Safari/537.36 OPR/109.0"++ expect(described_class.browser(user_agent)).to eq(:opera)+ end++ it "detects Samsung Browser" do+ user_agent = "Mozilla/5.0 Chrome/120.0 Mobile Safari/537.36 SamsungBrowser/24.0"++ expect(described_class.browser(user_agent)).to eq(:samsung_browser)+ end++ it "detects UC Browser" do+ user_agent = "Mozilla/5.0 Chrome/70.0 Mobile Safari/537.36 UCBrowser/13.4.0"++ expect(described_class.browser(user_agent)).to eq(:uc_browser)+ end++ it "detects QQ Browser" do+ user_agent = "Mozilla/5.0 Chrome/70.0 Mobile Safari/537.36 MQQBrowser/13.1"++ expect(described_class.browser(user_agent)).to eq(:qq_browser)+ end++ it "detects Baidu Browser" do+ user_agent = "Mozilla/5.0 Chrome/70.0 Mobile Safari/537.36 BIDUBrowser/7.6"++ expect(described_class.browser(user_agent)).to eq(:baidu_browser)+ end++ it "detects KaiOS Browser" do+ user_agent = "Mozilla/5.0 Mobile KaiOS/2.5 Firefox/84.0"++ expect(described_class.browser(user_agent)).to eq(:kaios_browser)+ end++ it "detects Internet Explorer" do+ user_agent = "Mozilla/5.0 IEMobile/11.0"++ expect(described_class.browser(user_agent)).to eq(:ie)+ end++ it "detects Firefox" do+ user_agent = "Mozilla/5.0 FxiOS/126.0 Mobile/15E148 Safari/605.1.15"++ expect(described_class.browser(user_agent)).to eq(:firefox)+ end++ it "detects Chrome" do+ user_agent = "Mozilla/5.0 CriOS/124.0 Mobile/15E148 Safari/604.1"++ expect(described_class.browser(user_agent)).to eq(:chrome)+ end++ it "detects Android Browser" do+ user_agent = "Mozilla/5.0 Android 4.4 Version/4.0 Mobile Safari/537.36"++ expect(described_class.browser(user_agent)).to eq(:android_browser)+ end++ it "detects Safari" do+ user_agent = "Mozilla/5.0 Version/17.0 Mobile/15E148 Safari/604.1"++ expect(described_class.browser(user_agent)).to eq(:safari)+ end++ it "returns unknown for unsupported browsers" do+ expect(described_class.browser("ExampleBrowser/1.0")).to eq(:unknown)+ end++ it "detects Chrome before Android Browser" do+ expect(+ described_class.browser(+ "Mozilla/5.0 (Linux; Android 4.4.2) Version/4.0 Chrome/30.0 Safari/537.36",+ ),+ ).to eq(:chrome)+ end+ endenddiff --git a/spec/models/browser_pageview_event_spec.rb b/spec/models/browser_pageview_event_spec.rbindex f3eff9a23be..ae4494c25be 100644--- a/spec/models/browser_pageview_event_spec.rb+++ b/spec/models/browser_pageview_event_spec.rb@@ -210,7 +210,7 @@ RSpec.describe BrowserPageviewEvent docountry_code: "AU",asn: 12_345,referrer: "https://www.example.com/path?utm_source=x",- user_agent: "Mozilla/5.0",+ user_agent: "Mozilla/5.0 Chrome/124.0 Safari/537.36 Edg/124.0",session_id: "xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx",topic_id: 123,source: described_class::SOURCE_BEACON,@@ -244,6 +244,7 @@ RSpec.describe BrowserPageviewEvent doexpect(event.normalized_referrer).to eq("example.com/path")expect(event.created_at).to eq_time(occurred_at)expect(event.source).to eq("beacon")+ expect(event.browser).to eq("edge")expect(described_class.queued_count).to eq(0)enddiff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rbindex 30f13fe2397..4ede54b380f 100644--- a/spec/requests/admin/dashboard_controller_spec.rb+++ b/spec/requests/admin/dashboard_controller_spec.rb@@ -1529,7 +1529,7 @@ RSpec.describe Admin::DashboardController do{ "value" => "AS64496", "label" => "Example Network (AS64496)", "pageviews" => 3 },],"browsers" => [- { "value" => "chrome", "label" => "Chrome", "pageviews" => 2 },+ { "value" => "chrome", "label" => "Google Chrome", "pageviews" => 2 },{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },],"ip_addresses" => [@@ -1700,7 +1700,7 @@ RSpec.describe Admin::DashboardController do{ "value" => "AS64496", "label" => "Example Network (AS64496)", "pageviews" => 2 },],"browsers" => [- { "value" => "chrome", "label" => "Chrome", "pageviews" => 1 },+ { "value" => "chrome", "label" => "Google Chrome", "pageviews" => 1 },{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },],"ip_addresses" => [@@ -1797,7 +1797,7 @@ RSpec.describe Admin::DashboardController do"networks" => [{ "value" => "AS64496", "label" => "Example Network (AS64496)", "pageviews" => 2 },],- "browsers" => [{ "value" => "chrome", "label" => "Chrome", "pageviews" => 2 }],+ "browsers" => [{ "value" => "chrome", "label" => "Google Chrome", "pageviews" => 2 }],"ip_addresses" => [{ "value" => "192.0.2.1", "label" => "192.0.2.1", "pageviews" => 2 },],@@ -1919,7 +1919,7 @@ RSpec.describe Admin::DashboardController do{ "value" => "AS64496", "label" => "Example Network (AS64496)", "pageviews" => 2 },],"browsers" => [- { "value" => "chrome", "label" => "Chrome", "pageviews" => 1 },+ { "value" => "chrome", "label" => "Google Chrome", "pageviews" => 1 },{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },],"ip_addresses" => [diff --git a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb b/spec/services/admin_dashboard_site_traffic_explorer_spec.rbindex 53a232ed2ec..70fad56b205 100644--- a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb+++ b/spec/services/admin_dashboard_site_traffic_explorer_spec.rb@@ -19,24 +19,24 @@ RSpec.describe AdminDashboardSiteTrafficExplorer dolet(:params) { { start_date: "2026-05-01", end_date: "2026-05-12" } }let(:dependencies) { {} }- let(:user_agents) do+ let(:browsers) do[- "Mozilla/5.0 Chrome/124.0 Safari/537.36 Edg/124.0",- "Mozilla/5.0 Chrome/124.0 Safari/537.36 OPR/109.0",- "Mozilla/5.0 Firefox/126.0",- "Mozilla/5.0 FxiOS/126.0 Mobile/15E148 Safari/605.1.15",- "Mozilla/5.0 CriOS/124.0 Mobile/15E148 Safari/604.1",- "Mozilla/5.0 Version/17.0 Mobile/15E148 Safari/604.1",- "Mozilla/5.0 SamsungBrowser/24.0 Chrome/120.0 Mobile Safari/537.36",- "Mozilla/5.0 Vivaldi/6.7 Chrome/124.0 Safari/537.36",- "Mozilla/5.0 Trident/7.0; rv:11.0",- "Discourse/163 CFNetwork/978.0.7 Darwin/18.6.0",- "ExampleBrowser/1.0",+ nil,+ :unknown,+ :unknown,+ :unknown,+ :chrome,+ :chrome,+ :chrome,+ :safari,+ :safari,+ :edge,+ :firefox,]endlet!(:pageviews) do- user_agents.each_with_index do |user_agent, index|+ browsers.each_with_index do |browser, index|Fabricate(:browser_pageview_event,url: "/browser-#{index}",@@ -45,7 +45,7 @@ RSpec.describe AdminDashboardSiteTrafficExplorer doip_address: "192.0.2.#{index + 1}",session_id: "browser-#{index}",source: BrowserPageviewEvent::SOURCE_BEACON,- user_agent:,+ browser:,created_at: Time.zone.local(2026, 5, 10, 10, index),)end@@ -91,13 +91,13 @@ RSpec.describe AdminDashboardSiteTrafficExplorer docontext "when the query succeeds" doit { is_expected.to run_successfully }- it "classifies supported major browsers and groups other user agents as unknown" do- browsers = result.traffic.dig(:dimensions, "browsers")+ it "groups stored browser values and displays rows awaiting backfill as unknown" do+ browser_dimensions = result.traffic.dig(:dimensions, "browsers")- expect(browsers).to eq(+ expect(browser_dimensions).to eq([{ value: "unknown", label: "Unknown browser", pageviews: 4 },- { value: "chrome", label: "Chrome", pageviews: 3 },+ { value: "chrome", label: "Google Chrome", pageviews: 3 },{ value: "safari", label: "Safari", pageviews: 2 },{ value: "edge", label: "Microsoft Edge", pageviews: 1 },{ value: "firefox", label: "Firefox", pageviews: 1 },diff --git a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rbindex fafdb68833b..a070fb1f182 100644--- a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb+++ b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb@@ -288,8 +288,8 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" dotraffic.remove_filter("network")traffic.select_tab(card: "visitors", tab: "Browsers")- traffic.filter_row(card: "visitors", label: "Chrome")- expect(traffic).to have_filter_pill(dimension: "browser", label: "Chrome")+ traffic.filter_row(card: "visitors", label: "Google Chrome")+ expect(traffic).to have_filter_pill(dimension: "browser", label: "Google Chrome")expect(traffic).to have_metric(label: "Pageviews", value: "3")expect(page).to have_current_path("/admin/dashboard/site-traffic-explorer?browser=chrome&end_date=2026-05-12&range=custom&start_date=2026-05-01",