Merge pull request #10148 from gitbutlerapp/analytics-refactor

refactor: restructure analytics initialization

Author: estib-vega

apps/desktop/src/lib/analytics/analytics.ts

@@ -6,12 +6,12 @@ import posthog from 'posthog-js';
 export function initAnalyticsIfEnabled(appSettings: AppSettings, postHog: PostHogWrapper) {
 	if (import.meta.env.MODE === 'development') return;
 
-	appSettings.appAnalyticsConfirmed.onDisk().then((confirmed) => {
+	appSettings.appAnalyticsConfirmed.onDisk().then(async (confirmed) => {
 		if (confirmed) {
 			appSettings.appErrorReportingEnabled.onDisk().then((enabled) => {
 				if (enabled) initSentry();
 			});
-			appSettings.appMetricsEnabled.onDisk().then(async (enabled) => {
+			await appSettings.appMetricsEnabled.onDisk().then(async (enabled) => {
 				if (enabled) {
 					await postHog.init();
 				}

apps/desktop/src/lib/bootstrap/deps.ts

@@ -88,9 +88,11 @@ export function initDependencies(args: {
 	backend: IBackend;
 	appSettings: AppSettings;
 	settingsService: SettingsService;
+	posthog: PostHogWrapper;
+	eventContext: EventContext;
 	homeDir: string;
 }) {
-	const { backend, settingsService, appSettings, homeDir } = args;
+	const { backend, settingsService, appSettings, homeDir, posthog, eventContext } = args;
 
 	// ============================================================================
 	// FOUNDATION LAYER - Core services that others depend on
@@ -105,9 +107,6 @@ export function initDependencies(args: {
 	// ANALYTICS & TELEMETRY
 	// ============================================================================
 
-	const eventContext = new EventContext();
-	const posthog = new PostHogWrapper(settingsService, backend, eventContext);
-
 	// ============================================================================
 	// AUTHENTICATION & SECURITY
 	// ============================================================================

apps/desktop/src/routes/+layout.svelte

@@ -14,10 +14,8 @@
 	import SwitchThemeMenuAction from '$components/SwitchThemeMenuAction.svelte';
 	import ToastController from '$components/ToastController.svelte';
 	import ZoomInOutMenuAction from '$components/ZoomInOutMenuAction.svelte';
-	import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
 	import { POSTHOG_WRAPPER } from '$lib/analytics/posthog';
 	import { initDependencies } from '$lib/bootstrap/deps';
-	import { APP_SETTINGS } from '$lib/config/appSettings';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
 	import { ircEnabled, ircServer, codegenEnabled } from '$lib/config/uiFeatureFlags';
 	import { GITHUB_CLIENT } from '$lib/forge/github/githubClient';
@@ -47,11 +45,9 @@
 	initDependencies(data);
 
 	const clientState = inject(CLIENT_STATE);
-	const appSettings = inject(APP_SETTINGS);
 	const posthog = inject(POSTHOG_WRAPPER);
 
 	clientState.initPersist();
-	initAnalyticsIfEnabled(appSettings, posthog);
 
 	// =============================================================================
 	// CORE REACTIVE STATE & EFFECTS

apps/desktop/src/routes/+layout.ts

@@ -1,3 +1,6 @@
+import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
+import { EventContext } from '$lib/analytics/eventContext';
+import { PostHogWrapper } from '$lib/analytics/posthog';
 import createBackend from '$lib/backend';
 import { loadAppSettings } from '$lib/config/appSettings';
 import { SettingsService } from '$lib/config/appSettingsV2';
@@ -21,15 +24,20 @@ export const load: LayoutLoad = async () => {
 
 	// TODO: Migrate telemetry settings from here to `SettingsService`
 	const appSettings = await loadAppSettings(backend);
+	const eventContext = new EventContext();
 
 	// TODO: This should be the only settings service.
 	const settingsService = new SettingsService(backend);
 	await settingsService.refresh();
+	const posthog = new PostHogWrapper(settingsService, backend, eventContext);
+	initAnalyticsIfEnabled(appSettings, posthog);
 
 	return {
 		homeDir,
 		backend,
 		settingsService,
-		appSettings
+		appSettings,
+		posthog,
+		eventContext
 	};
 };