Also check pending directory for crashpad

getsentry · Nov 18, 2022 · 0deb19b · 0deb19b
1 parent e07f06b
commit 0deb19b
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 1 deletion.
diff --git a/src/main/integrations/sentry-minidump/minidump-loader.ts b/src/main/integrations/sentry-minidump/minidump-loader.ts
@@ -94,6 +94,7 @@ function crashpadMinidumpLoader(): MinidumpLoader {
     await deleteCrashpadMetadataFile(crashesDirectory).catch((error) => logger.error(error));
 
     const dumpDirectory = join(crashesDirectory, crashpadSubDirectory);
+    const pendingDirectory = join(crashesDirectory, 'pending');
 
     return (await readDirAsync(dumpDirectory))
       .filter((file) => file.endsWith('.dmp'))
@@ -104,7 +105,19 @@ function crashpadMinidumpLoader(): MinidumpLoader {
           path,
           load: () => readFileAsync(path),
         };
-      });
+      })
+      .concat(
+        (await readDirAsync(pendingDirectory))
+          .filter((file) => file.endsWith('.dmp'))
+          .map((file) => {
+            const path = join(pendingDirectory, file);
+
+            return {
+              path,
+              load: () => readFileAsync(path),
+            };
+          }),
+      );
   });
 }
 

diff --git a/test/e2e/test-apps/native-sentry/renderer-force-crash/event.json b/test/e2e/test-apps/native-sentry/renderer-force-crash/event.json
@@ -0,0 +1,83 @@
+{
+  "method": "envelope",
+  "sentryKey": "37f8a2ee37c0409d8970bc7559c7c7e4",
+  "appId": "277345",
+  "data": {
+    "sdk": {
+      "name": "sentry.javascript.electron",
+      "packages": [
+        {
+          "name": "npm:@sentry/electron",
+          "version": "{{version}}"
+        }
+      ],
+      "version": "{{version}}"
+    },
+    "contexts": {
+      "app": {
+        "app_name": "native-sentry-renderer-force-crash",
+        "app_version": "1.0.0",
+        "app_start_time": "{{time}}"
+      },
+      "browser": {
+        "name": "Chrome"
+      },
+      "chrome": {
+        "name": "Chrome",
+        "type": "runtime",
+        "version": "{{version}}"
+      },
+      "device": {
+        "arch": "{{arch}}",
+        "family": "Desktop",
+        "memory_size": 0,
+        "free_memory": 0,
+        "processor_count": 0,
+        "processor_frequency": 0,
+        "cpu_description": "{{cpu}}",
+        "screen_resolution": "{{screen}}",
+        "screen_density": 1,
+        "language": "{{language}}"
+      },
+      "node": {
+        "name": "Node",
+        "type": "runtime",
+        "version": "{{version}}"
+      },
+      "os": {
+        "name": "{{platform}}",
+        "version": "{{version}}"
+      },
+      "runtime": {
+        "name": "Electron",
+        "version": "{{version}}"
+      },
+      "electron": {
+        "crashed_url": "unknown",
+        "details": {
+          "reason": "killed"
+        }
+      }
+    },
+    "release": "native-sentry-renderer-force-crash@1.0.0",
+    "environment": "development",
+    "user": {
+      "ip_address": "{{auto}}"
+    },
+    "event_id": "{{id}}",
+    "timestamp": 0,
+    "breadcrumbs": [],
+    "tags": {
+      "event.environment": "native",
+      "event.origin": "electron",
+      "event.process": "renderer",
+      "event_type": "native",
+      "exit.reason": "killed"
+    }
+  },
+  "attachments": [
+    {
+      "attachment_type": "event.minidump"
+    }
+  ]
+}
diff --git a/test/e2e/test-apps/native-sentry/renderer-force-crash/package.json b/test/e2e/test-apps/native-sentry/renderer-force-crash/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "native-sentry-renderer-force-crash",
+  "version": "1.0.0",
+  "main": "src/main.js",
+  "dependencies": {
+    "@sentry/electron": "3.0.0"
+  }
+}
diff --git a/test/e2e/test-apps/native-sentry/renderer-force-crash/recipe.yml b/test/e2e/test-apps/native-sentry/renderer-force-crash/recipe.yml
@@ -0,0 +1,3 @@
+description: Native Renderer forcefullyCrashRenderer
+category: Native (Sentry Uploader)
+command: yarn
diff --git a/test/e2e/test-apps/native-sentry/renderer-force-crash/src/index.html b/test/e2e/test-apps/native-sentry/renderer-force-crash/src/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+  </head>
+  <body>
+    <script>
+      const { init } = require('@sentry/electron');
+
+      init({
+        debug: true,
+      });
+    </script>
+  </body>
+</html>
diff --git a/test/e2e/test-apps/native-sentry/renderer-force-crash/src/main.js b/test/e2e/test-apps/native-sentry/renderer-force-crash/src/main.js
@@ -0,0 +1,27 @@
+const path = require('path');
+
+const { app, BrowserWindow } = require('electron');
+const { init } = require('@sentry/electron');
+
+init({
+  dsn: '__DSN__',
+  debug: true,
+  autoSessionTracking: false,
+  onFatalError: () => {},
+});
+
+app.on('ready', () => {
+  const mainWindow = new BrowserWindow({
+    show: false,
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false,
+    },
+  });
+
+  mainWindow.loadFile(path.join(__dirname, 'index.html'));
+
+  setTimeout(() => {
+    mainWindow.webContents.forcefullyCrashRenderer();
+  }, 1000);
+});