Merge remote-tracking branch 'upstream/7.x' into feat/attachments

packages/browser/src/client.ts

@@ -1,6 +1,5 @@
 import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
 import { AttachmentItem, ClientOptions, Event, EventHint, Options, Severity, SeverityLevel } from '@sentry/types';
-import { getGlobalObject, logger } from '@sentry/utils';
 
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { Breadcrumbs } from './integrations';

packages/utils/src/envelope.ts

@@ -1,4 +1,4 @@
-import { Attachment, AttachmentItem, Envelope } from '@sentry/types';
+import { Attachment, AttachmentItem, DataCategory, Envelope, EnvelopeItem, EnvelopeItemType } from '@sentry/types';
 
 import { isPrimitive } from './is';
 
@@ -125,3 +125,20 @@ export function createAttachmentEnvelopeItem(attachment: Attachment): Attachment
     buffer,
   ];
 }
+
+const ITEM_TYPE_TO_DATA_CATEGORY_MAP: Record<EnvelopeItemType, DataCategory> = {
+  session: 'session',
+  sessions: 'session',
+  attachment: 'attachment',
+  transaction: 'transaction',
+  event: 'error',
+  client_report: 'internal',
+  user_report: 'default',
+};
+
+/**
+ * Maps the type of an envelope item to a data category.
+ */
+export function envelopeItemTypeToDataCategory(type: EnvelopeItemType): DataCategory {
+  return ITEM_TYPE_TO_DATA_CATEGORY_MAP[type];
+}

packages/utils/test/envelope.test.ts

@@ -1,6 +1,6 @@
 import { EventEnvelope } from '@sentry/types';
 
-import { addItemToEnvelope, createEnvelope, getEnvelopeType, serializeStringEnvelope } from '../src/envelope';
+import { addItemToEnvelope, createEnvelope, forEachEnvelopeItem, serializeStringEnvelope } from '../src/envelope';
 import { parseEnvelope } from './testutils';
 
 describe('envelope', () => {
@@ -49,9 +49,23 @@ describe('envelope', () => {
     it('loops through an envelope', () => {
       const items: EventEnvelope[1] = [
         [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }],
-        [{ type: 'attachment', filename: 'me.txt', length: 6 }, new Uint8Array(6)],
-      ]);
-      expect(getEnvelopeType(env)).toEqual('event');
+        [{ type: 'attachment', filename: 'bar.txt', length: 6 }, new Uint8Array(6)],
+        [{ type: 'attachment', filename: 'foo.txt', length: 6 }, new Uint8Array(6)],
+      ];
+
+      const env = createEnvelope<EventEnvelope>(
+        { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' },
+        items,
+      );
+
+      expect.assertions(6);
+
+      let iteration = 0;
+      forEachEnvelopeItem(env, (item, type) => {
+        expect(item).toBe(items[iteration]);
+        expect(type).toBe(items[iteration][0].type);
+        iteration = iteration + 1;
+      });
     });
   });
 });