fix tests etc.

Author: mydea

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -53,6 +53,10 @@ sentryTest('should capture feedback', async ({ getLocalTestPath, page }) => {
         source: 'widget',
         url: expect.stringContaining('/dist/index.html'),
       },
+      trace: {
+        trace_id: expect.stringMatching(/\w{32}/),
+        span_id: expect.stringMatching(/\w{16}/),
+      },
     },
     level: 'info',
     timestamp: expect.any(Number),

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -89,6 +89,10 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestPat
         source: 'widget',
         url: expect.stringContaining('/dist/index.html'),
       },
+      trace: {
+        trace_id: expect.stringMatching(/\w{32}/),
+        span_id: expect.stringMatching(/\w{16}/),
+      },
     },
     level: 'info',
     timestamp: expect.any(Number),

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts

@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test';
-import type { SpanEnvelope } from '@sentry/types';
+import type { SpanEnvelope, Event } from '@sentry/types';
 import { sentryTest } from '../../../../utils/fixtures';
 import type { EventAndTraceHeader } from '../../../../utils/helpers';
 import {

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts

@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test';
-import type { SpanEnvelope } from '@sentry/types';
+import type { SpanEnvelope, Event } from '@sentry/types';
 import { sentryTest } from '../../../../utils/fixtures';
 import type { EventAndTraceHeader } from '../../../../utils/helpers';
 import {

packages/core/src/baseclient.ts

@@ -35,6 +35,7 @@ import {
   addItemToEnvelope,
   checkOrSetAlreadyCaught,
   createAttachmentEnvelopeItem,
+  dropUndefinedKeys,
   isParameterizedString,
   isPlainObject,
   isPrimitive,
@@ -662,11 +663,11 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
       if (!trace && propagationContext) {
         const { traceId: trace_id, spanId, parentSpanId, dsc } = propagationContext;
         evt.contexts = {
-          trace: {
+          trace: dropUndefinedKeys({
             trace_id,
             span_id: spanId,
             parent_span_id: parentSpanId,
-          },
+          }),
           ...evt.contexts,
         };
 

packages/core/src/feedback.ts

@@ -1,4 +1,5 @@
 import type { Attachment, EventHint, FeedbackEvent } from '@sentry/types';
+import { dropUndefinedKeys } from '@sentry/utils';
 import { getClient, getCurrentScope } from './currentScopes';
 import { createAttachmentEnvelope } from './envelope';
 
@@ -31,14 +32,14 @@ export function captureFeedback(
 
   const feedbackEvent: FeedbackEvent = {
     contexts: {
-      feedback: {
+      feedback: dropUndefinedKeys({
         contact_email: email,
         name,
         message,
         url,
         source,
         associated_event_id: associatedEventId,
-      },
+      }),
     },
     type: 'feedback',
     level: 'info',
@@ -58,7 +59,10 @@ export function captureFeedback(
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     void transport.send(
       createAttachmentEnvelope(
-        feedbackEvent,
+        {
+          ...feedbackEvent,
+          event_id: eventId,
+        },
         attachments,
         dsn,
         client.getOptions()._metadata,