feat(web-analytics): Add option behind FF to switch to V2 web analyti…

…cs (#23364)

frontend/src/lib/constants.tsx

@@ -210,6 +210,7 @@ export const FEATURE_FLAGS = {
     SETTINGS_BOUNCE_RATE_PAGE_VIEW_MODE: 'settings-bounce-rate-page-view-mode', // owner: @robbie-c
     SURVEYS_BRANCHING_LOGIC: 'surveys-branching-logic', // owner: @jurajmajerik #team-feature-success
     WEB_ANALYTICS_LIVE_USER_COUNT: 'web-analytics-live-user-count', // owner: @robbie-c
+    SETTINGS_SESSION_TABLE_VERSION: 'settings-session-table-version', // owner: @robbie-c
 } as const
 export type FeatureFlagKey = (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]
 

frontend/src/lib/utils/eventUsageLogic.ts

@@ -395,6 +395,7 @@ export const eventUsageLogic = kea<eventUsageLogicType>([
         reportPoEModeUpdated: (mode: string) => ({ mode }),
         reportPersonsJoinModeUpdated: (mode: string) => ({ mode }),
         reportBounceRatePageViewModeUpdated: (mode: string) => ({ mode }),
+        reportSessionTableVersionUpdated: (version: string) => ({ version }),
         reportPropertySelectOpened: true,
         reportCreatedDashboardFromModal: true,
         reportSavedInsightToDashboard: true,
@@ -810,6 +811,9 @@ export const eventUsageLogic = kea<eventUsageLogicType>([
         reportBounceRatePageViewModeUpdated: async ({ mode }) => {
             posthog.capture('bounce rate page view mode updated', { mode })
         },
+        reportSessionTableVersionUpdated: async ({ version }) => {
+            posthog.capture('session table version updated', { version })
+        },
         reportInsightFilterRemoved: async ({ index }) => {
             posthog.capture('local filter removed', { index })
         },

frontend/src/scenes/settings/SettingsMap.tsx

@@ -1,6 +1,7 @@
 import { BounceRatePageViewModeSetting } from 'scenes/settings/project/BounceRatePageViewMode'
 import { PersonsJoinMode } from 'scenes/settings/project/PersonsJoinMode'
 import { PersonsOnEvents } from 'scenes/settings/project/PersonsOnEvents'
+import { SessionsTableVersion } from 'scenes/settings/project/SessionsTableVersion'
 
 import { Invites } from './organization/Invites'
 import { Members } from './organization/Members'
@@ -167,6 +168,12 @@ export const SettingsMap: SettingSection[] = [
                 component: <BounceRatePageViewModeSetting />,
                 flag: 'SETTINGS_BOUNCE_RATE_PAGE_VIEW_MODE',
             },
+            {
+                id: 'session-table-version',
+                title: 'Sessions Table Version',
+                component: <SessionsTableVersion />,
+                flag: 'SETTINGS_SESSION_TABLE_VERSION',
+            },
         ],
     },
 

frontend/src/scenes/settings/project/SessionsTableVersion.tsx

@@ -0,0 +1,75 @@
+import { useActions, useValues } from 'kea'
+import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { LemonRadio, LemonRadioOption } from 'lib/lemon-ui/LemonRadio'
+import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
+import { useState } from 'react'
+import { teamLogic } from 'scenes/teamLogic'
+
+import { HogQLQueryModifiers } from '~/queries/schema'
+
+type SessionTableVersion = NonNullable<HogQLQueryModifiers['sessionTableVersion']>
+
+const bounceRatePageViewModeOptions: LemonRadioOption<SessionTableVersion>[] = [
+    {
+        value: 'auto',
+        label: (
+            <>
+                <div>Auto</div>
+            </>
+        ),
+    },
+    {
+        value: 'v1',
+        label: (
+            <>
+                <div>Version 1</div>
+            </>
+        ),
+    },
+    {
+        value: 'v2',
+        label: (
+            <>
+                <div>Version 2</div>
+            </>
+        ),
+    },
+]
+
+export function SessionsTableVersion(): JSX.Element {
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { currentTeam } = useValues(teamLogic)
+    const { reportSessionTableVersionUpdated } = useActions(eventUsageLogic)
+
+    const savedSessionTableVersion =
+        currentTeam?.modifiers?.sessionTableVersion ?? currentTeam?.default_modifiers?.sessionTableVersion ?? 'auto'
+    const [sessionTableVersion, setSessionTableVersion] = useState<SessionTableVersion>(savedSessionTableVersion)
+
+    const handleChange = (version: SessionTableVersion): void => {
+        updateCurrentTeam({ modifiers: { ...currentTeam?.modifiers, sessionTableVersion: version } })
+        reportSessionTableVersionUpdated(version)
+    }
+
+    return (
+        <>
+            <p>
+                Choose which version of the session table to use. V2 is faster, but requires uuidv7 session ids. Use
+                auto unless you know what you're doing.
+            </p>
+            <LemonRadio
+                value={sessionTableVersion}
+                onChange={setSessionTableVersion}
+                options={bounceRatePageViewModeOptions}
+            />
+            <div className="mt-4">
+                <LemonButton
+                    type="primary"
+                    onClick={() => handleChange(sessionTableVersion)}
+                    disabledReason={sessionTableVersion === savedSessionTableVersion ? 'No changes to save' : undefined}
+                >
+                    Save
+                </LemonButton>
+            </div>
+        </>
+    )
+}

frontend/src/scenes/settings/types.ts

@@ -82,6 +82,7 @@ export type SettingId =
     | 'hedgehog-mode'
     | 'persons-join-mode'
     | 'bounce-rate-page-view-mode'
+    | 'session-table-version'
 
 type FeatureFlagKey = keyof typeof FEATURE_FLAGS
 

posthog/hogql/modifiers.py

@@ -52,8 +52,8 @@ def set_default_modifier_values(modifiers: HogQLQueryModifiers, team: "Team"):
     if modifiers.bounceRatePageViewMode is None:
         modifiers.bounceRatePageViewMode = BounceRatePageViewMode.COUNT_PAGEVIEWS
 
-    if modifiers.sessionTableVersion is None or modifiers.sessionTableVersion == SessionTableVersion.AUTO:
-        modifiers.sessionTableVersion = SessionTableVersion.V1
+    if modifiers.sessionTableVersion is None:
+        modifiers.sessionTableVersion = SessionTableVersion.AUTO
 
 
 def set_default_in_cohort_via(modifiers: HogQLQueryModifiers) -> HogQLQueryModifiers:

posthog/hogql_queries/test/test_query_runner.py

@@ -90,7 +90,7 @@ def test_cache_payload(self):
                     "optimizeJoinedFilters": False,
                     "personsOnEventsMode": "disabled",
                     "bounceRatePageViewMode": "count_pageviews",
-                    "sessionTableVersion": "v1",
+                    "sessionTableVersion": "auto",
                 },
                 "limit_context": "query",
                 "query": {"kind": "TestQuery", "some_attr": "bla"},
@@ -109,7 +109,7 @@ def test_cache_key(self):
         runner = TestQueryRunner(query={"some_attr": "bla"}, team=team)
 
         cache_key = runner.get_cache_key()
-        self.assertEqual(cache_key, "cache_19dbcf2dbe2bd72239f37007f2eb6224")
+        self.assertEqual(cache_key, "cache_c4e20e19f3cad552478257f71f80b52f")
 
     def test_cache_key_runner_subclass(self):
         TestQueryRunner = self.setup_test_query_runner_class()
@@ -123,7 +123,7 @@ class TestSubclassQueryRunner(TestQueryRunner):
         runner = TestSubclassQueryRunner(query={"some_attr": "bla"}, team=team)
 
         cache_key = runner.get_cache_key()
-        self.assertEqual(cache_key, "cache_325bbd17cd27dd556d765984ba993da0")
+        self.assertEqual(cache_key, "cache_db0fcd4797812983cbf9df57cd9f3032")
 
     def test_cache_key_different_timezone(self):
         TestQueryRunner = self.setup_test_query_runner_class()
@@ -134,7 +134,7 @@ def test_cache_key_different_timezone(self):
         runner = TestQueryRunner(query={"some_attr": "bla"}, team=team)
 
         cache_key = runner.get_cache_key()
-        self.assertEqual(cache_key, "cache_c1d666350117520920dbc3cc9286195c")
+        self.assertEqual(cache_key, "cache_8c92e69a656cc68522e5b48a7304b97d")
 
     @mock.patch("django.db.transaction.on_commit")
     def test_cache_response(self, mock_on_commit):