Merge branch 'feat/proto-client-telemetry' of github.com:launchdarkly…

…/js-server-sdk-private into feat/proto-client-telemetry
launchdarkly · Sep 3, 2024 · e807abf · e807abf
2 parents 0f65e42 + 326295f
commit e807abf
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/packages/telemetry/browser-telemetry/src/BrowserTelemetryImpl.ts b/packages/telemetry/browser-telemetry/src/BrowserTelemetryImpl.ts
@@ -134,13 +134,23 @@ export default class BrowserTelemetryImpl implements BrowserTelemetry {
   }
 
   captureError(exception: Error): void {
-    const data: ErrorData = {
-      type: exception.name || exception.constructor.name || 'generic',
-      message: exception.message,
-      stack: parse(exception, this.options.stack),
-      breadcrumbs: [...this.breadcrumbs],
-      sessionId: this.sessionId,
-    };
+    const validException = exception !== undefined && exception !== null;
+
+    const data: ErrorData = validException
+      ? {
+          type: exception.name || exception.constructor?.name || 'generic',
+          message: exception.message,
+          stack: parse(exception, this.options.stack),
+          breadcrumbs: [...this.breadcrumbs],
+          sessionId: this.sessionId,
+        }
+      : {
+          type: 'generic',
+          message: 'null or undefined exception',
+          stack: { frames: [] },
+          breadcrumbs: [...this.breadcrumbs],
+          sessionId: this.sessionId,
+        };
     this.capture(ERROR_KEY, data);
     this.dispatchError(exception);
   }