From a73335168da9c838ad22b3397704b2d947774bc3 Mon Sep 17 00:00:00 2001
From: Will Hunt <2072976+Half-Shot@users.noreply.github.com>
Date: Fri, 13 Mar 2026 11:29:19 +0000
Subject: [PATCH] Remove automaticErrorReporting labs feature (#32781)

* Disable changing automaticErrorReporting unless sentry is configured.

* Ensure we reload on change

* Remove automaticErrorReporting labs flag

* remove stray import

* I thought I had killed you

* poke ci
---
 .../views/settings/tabs/user/LabsUserSettingsTab.tsx  |  5 -----
 apps/web/src/i18n/strings/en_EN.json                  |  1 -
 apps/web/src/sentry.ts                                | 11 +++--------
 apps/web/src/settings/Settings.tsx                    |  7 -------
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/apps/web/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx b/apps/web/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
index 85d41cbf0d..d7919b352c 100644
--- a/apps/web/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
+++ b/apps/web/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
@@ -78,11 +78,6 @@ export default class LabsUserSettingsTab extends React.Component<EmptyObject> {
             groups
                 .getOrCreate(LabGroup.Analytics, [])
                 .push(
-                    <SettingsFlag
-                        key="automaticErrorReporting"
-                        name="automaticErrorReporting"
-                        level={SettingLevel.DEVICE}
-                    />,
                     <SettingsFlag
                         key="automaticDecryptionErrorReporting"
                         name="automaticDecryptionErrorReporting"
diff --git a/apps/web/src/i18n/strings/en_EN.json b/apps/web/src/i18n/strings/en_EN.json
index 75f323a920..5a996dd4df 100644
--- a/apps/web/src/i18n/strings/en_EN.json
+++ b/apps/web/src/i18n/strings/en_EN.json
@@ -1495,7 +1495,6 @@
     },
     "labs": {
         "ask_to_join": "Enable ask to join",
-        "automatic_debug_logs": "Automatically send debug logs on any error",
         "automatic_debug_logs_decryption": "Automatically send debug logs on decryption errors",
         "beta_description": "What's next for %(brand)s? Labs are the best way to get things early, test out new features and help shape them before they actually launch.",
         "beta_feature": "This is a beta feature",
diff --git a/apps/web/src/sentry.ts b/apps/web/src/sentry.ts
index 214f4f09e3..7b3148d211 100644
--- a/apps/web/src/sentry.ts
+++ b/apps/web/src/sentry.ts
@@ -188,13 +188,13 @@ export async function sendSentryReport(userText: string, issueUrl: string, error
 }
 
 export function setSentryUser(mxid: string): void {
-    if (!SdkConfig.get().sentry || !SettingsStore.getValue("automaticErrorReporting")) return;
-    Sentry.setUser({ username: mxid });
+    if (SdkConfig.get().sentry) {
+        Sentry.setUser({ username: mxid });
+    }
 }
 
 export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promise<void> {
     if (!sentryConfig) return;
-    // Only enable Integrations.GlobalHandlers, which hooks uncaught exceptions, if automaticErrorReporting is true
     const integrations = [
         Sentry.inboundFiltersIntegration(),
         Sentry.functionToStringIntegration(),
@@ -203,11 +203,6 @@ export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promis
         Sentry.dedupeIntegration(),
     ];
 
-    if (SettingsStore.getValue("automaticErrorReporting")) {
-        integrations.push(Sentry.globalHandlersIntegration({ onerror: false, onunhandledrejection: true }));
-        integrations.push(Sentry.browserApiErrorsIntegration());
-    }
-
     Sentry.init({
         dsn: sentryConfig.dsn,
         release: process.env.VERSION,
diff --git a/apps/web/src/settings/Settings.tsx b/apps/web/src/settings/Settings.tsx
index f808c85768..f5030bf589 100644
--- a/apps/web/src/settings/Settings.tsx
+++ b/apps/web/src/settings/Settings.tsx
@@ -348,7 +348,6 @@ export interface Settings {
     "Spaces.enabledMetaSpaces": IBaseSetting<Partial<Record<MetaSpace, boolean>>>;
     "Spaces.showPeopleInSpace": IBaseSetting<boolean>;
     "developerMode": IBaseSetting<boolean>;
-    "automaticErrorReporting": IBaseSetting<boolean>;
     "automaticDecryptionErrorReporting": IBaseSetting<boolean>;
     "debug_scroll_panel": IBaseSetting<boolean>;
     "debug_timeline_panel": IBaseSetting<boolean>;
@@ -1308,12 +1307,6 @@ export const SETTINGS: Settings = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: false,
     },
-    "automaticErrorReporting": {
-        displayName: _td("labs|automatic_debug_logs"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: false,
-        controller: new ReloadOnChangeController(),
-    },
     "automaticDecryptionErrorReporting": {
         displayName: _td("labs|automatic_debug_logs_decryption"),
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,