Skip to content

Commit f32867d

Browse files
committed
simplify integration test
1 parent cf5fe65 commit f32867d

File tree

5 files changed

+11
-25
lines changed

5 files changed

+11
-25
lines changed

packages/core/src/envelope.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ export function createEventEnvelope(
117117
};
118118

119119
if (eventType === 'transaction') {
120-
const baggage = dropUndefinedKeys(
121-
createBaggage({
120+
const baggage = createBaggage(
121+
dropUndefinedKeys({
122122
environment: event.environment,
123123
release: event.release,
124124
transaction: event.transaction,
@@ -127,7 +127,6 @@ export function createEventEnvelope(
127127
usersegment: event.user && event.user.segment,
128128
} as BaggageObj),
129129
);
130-
131130
envelopeHeaders = {
132131
...envelopeHeaders,
133132
...(Object.keys(baggage[0]).length > 0 && { baggage: serializeBaggage(baggage) }),

packages/integration-tests/suites/tracing/baggage/init.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ window.Sentry = Sentry;
55

66
Sentry.init({
77
dsn: 'https://[email protected]/1337',
8-
integrations: [new Integrations.BrowserTracing()],
9-
release: '1.0.0',
8+
integrations: [new Integrations.BrowserTracing({ tracingOrigins: [/.*/] })],
109
environment: 'production',
1110
tracesSampleRate: 1,
1211
});
1312

14-
Sentry.configureScope(scope => scope.setUser({ id: 'user123', segment: 'segmentB' }));
13+
Sentry.configureScope(scope => {
14+
scope.setUser({ id: 'user123', segment: 'segmentB' });
15+
scope.setTransactionName('testTransactionBaggage');
16+
});

packages/integration-tests/suites/tracing/baggage/subject.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/integration-tests/suites/tracing/baggage/template.html

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
import { expect } from '@playwright/test';
2-
import { EventEnvelopeHeaders } from '@sentry/types';
2+
import { Event, EventEnvelopeHeaders } from '@sentry/types';
33

44
import { sentryTest } from '../../../utils/fixtures';
55
import { envelopeHeaderRequestParser, getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
66

77
sentryTest('should send baggage data in transaction envelope header', async ({ getLocalTestPath, page }) => {
88
const url = await getLocalTestPath({ testDir: __dirname });
99

10-
const pageloadTransaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
11-
expect(pageloadTransaction).toBeDefined();
12-
13-
await page.click('#start-transaction');
14-
1510
const envHeader = await getFirstSentryEnvelopeRequest<EventEnvelopeHeaders>(page, url, envelopeHeaderRequestParser);
11+
const event = await getFirstSentryEnvelopeRequest<Event>(page, url);
1612

13+
expect(event.type).toBe('transaction');
1714
expect(envHeader.baggage).toBeDefined();
1815
expect(envHeader.baggage).toEqual(
19-
'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=test-transaction,sentry-userid=user123,sentry-usersegment=segmentB',
16+
'sentry-environment=production,sentry-transaction=testTransactionBaggage,sentry-userid=user123,sentry-usersegment=segmentB',
2017
);
2118
});

0 commit comments

Comments
 (0)