Merge branch 'develop' into fix/fetch-not-release

Author: Lei-k

.craft.yml

@@ -9,32 +9,27 @@ targets:
   - name: npm
     id: '@sentry/types'
     includeNames: /^sentry-types-\d.*\.tgz$/
-  ## 1.2 Utils
-  # TODO(v9): Remove
-  - name: npm
-    id: '@sentry/utils'
-    includeNames: /^sentry-utils-\d.*\.tgz$/
-  ## 1.3 Core SDK
+  ## 1.2 Core SDK
   - name: npm
     id: '@sentry/core'
     includeNames: /^sentry-core-\d.*\.tgz$/
-  ## 1.4 Browser Utils package
+  ## 1.3 Browser Utils package
   - name: npm
     id: '@sentry-internal/browser-utils'
     includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
-  ## 1.5 Replay Internal package (browser only)
+  ## 1.4 Replay Internal package (browser only)
   - name: npm
     id: '@sentry-internal/replay'
     includeNames: /^sentry-internal-replay-\d.*\.tgz$/
-  ## 1.6 OpenTelemetry package
+  ## 1.5 OpenTelemetry package
   - name: npm
     id: '@sentry/opentelemetry'
     includeNames: /^sentry-opentelemetry-\d.*\.tgz$/
-  ## 1.7 Feedback package (browser only)
+  ## 1.6 Feedback package (browser only)
   - name: npm
     id: '@sentry-internal/feedback'
     includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
-  ## 1.8 ReplayCanvas package (browser only)
+  ## 1.7 ReplayCanvas package (browser only)
   - name: npm
     id: '@sentry-internal/replay-canvas'
     includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/init.js renamed to dev-packages/browser-integration-tests/suites/public-api/captureFeedback/init.js

@@ -1,6 +1,6 @@
-Sentry.captureUserFeedback({
+Sentry.captureFeedback({
   eventId: 'test_event_id',
   email: 'test_email',
-  comments: 'test_comments',
+  message: 'test_comments',
   name: 'test_name',
 });

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/simple_feedback/subject.js renamed to dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/subject.js

@@ -0,0 +1,21 @@
+import { expect } from '@playwright/test';
+import type { FeedbackEvent } from '@sentry/core';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+
+sentryTest('should capture simple user feedback', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  const eventData = await getFirstSentryEnvelopeRequest<FeedbackEvent>(page, url);
+
+  expect(eventData.contexts).toMatchObject(
+    expect.objectContaining({
+      feedback: {
+        contact_email: 'test_email',
+        message: 'test_comments',
+        name: 'test_name',
+      },
+    }),
+  );
+});

dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/test.ts

@@ -5,11 +5,11 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   beforeSend(event) {
-    Sentry.captureUserFeedback({
-      event_id: event.event_id,
+    Sentry.captureFeedback({
+      associatedEventId: event.event_id,
       name: 'John Doe',
       email: '[email protected]',
-      comments: 'This feedback should be attached associated with the captured message',
+      message: 'This feedback should be attached associated with the captured error',
     });
     return event;
   },

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/init.js renamed to dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/init.js

@@ -1,23 +1,27 @@
 import { expect } from '@playwright/test';
-import type { Event, UserFeedback } from '@sentry/core';
+import type { Event, FeedbackEvent } from '@sentry/core';
 
 import { sentryTest } from '../../../../utils/fixtures';
 import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
 
 sentryTest('capture user feedback when captureException is called', async ({ getLocalTestUrl, page }) => {
   const url = await getLocalTestUrl({ testDir: __dirname });
 
-  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | UserFeedback)[];
+  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | FeedbackEvent)[];
 
   expect(data).toHaveLength(2);
 
   const errorEvent = ('exception' in data[0] ? data[0] : data[1]) as Event;
-  const feedback = ('exception' in data[0] ? data[1] : data[0]) as UserFeedback;
+  const feedback = ('exception' in data[0] ? data[1] : data[0]) as FeedbackEvent;
 
-  expect(feedback).toEqual({
-    comments: 'This feedback should be attached associated with the captured error',
-    email: '[email protected]',
-    event_id: errorEvent.event_id,
-    name: 'John Doe',
-  });
+  expect(feedback.contexts).toEqual(
+    expect.objectContaining({
+      feedback: {
+        associated_event_id: errorEvent.event_id,
+        message: 'This feedback should be attached associated with the captured error',
+        contact_email: '[email protected]',
+        name: 'John Doe',
+      },
+    }),
+  );
 });

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/subject.js renamed to dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/subject.js

@@ -5,11 +5,11 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   beforeSend(event) {
-    Sentry.captureUserFeedback({
-      event_id: event.event_id,
+    Sentry.captureFeedback({
+      associatedEventId: event.event_id,
       name: 'John Doe',
       email: '[email protected]',
-      comments: 'This feedback should be attached associated with the captured error',
+      message: 'This feedback should be attached associated with the captured message',
     });
     return event;
   },

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts renamed to dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/test.ts

@@ -1,23 +1,27 @@
 import { expect } from '@playwright/test';
-import type { Event, UserFeedback } from '@sentry/core';
+import type { Event, FeedbackEvent } from '@sentry/core';
 
 import { sentryTest } from '../../../../utils/fixtures';
 import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
 
 sentryTest('capture user feedback when captureMessage is called', async ({ getLocalTestUrl, page }) => {
   const url = await getLocalTestUrl({ testDir: __dirname });
 
-  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | UserFeedback)[];
+  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | FeedbackEvent)[];
 
   expect(data).toHaveLength(2);
 
   const errorEvent = ('exception' in data[0] ? data[0] : data[1]) as Event;
-  const feedback = ('exception' in data[0] ? data[1] : data[0]) as UserFeedback;
+  const feedback = ('exception' in data[0] ? data[1] : data[0]) as FeedbackEvent;
 
-  expect(feedback).toEqual({
-    comments: 'This feedback should be attached associated with the captured message',
-    email: '[email protected]',
-    event_id: errorEvent.event_id,
-    name: 'John Doe',
-  });
+  expect(feedback.contexts).toEqual(
+    expect.objectContaining({
+      feedback: {
+        message: 'This feedback should be attached associated with the captured message',
+        contact_email: '[email protected]',
+        associated_event_id: errorEvent.event_id,
+        name: 'John Doe',
+      },
+    }),
+  );
 });