Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sentryTest('cultureContextIntegration captures locale, timezone, and calendar',

const pageloadSpan = spans.find(s => getSpanOp(s) === 'pageload');

expect(pageloadSpan!.attributes?.['culture.locale']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes?.['culture.timezone']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes?.['culture.calendar']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes['culture.locale']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes['culture.timezone']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes['culture.calendar']).toEqual({ type: 'string', value: expect.any(String) });
});
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ sentryTest('httpContextIntegration captures url, user-agent, and referer', async

const pageloadSpan = spans.find(s => getSpanOp(s) === 'pageload');

expect(pageloadSpan!.attributes?.['url.full']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes?.['http.request.header.user_agent']).toEqual({
expect(pageloadSpan!.attributes['url.full']).toEqual({ type: 'string', value: expect.any(String) });
expect(pageloadSpan!.attributes['http.request.header.user_agent']).toEqual({
type: 'string',
value: expect.any(String),
});
expect(pageloadSpan!.attributes?.['http.request.header.referer']).toEqual({
expect(pageloadSpan!.attributes['http.request.header.referer']).toEqual({
type: 'string',
value: 'https://sentry.io/',
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ sentryTest(
const rootSpan = spans.find(s => s.name === 'root-fibonacci');
expect(rootSpan).toBeDefined();

expect(rootSpan!.attributes?.['thread.id']).toEqual({ type: 'string', value: '0' });
expect(rootSpan!.attributes?.['thread.name']).toEqual({ type: 'string', value: 'main' });
expect(rootSpan!.attributes['thread.id']).toEqual({ type: 'string', value: '0' });
expect(rootSpan!.attributes['thread.name']).toEqual({ type: 'string', value: 'main' });

const childSpans = spans.filter(s => s.name === 'child-span-1' || s.name === 'child-span-2');
expect(childSpans.length).toBeGreaterThanOrEqual(1);

for (const child of childSpans) {
expect(child.attributes?.['thread.id']).toEqual({ type: 'string', value: '0' });
expect(child.attributes?.['thread.name']).toEqual({ type: 'string', value: 'main' });
expect(child.attributes['thread.id']).toEqual({ type: 'string', value: '0' });
expect(child.attributes['thread.name']).toEqual({ type: 'string', value: 'main' });
}
},
);
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sentryTest('beforeSendSpan applies changes to streamed span', async ({ getLocalT
},
},
]);
expect(pageloadSpan.attributes?.['sentry.custom_attribute']).toEqual({
expect(pageloadSpan.attributes['sentry.custom_attribute']).toEqual({
type: 'string',
value: 'customAttributeValue',
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sentryTest(
expect(pageloadSpan).toBeDefined();

// Span attribute: sentry.replay_id
expect(pageloadSpan!.attributes?.['sentry.replay_id']).toEqual({
expect(pageloadSpan!.attributes['sentry.replay_id']).toEqual({
type: 'string',
value: replay.session?.id,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ sentryTest('finishes streamed pageload span when the page goes background', asyn

// TODO: Is this what we want?
expect(pageloadSpan.status).toBe('ok');
expect(pageloadSpan.attributes?.['sentry.cancellation_reason']?.value).toBe('document.hidden');
expect(pageloadSpan.attributes['sentry.cancellation_reason']?.value).toBe('document.hidden');
});
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
const pageloadSampleRand = Number(envelope[0].trace?.sample_rand);
const pageloadSpan = envelope[1][0][1].items.find(s => getSpanOp(s) === 'pageload')!;

expect(pageloadSpan.attributes?.['sentry.sample_rate']?.value).toBe(1);
expect(pageloadSpan.attributes['sentry.sample_rate']?.value).toBe(1);
expect(Number.isNaN(pageloadSampleRand)).toBe(false);
expect(pageloadSampleRand).toBeGreaterThanOrEqual(0);
expect(pageloadSampleRand).toBeLessThanOrEqual(1);
Expand Down Expand Up @@ -101,7 +101,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {

const pageloadSpan = envelope[1][0][1].items.find(s => getSpanOp(s) === 'pageload')!;

expect(pageloadSpan.attributes?.['sentry.sample_rate']?.value).toBe(1);
expect(pageloadSpan.attributes['sentry.sample_rate']?.value).toBe(1);

return { pageloadSpan, pageloadSampleRand };
});
Expand All @@ -125,8 +125,8 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {

expect(fetchTraceSampleRand).toBe(pageloadSampleRand);

expect(fetchTraceSpan.attributes?.['sentry.sample_rate']?.value).toEqual(
pageloadSpan.attributes?.['sentry.sample_rate']?.value,
expect(fetchTraceSpan.attributes['sentry.sample_rate']?.value).toEqual(
pageloadSpan.attributes['sentry.sample_rate']?.value,
);
expect(fetchTraceSpan.trace_id).not.toEqual(pageloadSpan.trace_id);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
expect(Number(envelope[0].trace?.sample_rate)).toBe(metaTagSampleRate);

// since the local sample rate was not applied, the sample rate attribute shouldn't be set
expect(span.attributes?.['sentry.sample_rate']).toBeUndefined();
expect(span.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]).toBeUndefined();
expect(span.attributes['sentry.sample_rate']).toBeUndefined();
expect(span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]).toBeUndefined();

return span;
});
Expand All @@ -57,10 +57,10 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
expect(envelope[0].trace?.sampled).toBe('true');

// since the local sample rate was not applied, the sample rate attribute shouldn't be set
expect(span.attributes?.['sentry.sample_rate']).toBeUndefined();
expect(span.attributes['sentry.sample_rate']).toBeUndefined();

// but we need to set this attribute to still be able to correctly add the sample rate to the DSC (checked above in trace header)
expect(span.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(metaTagSampleRate);
expect(span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(metaTagSampleRate);

return span;
});
Expand All @@ -86,10 +86,10 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
expect(envelope[0].trace?.sampled).toEqual('true');

// since the local sample rate was not applied, the sample rate attribute shouldn't be set
expect(navSpan.attributes?.['sentry.sample_rate']).toBeUndefined();
expect(navSpan.attributes['sentry.sample_rate']).toBeUndefined();

// but we need to set this attribute to still be able to correctly add the sample rate to the DSC (checked above in trace header)
expect(navSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(metaTagSampleRate);
expect(navSpan.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(metaTagSampleRate);
});
});

Expand All @@ -115,8 +115,8 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
expect(Number(envelope[0].trace?.sample_rate)).toBe(metaTagSampleRate);

// since the local sample rate was not applied, the sample rate attribute shouldn't be set
expect(span.attributes?.['sentry.sample_rate']).toBeUndefined();
expect(span.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]).toBeUndefined();
expect(span.attributes['sentry.sample_rate']).toBeUndefined();
expect(span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]).toBeUndefined();

return span;
});
Expand All @@ -140,8 +140,8 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains

expect(fetchTraceSampleRand).toEqual(metaTagSampleRand);

expect(fetchTraceSpan.attributes?.['sentry.sample_rate']).toBeUndefined();
expect(fetchTraceSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(
expect(fetchTraceSpan.attributes['sentry.sample_rate']).toBeUndefined();
expect(fetchTraceSpan.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE]?.value).toBe(
metaTagSampleRate,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
const envelope = await pageloadEnvelopePromise;
const pageloadSpan = envelope[1][0][1].items.find(s => getSpanOp(s) === 'pageload')!;

expect(pageloadSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(pageloadSpan.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(Number(envelope[0].trace?.sample_rand)).toBeGreaterThanOrEqual(0);

return { pageloadSpan };
Expand Down Expand Up @@ -96,7 +96,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
const envelope = await customEnvelopePromise;
const customTrace2Span = envelope[1][0][1].items.find(s => getSpanOp(s) === 'custom')!;

expect(customTrace2Span.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(customTrace2Span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(customTrace2Span.trace_id).not.toEqual(pageloadSpan.trace_id);
expect(customTrace2Span.parent_span_id).toBeUndefined();

Expand Down Expand Up @@ -129,7 +129,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
const envelope = await navigationEnvelopePromise;
const navigationSpan = envelope[1][0][1].items.find(s => getSpanOp(s) === 'navigation')!;

expect(navigationSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(navigationSpan.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]?.value).toBe(1);
expect(navigationSpan.trace_id).not.toEqual(customTrace2Span.trace_id);
expect(navigationSpan.parent_span_id).toBeUndefined();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
},
]);

expect(navigation1Span.attributes?.['sentry.previous_trace']).toEqual({
expect(navigation1Span.attributes['sentry.previous_trace']).toEqual({
type: 'string',
value: `${pageloadTraceId}-${pageloadSpan.span_id}-1`,
});
Expand All @@ -60,7 +60,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
},
]);

expect(navigation2Span.attributes?.['sentry.previous_trace']).toEqual({
expect(navigation2Span.attributes['sentry.previous_trace']).toEqual({
type: 'string',
value: `${navigation1TraceId}-${navigation1Span.span_id}-1`,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sentryTest('includes a span link to a previously negatively sampled span', async
},
]);

expect(navigationSpan.attributes?.['sentry.previous_trace']).toEqual({
expect(navigationSpan.attributes['sentry.previous_trace']).toEqual({
type: 'string',
value: expect.stringMatching(/[a-f\d]{32}-[a-f\d]{16}-0/),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ sentryTest(
expect(uiSpans.length).toBeGreaterThanOrEqual(1);

const topLevelUISpan = uiSpans.find(
s => s.attributes?.['browser.script.invoker']?.value === 'https://sentry-test-site.example/path/to/script.js',
s => s.attributes['browser.script.invoker']?.value === 'https://sentry-test-site.example/path/to/script.js',
)!;

expect(topLevelUISpan).toEqual(
Expand Down Expand Up @@ -83,7 +83,7 @@ sentryTest('captures long animation frame span for event listener.', async ({ br
expect(uiSpans.length).toBeGreaterThanOrEqual(2);

const eventListenerUISpan = uiSpans.find(
s => s.attributes?.['browser.script.invoker']?.value === 'BUTTON#clickme.onclick',
s => s.attributes['browser.script.invoker']?.value === 'BUTTON#clickme.onclick',
)!;

expect(eventListenerUISpan).toEqual(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sentryTest(
expect(uiSpans.length).toBeGreaterThanOrEqual(1);

const topLevelUISpan = uiSpans.find(
s => s.attributes?.['browser.script.invoker']?.value === 'https://sentry-test-site.example/path/to/script.js',
s => s.attributes['browser.script.invoker']?.value === 'https://sentry-test-site.example/path/to/script.js',
)!;

expect(topLevelUISpan).toEqual(
Expand Down Expand Up @@ -85,7 +85,7 @@ sentryTest('captures long animation frame span for event listener.', async ({ br
expect(uiSpans.length).toBeGreaterThanOrEqual(2);

const eventListenerUISpan = uiSpans.find(
s => s.attributes?.['browser.script.invoker']?.value === 'BUTTON#clickme.onclick',
s => s.attributes['browser.script.invoker']?.value === 'BUTTON#clickme.onclick',
)!;

expect(eventListenerUISpan).toEqual(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sentryTest(
const span = await spanPromise;

expect(span.name).toMatch(/^GET /);
expect(span.attributes?.['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser' });
expect(span.attributes?.['sentry.op']).toEqual({ type: 'string', value: 'http.client' });
expect(span.attributes['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser' });
expect(span.attributes['sentry.op']).toEqual({ type: 'string', value: 'http.client' });
},
);
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@ sentryTest('captures CLS as a streamed span with source attributes', async ({ ge
const clsSpan = await clsSpanPromise;
const pageloadSpan = await pageloadSpanPromise;

expect(clsSpan.attributes?.['sentry.op']).toEqual({ type: 'string', value: 'ui.webvital.cls' });
expect(clsSpan.attributes?.['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser.cls' });
expect(clsSpan.attributes?.['sentry.exclusive_time']).toEqual({ type: 'integer', value: 0 });
expect(clsSpan.attributes?.['user_agent.original']?.value).toEqual(expect.stringContaining('Chrome'));
expect(clsSpan.attributes['sentry.op']).toEqual({ type: 'string', value: 'ui.webvital.cls' });
expect(clsSpan.attributes['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser.cls' });
expect(clsSpan.attributes['sentry.exclusive_time']).toEqual({ type: 'integer', value: 0 });
expect(clsSpan.attributes['user_agent.original']?.value).toEqual(expect.stringContaining('Chrome'));

// Check the CLS span carries the transaction/segment name it belongs to
expect(clsSpan.attributes?.['sentry.transaction']).toEqual({ type: 'string', value: '/index.html' });
expect(clsSpan.attributes?.['sentry.segment.name']).toEqual({ type: 'string', value: '/index.html' });
expect(clsSpan.attributes['sentry.transaction']).toEqual({ type: 'string', value: '/index.html' });
expect(clsSpan.attributes['sentry.segment.name']).toEqual({ type: 'string', value: '/index.html' });

// Check browser.web_vital.cls.source attributes
expect(clsSpan.attributes?.['browser.web_vital.cls.source.1']?.value).toEqual(
expect(clsSpan.attributes['browser.web_vital.cls.source.1']?.value).toEqual(
expect.stringContaining('body > div#content > p'),
);

// Check pageload span id is present
expect(clsSpan.attributes?.['sentry.pageload.span_id']?.value).toBe(pageloadSpan.span_id);
expect(clsSpan.attributes['sentry.pageload.span_id']?.value).toBe(pageloadSpan.span_id);

// CLS is a point-in-time metric
expect(clsSpan.start_timestamp).toEqual(clsSpan.end_timestamp);
Expand All @@ -72,9 +72,9 @@ sentryTest('CLS streamed span has web vital value attribute', async ({ getLocalT
const clsSpan = await clsSpanPromise;

// The CLS value should be set as a browser.web_vital.cls.value attribute
expect(clsSpan.attributes?.['browser.web_vital.cls.value']?.type).toBe('double');
expect(clsSpan.attributes['browser.web_vital.cls.value']?.type).toBe('double');
// Flakey value dependent on timings -> we check for a range
const clsValue = clsSpan.attributes?.['browser.web_vital.cls.value']?.value as number;
const clsValue = clsSpan.attributes['browser.web_vital.cls.value']?.value as number;
expect(clsValue).toBeGreaterThan(0.05);
expect(clsValue).toBeLessThan(0.15);
});
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ sentryTest('captures INP click as a streamed span', async ({ getLocalTestUrl, pa
const inpSpan = await inpSpanPromise;
const pageloadSpan = await pageloadSpanPromise;

expect(inpSpan.attributes?.['sentry.op']).toEqual({ type: 'string', value: 'ui.interaction.click' });
expect(inpSpan.attributes?.['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser.inp' });
expect(inpSpan.attributes?.['user_agent.original']?.value).toEqual(expect.stringContaining('Chrome'));
expect(inpSpan.attributes['sentry.op']).toEqual({ type: 'string', value: 'ui.interaction.click' });
expect(inpSpan.attributes['sentry.origin']).toEqual({ type: 'string', value: 'auto.http.browser.inp' });
expect(inpSpan.attributes['user_agent.original']?.value).toEqual(expect.stringContaining('Chrome'));

// Check the INP span carries the transaction/segment name it belongs to
expect(inpSpan.attributes?.['sentry.transaction']).toEqual({ type: 'string', value: '/index.html' });
expect(inpSpan.attributes?.['sentry.segment.name']).toEqual({ type: 'string', value: '/index.html' });
expect(inpSpan.attributes['sentry.transaction']).toEqual({ type: 'string', value: '/index.html' });
expect(inpSpan.attributes['sentry.segment.name']).toEqual({ type: 'string', value: '/index.html' });

const inpValue = inpSpan.attributes?.['browser.web_vital.inp.value']?.value as number;
const inpValue = inpSpan.attributes['browser.web_vital.inp.value']?.value as number;
expect(inpValue).toBeGreaterThan(0);

expect(inpSpan.attributes?.['sentry.exclusive_time']?.value).toBeGreaterThan(0);
expect(inpSpan.attributes['sentry.exclusive_time']?.value).toBeGreaterThan(0);

expect(inpSpan.name).toBe('body > NormalButton');

Expand Down Expand Up @@ -76,8 +76,8 @@ sentryTest('captures the slowest interaction as streamed INP span', async ({ get
const inpSpan = await inpSpanPromise;

expect(inpSpan.name).toBe('body > SlowButton');
expect(inpSpan.attributes?.['sentry.exclusive_time']?.value).toBeGreaterThan(400);
expect(inpSpan.attributes['sentry.exclusive_time']?.value).toBeGreaterThan(400);

const inpValue = inpSpan.attributes?.['browser.web_vital.inp.value']?.value as number;
const inpValue = inpSpan.attributes['browser.web_vital.inp.value']?.value as number;
expect(inpValue).toBeGreaterThan(400);
});
Loading
Loading