feat: Update JavaScript SDKs to v9.40.0 (#1191)

Author: timfish

package.json

@@ -60,16 +60,16 @@
     "e2e": "xvfb-maybe vitest run --root=./test/e2e --silent=false --disable-console-intercept"
   },
   "dependencies": {
-    "@sentry/browser": "9.36.0",
-    "@sentry/core": "9.36.0",
-    "@sentry/node": "9.36.0",
+    "@sentry/browser": "9.40.0",
+    "@sentry/core": "9.40.0",
+    "@sentry/node": "9.40.0",
     "deepmerge": "4.3.1"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
-    "@sentry-internal/eslint-config-sdk": "9.36.0",
-    "@sentry-internal/typescript": "9.36.0",
+    "@sentry-internal/eslint-config-sdk": "9.40.0",
+    "@sentry-internal/typescript": "9.40.0",
     "@types/busboy": "^1.5.4",
     "@types/form-data": "^2.5.0",
     "@types/koa": "^2.0.52",

src/main/index.ts

@@ -91,6 +91,7 @@ export {
   NodeClient,
   nodeContextIntegration,
   onUnhandledRejectionIntegration,
+  openAIIntegration,
   OpenFeatureIntegrationHook,
   openFeatureIntegration,
   parameterize,
@@ -164,6 +165,7 @@ export { rendererProfileFromIpc } from './integrations/renderer-profiling';
 export { normalizePathsIntegration } from './integrations/normalize-paths';
 export { electronContextIntegration } from './integrations/electron-context';
 export { gpuContextIntegration } from './integrations/gpu-context';
+// eslint-disable-next-line deprecation/deprecation
 export { anrIntegration } from './integrations/anr';
 export { rendererAnrIntegration } from './integrations/renderer-anr';
 

src/main/integrations/electron-minidump.ts

@@ -1,4 +1,4 @@
-import { applyScopeDataToEvent, defineIntegration, Event, logger, makeDsn, ScopeData, uuid4 } from '@sentry/core';
+import { applyScopeDataToEvent, debug, defineIntegration, Event, makeDsn, ScopeData, uuid4 } from '@sentry/core';
 import { NodeClient, NodeOptions } from '@sentry/node';
 import { app, crashReporter } from 'electron';
 import { addScopeListener, getScopeData } from '../../common/scope';
@@ -127,21 +127,21 @@ export const electronMinidumpIntegration = defineIntegration(() => {
           crashReporter.addExtraParameter(key, value);
         }
       })
-      .catch((error) => logger.error(error));
+      .catch((error) => debug.error(error));
   }
 
   function startCrashReporter(options: NodeOptions): void {
     const submitURL = minidumpUrlFromDsn(options.dsn || '');
     if (!submitURL) {
-      logger.log('Invalid DSN. Cannot start Electron crashReporter');
+      debug.log('Invalid DSN. Cannot start Electron crashReporter');
       return;
     }
 
     // We don't add globalExtra when Breakpad is in use because it doesn't support JSON like strings:
     // https://github.com/electron/electron/issues/29711
     const globalExtra = { sentry___initialScope: JSON.stringify(getScope(options)) };
 
-    logger.log('Starting Electron crashReporter');
+    debug.log('Starting Electron crashReporter');
 
     crashReporter.start({
       companyName: '',
@@ -192,7 +192,7 @@ export const electronMinidumpIntegration = defineIntegration(() => {
       unreportedDuringLastSession(crashReporter.getLastCrashReport()?.date).then((crashed) => {
         // Check if a previous session was not closed
         return checkPreviousSession(crashed);
-      }, logger.error);
+      }, debug.error);
     },
   };
 });

src/main/integrations/net-breadcrumbs.ts

