-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14502 from getsentry/prepare-release/8.41.0
meta(changelog): Update changelog for 8.41.0
- Loading branch information
Showing
115 changed files
with
2,778 additions
and
1,332 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| fail-on-severity: 'high' | ||
| allow-ghsas: | ||
| # dependency review does not allow specific file exclusions | ||
| # we use an older version of NextJS in our tests and thus need to | ||
| # we use an older version of NextJS in our tests and thus need to | ||
| # exclude this | ||
| # once our minimum supported version is over 14.1.1 this can be removed | ||
| - GHSA-fr5h-rqp8-mj6g | ||
| # we need this for an E2E test for the minimum required version of Nuxt 3.7.0 | ||
| - GHSA-v784-fjjh-f8r4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
...ser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/subject.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Sentry.withScope(() => { | ||
| Sentry.startSpan({ name: 'test_span_1' }, () => undefined); | ||
| Sentry.startSpan({ name: 'test_span_2' }, () => undefined); | ||
| }); |
41 changes: 41 additions & 0 deletions
41
...rowser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import { expect } from '@playwright/test'; | ||
|
|
||
| import type { TransactionEvent } from '@sentry/types'; | ||
| import { sentryTest } from '../../../../utils/fixtures'; | ||
| import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; | ||
|
|
||
| sentryTest( | ||
| 'should send manually started parallel root spans outside of root context', | ||
| async ({ getLocalTestUrl, page }) => { | ||
| if (shouldSkipTracingTest()) { | ||
| sentryTest.skip(); | ||
| } | ||
|
|
||
| const url = await getLocalTestUrl({ testDir: __dirname }); | ||
|
|
||
| const transaction1ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_1'); | ||
| const transaction2ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_2'); | ||
|
|
||
| await page.goto(url); | ||
|
|
||
| const [transaction1Req, transaction2Req] = await Promise.all([transaction1ReqPromise, transaction2ReqPromise]); | ||
|
|
||
| const transaction1 = envelopeRequestParser<TransactionEvent>(transaction1Req); | ||
| const transaction2 = envelopeRequestParser<TransactionEvent>(transaction2Req); | ||
|
|
||
| expect(transaction1).toBeDefined(); | ||
| expect(transaction2).toBeDefined(); | ||
|
|
||
| const trace1Id = transaction1.contexts?.trace?.trace_id; | ||
| const trace2Id = transaction2.contexts?.trace?.trace_id; | ||
|
|
||
| expect(trace1Id).toBeDefined(); | ||
| expect(trace2Id).toBeDefined(); | ||
|
|
||
| // We use the same traceID from the root propagation context here | ||
| expect(trace1Id).toBe(trace2Id); | ||
|
|
||
| expect(transaction1.contexts?.trace?.parent_span_id).toBeUndefined(); | ||
| expect(transaction2.contexts?.trace?.parent_span_id).toBeUndefined(); | ||
| }, | ||
| ); |
8 changes: 8 additions & 0 deletions
8
...ration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/subject.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| Sentry.getCurrentScope().setPropagationContext({ | ||
| parentSpanId: '1234567890123456', | ||
| spanId: '123456789012345x', | ||
| traceId: '12345678901234567890123456789012', | ||
| }); | ||
|
|
||
| Sentry.startSpan({ name: 'test_span_1' }, () => undefined); | ||
| Sentry.startSpan({ name: 'test_span_2' }, () => undefined); |
38 changes: 38 additions & 0 deletions
38
...tegration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { expect } from '@playwright/test'; | ||
|
|
||
| import type { TransactionEvent } from '@sentry/types'; | ||
| import { sentryTest } from '../../../../utils/fixtures'; | ||
| import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; | ||
|
|
||
| sentryTest( | ||
| 'should send manually started parallel root spans in root context with parentSpanId', | ||
| async ({ getLocalTestUrl, page }) => { | ||
| if (shouldSkipTracingTest()) { | ||
| sentryTest.skip(); | ||
| } | ||
|
|
||
| const url = await getLocalTestUrl({ testDir: __dirname }); | ||
|
|
||
| const transaction1ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_1'); | ||
| const transaction2ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_2'); | ||
|
|
||
| await page.goto(url); | ||
|
|
||
| const [transaction1Req, transaction2Req] = await Promise.all([transaction1ReqPromise, transaction2ReqPromise]); | ||
|
|
||
| const transaction1 = envelopeRequestParser<TransactionEvent>(transaction1Req); | ||
| const transaction2 = envelopeRequestParser<TransactionEvent>(transaction2Req); | ||
|
|
||
| expect(transaction1).toBeDefined(); | ||
| expect(transaction2).toBeDefined(); | ||
|
|
||
| const trace1Id = transaction1.contexts?.trace?.trace_id; | ||
| const trace2Id = transaction2.contexts?.trace?.trace_id; | ||
|
|
||
| expect(trace1Id).toBe('12345678901234567890123456789012'); | ||
| expect(trace2Id).toBe('12345678901234567890123456789012'); | ||
|
|
||
| expect(transaction1.contexts?.trace?.parent_span_id).toBe('1234567890123456'); | ||
| expect(transaction2.contexts?.trace?.parent_span_id).toBe('1234567890123456'); | ||
| }, | ||
| ); |
2 changes: 2 additions & 0 deletions
2
...ages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/subject.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Sentry.startSpan({ name: 'test_span_1' }, () => undefined); | ||
| Sentry.startSpan({ name: 'test_span_2' }, () => undefined); |
38 changes: 38 additions & 0 deletions
38
...ackages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { expect } from '@playwright/test'; | ||
|
|
||
| import type { TransactionEvent } from '@sentry/types'; | ||
| import { sentryTest } from '../../../../utils/fixtures'; | ||
| import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; | ||
|
|
||
| sentryTest('should send manually started parallel root spans in root context', async ({ getLocalTestUrl, page }) => { | ||
| if (shouldSkipTracingTest()) { | ||
| sentryTest.skip(); | ||
| } | ||
|
|
||
| const url = await getLocalTestUrl({ testDir: __dirname }); | ||
|
|
||
| const transaction1ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_1'); | ||
| const transaction2ReqPromise = waitForTransactionRequest(page, event => event.transaction === 'test_span_2'); | ||
|
|
||
| await page.goto(url); | ||
|
|
||
| const [transaction1Req, transaction2Req] = await Promise.all([transaction1ReqPromise, transaction2ReqPromise]); | ||
|
|
||
| const transaction1 = envelopeRequestParser<TransactionEvent>(transaction1Req); | ||
| const transaction2 = envelopeRequestParser<TransactionEvent>(transaction2Req); | ||
|
|
||
| expect(transaction1).toBeDefined(); | ||
| expect(transaction2).toBeDefined(); | ||
|
|
||
| const trace1Id = transaction1.contexts?.trace?.trace_id; | ||
| const trace2Id = transaction2.contexts?.trace?.trace_id; | ||
|
|
||
| expect(trace1Id).toBeDefined(); | ||
| expect(trace2Id).toBeDefined(); | ||
|
|
||
| // We use the same traceID from the root propagation context here | ||
| expect(trace1Id).toBe(trace2Id); | ||
|
|
||
| expect(transaction1.contexts?.trace?.parent_span_id).toBeUndefined(); | ||
| expect(transaction2.contexts?.trace?.parent_span_id).toBeUndefined(); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
dev-packages/e2e-tests/test-applications/nextjs-15/app/redirect/destination/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export default function RedirectDestinationPage() { | ||
| return ( | ||
| <div> | ||
| <h1>Redirect Destination</h1> | ||
| </div> | ||
| ); | ||
| } |
18 changes: 18 additions & 0 deletions
18
dev-packages/e2e-tests/test-applications/nextjs-15/app/redirect/origin/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import { redirect } from 'next/navigation'; | ||
|
|
||
| async function redirectAction() { | ||
| 'use server'; | ||
|
|
||
| redirect('/redirect/destination'); | ||
| } | ||
|
|
||
| export default function RedirectOriginPage() { | ||
| return ( | ||
| <> | ||
| {/* @ts-ignore */} | ||
| <form action={redirectAction}> | ||
| <button type="submit">Redirect me</button> | ||
| </form> | ||
| </> | ||
| ); | ||
| } |
Oops, something went wrong.