Merge pull request #296 from ryanluker/cleanup-sentry-error-logging

[#???] Adjust sentry logging to remove warnings
ryanluker · Mar 6, 2021 · 95bab88 · 95bab88
2 parents c15ac1a + 64aeb61
commit 95bab88
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 163 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-coverage-gutters",
   "displayName": "Coverage Gutters",
   "description": "Display test coverage generated by lcov or xml - works with many languages",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -272,12 +272,12 @@
     "cross-env": "5.2.0",
     "mocha": "6.1.4",
     "tslint": "5.16.0",
-    "typescript": "3.4.5",
+    "typescript": "4.2.3",
     "vscode": "1.1.34"
   },
   "dependencies": {
     "@cvrg-report/clover-json": "0.3.2",
-    "@sentry/node": "5.18.1",
+    "@sentry/browser": "6.2.1",
     "cobertura-parse": "github:vokal/cobertura-parse#53109a6",
     "glob": "7.1.4",
     "jacoco-parse": "2.0.1",

diff --git a/src/coverage-system/coverage.ts b/src/coverage-system/coverage.ts
@@ -40,7 +40,10 @@ export class Coverage {
                 fileQuickPicks,
                 {placeHolder},
             );
-            if (!item) { throw new Error("Did not choose a file!"); }
+            if (!item) {
+                window.showWarningMessage("Did not choose a file!");
+                return;
+            }
 
             pickedFile = item.description;
         }

diff --git a/src/coverage-system/coverageservice.ts b/src/coverage-system/coverageservice.ts
@@ -88,25 +88,21 @@ export class CoverageService {
     }
 
     private async loadCache() {
-        try {
-            this.updateServiceState(Status.loading);
-            const files = await this.filesLoader.findCoverageFiles();
-            this.outputChannel.appendLine(
-                `[${Date.now()}][coverageservice]: Loading ${files.size} file(s)`,
-            );
-            const dataFiles = await this.filesLoader.loadDataFiles(files);
-            this.outputChannel.appendLine(
-                `[${Date.now()}][coverageservice]: Loaded ${dataFiles.size} data file(s)`,
-            );
-            const dataCoverage = await this.coverageParser.filesToSections(dataFiles);
-            this.outputChannel.appendLine(
-                `[${Date.now()}][coverageservice]: Caching ${dataCoverage.size} coverage(s)`,
-            );
-            this.cache = dataCoverage;
-            this.updateServiceState(Status.ready);
-        } catch (error) {
-            this.handleError(error);
-        }
+        this.updateServiceState(Status.loading);
+        const files = await this.filesLoader.findCoverageFiles();
+        this.outputChannel.appendLine(
+            `[${Date.now()}][coverageservice]: Loading ${files.size} file(s)`,
+        );
+        const dataFiles = await this.filesLoader.loadDataFiles(files);
+        this.outputChannel.appendLine(
+            `[${Date.now()}][coverageservice]: Loaded ${dataFiles.size} data file(s)`,
+        );
+        const dataCoverage = await this.coverageParser.filesToSections(dataFiles);
+        this.outputChannel.appendLine(
+            `[${Date.now()}][coverageservice]: Caching ${dataCoverage.size} coverage(s)`,
+        );
+        this.cache = dataCoverage;
+        this.updateServiceState(Status.ready);
     }
 
     private updateServiceState(state: Status) {
@@ -173,19 +169,4 @@ export class CoverageService {
             this.handleEditorEvents.bind(this),
         );
     }
-
-    private handleError(error: Error) {
-        const message = error.message ? error.message : error;
-        const stackTrace = error.stack;
-        window.showWarningMessage(message.toString());
-        this.outputChannel.appendLine(`[${Date.now()}][gutters]: Error ${message}`);
-        this.outputChannel.appendLine(`[${Date.now()}][gutters]: Stacktrace ${stackTrace}`);
-
-        const crashReporter = new CrashReporter();
-
-        if (crashReporter.checkEnabled()) {
-            const [ sentryId, sentryPrompt ] = crashReporter.captureError(error);
-            this.outputChannel.appendLine(`[${Date.now()}][gutters]: ${sentryPrompt} ${sentryId}`);
-        }
-    }
 }