@@ -1,11 +1,11 @@
 import {
   addBreadcrumb,
+  debug,
   defineIntegration,
   fill,
   getBreadcrumbLogLevelFromHttpStatusCode,
   getClient,
   getTraceData,
-  logger,
   LRUMap,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SentryNonRecordingSpan,
@@ -161,7 +161,7 @@ function createWrappedRequestFactory(
 
       if (shouldAttachTraceData(method, url)) {
         for (const [key, value] of Object.entries(getTraceData({ span }))) {
-          logger.log(`[Tracing] Adding ${key} header ${value} to outgoing request to "${url}": `);
+          debug.log(`[Tracing] Adding ${key} header ${value} to outgoing request to "${url}": `);
           request.setHeader(key, value);
         }
       }

src/main/integrations/preload-injection.ts

@@ -1,4 +1,4 @@
-import { defineIntegration, logger } from '@sentry/core';
+import { debug, defineIntegration } from '@sentry/core';
 import { app } from 'electron';
 import { existsSync } from 'fs';
 import { isAbsolute, resolve } from 'path';
@@ -51,7 +51,7 @@ export const preloadInjectionIntegration = defineIntegration(() => {
             setPreload(sesh, path);
           }
         } else {
-          logger.log(
+          debug.log(
             'The preload script could not be injected automatically. This is most likely caused by bundling of the main process',
           );
         }

src/main/integrations/renderer-anr.ts

@@ -2,10 +2,10 @@ import {
   callFrameToStackFrame,
   captureEvent,
   Client,
+  debug,
   defineIntegration,
   Event,
   Integration,
-  logger,
   StackFrame,
   stripSentryFramesAndReverse,
   watchdogTimer,
@@ -20,7 +20,7 @@ import { sessionAnr } from '../sessions';
 import { captureRendererStackFrames } from '../stack-parse';
 
 function log(message: string, ...args: unknown[]): void {
-  logger.log(`[Renderer ANR] ${message}`, ...args);
+  debug.log(`[Renderer ANR] ${message}`, ...args);
 }
 
 interface ScriptParsedEventDataType {

src/main/integrations/screenshots.ts

@@ -1,4 +1,4 @@
-import { defineIntegration, logger } from '@sentry/core';
+import { debug, defineIntegration } from '@sentry/core';
 import { BrowserWindow } from 'electron';
 import { ElectronMainOptions } from '../sdk';
 
@@ -35,7 +35,7 @@ export const screenshotsIntegration = defineIntegration(() => {
             }
           } catch (e) {
             // Catch all errors so we don't break event submission if something goes wrong
-            logger.error('Error capturing screenshot', e);
+            debug.error('Error capturing screenshot', e);
           }
         }
       }

src/main/integrations/sentry-minidump/index.ts

@@ -1,9 +1,9 @@
 import {
   applyScopeDataToEvent,
   captureEvent,
+  debug,
   defineIntegration,
   Event,
-  logger,
   Scope,
   ScopeData,
   Session,
@@ -47,7 +47,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
   let minidumpLoader: MinidumpLoader | undefined;
 
   function startCrashReporter(): void {
-    logger.log('Starting Electron crashReporter');
+    debug.log('Starting Electron crashReporter');
 
     crashReporter.start({
       companyName: '',
@@ -96,7 +96,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
     //     right now and hope that the delay was not too long.
 
     if (minidumpsRemaining <= 0) {
-      logger.log('Not sending minidumps because the limit has been reached');
+      debug.log('Not sending minidumps because the limit has been reached');
     }
 
     // If the SDK is not enabled, or we've already reached the minidump limit, tell the loader to delete all minidumps
@@ -156,7 +156,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
       const crashedProcess =
         (minidumpProcess === 'renderer' && getRendererName ? getRendererName(contents) : minidumpProcess) || 'unknown';
 
-      logger.log(`'${crashedProcess}' process '${details.reason}'`);
+      debug.log(`'${crashedProcess}' process '${details.reason}'`);
 
       return {
         contexts: {
@@ -178,7 +178,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
   }
 
   async function sendChildProcessCrash(client: NodeClient, details: Omit<Electron.Details, 'exitCode'>): Promise<void> {
-    logger.log(`${details.type} process has ${details.reason}`);
+    debug.log(`${details.type} process has ${details.reason}`);
 
     await sendNativeCrashes(client, (minidumpProcess) => ({
       contexts: {
@@ -218,7 +218,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
       } catch (error) {
         // This is rare but we've seen reports:
         // https://github.com/getsentry/sentry-electron/issues/1102
-        logger.error('Failed to create minidump loader', error);
+        debug.error('Failed to create minidump loader', error);
       }
 
       const options = client.getOptions();
@@ -288,7 +288,7 @@ export const sentryMinidumpIntegration = defineIntegration((options: Options = {
             restorePreviousSession(sessionToRestore);
           }
         })
-        .catch((error) => logger.error(error));
+        .catch((error) => debug.error(error));
     },
   };
 });

src/main/integrations/sentry-minidump/minidump-loader.ts

@@ -1,4 +1,4 @@
-import { Attachment, logger } from '@sentry/core';
+import { Attachment, debug } from '@sentry/core';
 import { app } from 'electron';
 import { promises as fs } from 'fs';
 import { basename, join } from 'path';
@@ -47,14 +47,14 @@ export function createMinidumpLoader(getMinidumpPaths: () => Promise<string[]>):
             continue;
           }
 
-          logger.log('Found minidump', path);
+          debug.log('Found minidump', path);
 
           let stats = await fs.stat(path);
 
           const thirtyDaysAgo = new Date().getTime() - MAX_AGE_DAYS * MS_PER_DAY;
 
           if (stats.mtimeMs < thirtyDaysAgo) {
-            logger.log(`Ignoring minidump as it is over ${MAX_AGE_DAYS} days old`);
+            debug.log(`Ignoring minidump as it is over ${MAX_AGE_DAYS} days old`);
             continue;
           }
 
@@ -68,7 +68,7 @@ export function createMinidumpLoader(getMinidumpPaths: () => Promise<string[]>):
               try {
                 const parsedMinidump = parseMinidump(data);
 
-                logger.log('Sending minidump');
+                debug.log('Sending minidump');
 
                 await callback(parsedMinidump, {
                   attachmentType: 'event.minidump',
@@ -77,31 +77,31 @@ export function createMinidumpLoader(getMinidumpPaths: () => Promise<string[]>):
                 });
               } catch (e) {
                 const message = e instanceof Error ? e.toString() : 'Unknown error';
-                logger.warn(`Dropping minidump:\n${message}`);
+                debug.warn(`Dropping minidump:\n${message}`);
                 break;
               }
 
               break;
             }
 
-            logger.log(`Waiting. Minidump has been modified in the last ${NOT_MODIFIED_MS} milliseconds.`);
+            debug.log(`Waiting. Minidump has been modified in the last ${NOT_MODIFIED_MS} milliseconds.`);
             retries += 1;
             await delay(RETRY_DELAY_MS);
             // update the stats
             stats = await fs.stat(path);
           }
 
           if (retries >= MAX_RETRIES) {
-            logger.warn('Timed out waiting for minidump to stop being modified');
+            debug.warn('Timed out waiting for minidump to stop being modified');
           }
         } catch (e) {
-          logger.error('Failed to load minidump', e);
+          debug.error('Failed to load minidump', e);
         } finally {
           // We always attempt to delete the minidump
           try {
             await fs.unlink(path);
           } catch (e) {
-            logger.warn('Could not delete minidump', path);
+            debug.warn('Could not delete minidump', path);
           }
         }
       }
@@ -118,7 +118,7 @@ async function deleteCrashpadMetadataFile(crashesDirectory: string, waitMs: numb
   const metadataPath = join(crashesDirectory, 'metadata');
   try {
     await fs.unlink(metadataPath);
-    logger.log('Deleted Crashpad metadata file', metadataPath);
+    debug.log('Deleted Crashpad metadata file', metadataPath);
   } catch (e: any) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (e.code && e.code == 'EBUSY') {
@@ -158,7 +158,7 @@ export function getMinidumpLoader(): MinidumpLoader {
   }
 
   return createMinidumpLoader(async () => {
-    await deleteCrashpadMetadataFile(crashesDirectory).catch((error) => logger.error(error));
+    await deleteCrashpadMetadataFile(crashesDirectory).catch((error) => debug.error(error));
     const files = await readDirsAsync(dumpDirectories);
     return files.filter((file) => file.endsWith('.dmp'));
   });

src/main/ipc.ts

@@ -2,9 +2,9 @@ import {
   _INTERNAL_captureSerializedLog,
   Attachment,
   Client,
+  debug,
   DynamicSamplingContext,
   Event,
-  logger,
   parseEnvelope,
   ScopeData,
   SerializedLog,
@@ -50,7 +50,7 @@ function newProtocolRenderer(): void {
             WINDOW_ID_TO_WEB_CONTENTS?.delete(windowId);
           });
         }
-      }, logger.error);
+      }, debug.error);
     }
   }
 }
@@ -137,7 +137,7 @@ function handleScope(options: ElectronMainOptionsInternal, jsonScope: string): v
   try {
     sentScope = JSON.parse(jsonScope) as ScopeData;
   } catch {
-    logger.warn('sentry-electron received an invalid scope message');
+    debug.warn('sentry-electron received an invalid scope message');
     return;
   }
 
@@ -233,7 +233,7 @@ function configureProtocol(client: Client, options: ElectronMainOptionsInternal)
         });
       }
     })
-    .catch((error) => logger.error(error));
+    .catch((error) => debug.error(error));
 }
 
 /**