ref: Refactor code

HazAT · HazAT · commit cb005be8e473 · 2020-05-25T15:31:18.000+02:00
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
@@ -313,39 +313,47 @@ export class Breadcrumbs implements Integration {
 function addSentryBreadcrumb(serializedData: string): void {
   // There's always something that can go wrong with deserialization...
   try {
-    try {
-      const event = JSON.parse(serializedData);
-      getCurrentHub().addBreadcrumb(
-        {
-          category: `sentry.${event.type === 'transaction' ? 'transaction' : 'event'}`,
-          event_id: event.event_id,
-          level: event.level || Severity.fromString('error'),
-          message: getEventDescription(event),
-        },
-        {
-          event,
-        },
-      );
-    } catch (_oO) {
-      // We are dealing with an envelope here
-      // For simplicity we only deal with transactions
-      const envelopeLines = serializedData.split('\n');
-      const envelopeHeader = JSON.parse(envelopeLines[0]);
-      const itemHeader = JSON.parse(envelopeLines[1]);
-      const item = JSON.parse(envelopeLines[2]);
-      getCurrentHub().addBreadcrumb(
-        {
-          category: `sentry.${itemHeader.type}`,
-          event_id: envelopeHeader.event_id,
-          level: item.level,
-          message: getEventDescription(item),
-        },
-        {
-          item,
-        },
-      );
-    }
-  } catch (_oO) {
-    logger.error('Error while adding sentry type breadcrumb');
+    const event = JSON.parse(serializedData);
+    getCurrentHub().addBreadcrumb(
+      {
+        category: `sentry.${event.type === 'transaction' ? 'transaction' : 'event'}`,
+        event_id: event.event_id,
+        level: event.level || Severity.fromString('error'),
+        message: getEventDescription(event),
+      },
+      {
+        event,
+      },
+    );
+  } catch (error) {
+    logger.error('Error while adding sentry type breadcrumb will try envelope', error);
+    addSentryBreadcrumbWithEnvelope(serializedData);
+  }
+}
+
+/**
+ * Does the same as {@link addSentryBreadcrumb} but works with envelope
+ */
+function addSentryBreadcrumbWithEnvelope(envelope: string): void {
+  try {
+    // We are dealing with an envelope here
+    // For simplicity we only deal with transactions
+    const envelopeLines = envelope.split('\n');
+    const envelopeHeader = JSON.parse(envelopeLines[0]);
+    const itemHeader = JSON.parse(envelopeLines[1]);
+    const item = JSON.parse(envelopeLines[2]);
+    getCurrentHub().addBreadcrumb(
+      {
+        category: `sentry.${itemHeader.type}`,
+        event_id: envelopeHeader.event_id,
+        level: item.level,
+        message: getEventDescription(item),
+      },
+      {
+        item,
+      },
+    );
+  } catch (error) {
+    logger.error('Error while adding sentry type breadcrumb', error);
   }
 }