diff --git a/src/extension/crashreporter.ts b/src/extension/crashreporter.ts
@@ -1,4 +1,4 @@
-import * as Sentry from "@sentry/node";
+import * as Sentry from "@sentry/browser";
 import { v4 as uuidv4 } from "uuid";
 import {
     workspace,
@@ -15,9 +15,10 @@ export class CrashReporter {
             // Leaving default integrations on captures crashes from other extension hosts
             // Turning this off fixes that issue and still allows us to capture errors manually
             Sentry.init({
+                autoSessionTracking: true,
                 defaultIntegrations: false,
                 dsn: "https://[email protected]/5288283",
-                release: "[email protected].0",
+                release: "[email protected].1",
             });
             Sentry.configureScope(function(scope) {
                 // Generate a random string for this session

diff --git a/src/extension/gutters.ts b/src/extension/gutters.ts
@@ -38,7 +38,10 @@ export class Gutters {
                 coverageReports,
                 "Choose a Coverage Report to preview.",
             );
-            if (!pickedReport) { throw new Error("Could not show Coverage Report file!"); }
+            if (!pickedReport) {
+                window.showWarningMessage("Could not show Coverage Report file!");
+                return;
+            }
 
             const previewPanel = new PreviewPanel(pickedReport);
 
@@ -71,15 +74,15 @@ export class Gutters {
             this.statusBar.toggle(false);
             this.coverageService.dispose();
         } catch (error) {
-            this.handleError("removeWatch", error, false);
+            this.handleError("removeWatch", error);
         }
     }
 
     public removeCoverageForActiveFile() {
         try {
             this.coverageService.removeCoverageForCurrentEditor();
         } catch (error) {
-            this.handleError("removeCoverageForActiveFile", error, false);
+            this.handleError("removeCoverageForActiveFile", error);
         }
     }
 
@@ -88,21 +91,17 @@ export class Gutters {
             this.coverageService.dispose();
             this.statusBar.dispose();
         } catch (error) {
-            this.handleError("dispose", error, false);
+            this.handleError("dispose", error);
         }
     }
 
-    private handleError(area: string, error: Error, showMessage: boolean = true) {
+    private handleError(area: string, error: Error) {
         const message = error.message ? error.message : error;
         const stackTrace = error.stack;
-        if (showMessage) {
-            window.showWarningMessage(message.toString());
-        }
         this.outputChannel.appendLine(`[${Date.now()}][${area}]: ${message}`);
         this.outputChannel.appendLine(`[${Date.now()}][${area}]: ${stackTrace}`);
 
         const crashReporter = new CrashReporter();
-
         if (crashReporter.checkEnabled()) {
             const [ sentryId, sentryPrompt ] = crashReporter.captureError(error);
             this.outputChannel.appendLine(`[${Date.now()}][${area}]: ${sentryPrompt} ${sentryId}`);

diff --git a/src/files/filesloader.ts b/src/files/filesloader.ts
@@ -1,6 +1,6 @@
 import {readFile} from "fs";
 import * as glob from "glob";
-import {workspace, WorkspaceFolder} from "vscode";
+import {window, workspace, WorkspaceFolder} from "vscode";
 import {Config} from "../extension/config";
 
 export class FilesLoader {
@@ -21,7 +21,10 @@ export class FilesLoader {
         } else {
             const fileNames = this.configStore.coverageFileNames;
             const files = await this.findCoverageInWorkspace(fileNames);
-            if (!files.size) { throw new Error("Could not find a Coverage file!"); }
+            if (!files.size) {
+                window.showWarningMessage("Could not find a Coverage file!");
+                return new Set();
+            }
             return files;
         }
     }