-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into abhi-profiling-node-experimental
- Loading branch information
Showing
219 changed files
with
378 additions
and
660 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
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: 2 additions & 2 deletions
4
dev-packages/browser-integration-tests/suites/replay/bufferMode/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
2 changes: 1 addition & 1 deletion
2
dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.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
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
8 changes: 4 additions & 4 deletions
8
dev-packages/browser-integration-tests/utils/replayHelpers.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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/create-next-app/tsconfig.json
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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/create-react-app/tsconfig.json
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: 2 additions & 2 deletions
4
dev-packages/e2e-tests/test-applications/generic-ts3.8/index.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
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: 2 additions & 2 deletions
4
dev-packages/e2e-tests/test-applications/generic-ts3.8/tsconfig.json
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,11 +1,11 @@ | ||
{ | ||
"include": ["index.ts"], | ||
"compilerOptions": { | ||
"lib": ["es2017", "DOM"], | ||
"lib": ["es2018", "DOM"], | ||
"skipLibCheck": false, | ||
"noEmit": true, | ||
"types": [], | ||
"target": "es2017", | ||
"target": "es2018", | ||
"moduleResolution": "node" | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/nextjs-14/tsconfig.json
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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/react-create-hash-router/tsconfig.json
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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tsconfig.json
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
2 changes: 1 addition & 1 deletion
2
dev-packages/e2e-tests/test-applications/standard-frontend-react/tsconfig.json
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
5 changes: 5 additions & 0 deletions
5
...ages/e2e-tests/test-applications/sveltekit-2/src/routes/server-load-fetch/+page.server.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,5 @@ | ||
export const load = async ({ fetch }) => { | ||
const res = await fetch('/api/users'); | ||
const data = await res.json(); | ||
return { data }; | ||
}; |
8 changes: 8 additions & 0 deletions
8
...ackages/e2e-tests/test-applications/sveltekit-2/src/routes/server-load-fetch/+page.svelte
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 @@ | ||
<script lang="ts"> | ||
export let data; | ||
</script> | ||
|
||
<main> | ||
<h1>Server Load Fetch</h1> | ||
<p>{JSON.stringify(data, null, 2)}</p> | ||
</main> |
35 changes: 35 additions & 0 deletions
35
dev-packages/e2e-tests/test-applications/sveltekit-2/test/performance.server.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,35 @@ | ||
import { expect, test } from '@playwright/test'; | ||
import { waitForTransaction } from '../event-proxy-server'; | ||
|
||
test('server pageload request span has nested request span for sub request', async ({ page }) => { | ||
const serverTxnEventPromise = waitForTransaction('sveltekit-2', txnEvent => { | ||
return txnEvent?.transaction === 'GET /server-load-fetch'; | ||
}); | ||
|
||
await page.goto('/server-load-fetch'); | ||
|
||
const serverTxnEvent = await serverTxnEventPromise; | ||
const spans = serverTxnEvent.spans; | ||
|
||
expect(serverTxnEvent).toMatchObject({ | ||
transaction: 'GET /server-load-fetch', | ||
tags: { runtime: 'node' }, | ||
transaction_info: { source: 'route' }, | ||
type: 'transaction', | ||
contexts: { | ||
trace: { | ||
op: 'http.server', | ||
origin: 'auto.http.sveltekit', | ||
}, | ||
}, | ||
}); | ||
|
||
expect(spans).toEqual( | ||
expect.arrayContaining([ | ||
// load span where the server load function initiates the sub request: | ||
expect.objectContaining({ op: 'function.sveltekit.server.load', description: '/server-load-fetch' }), | ||
// sub request span: | ||
expect.objectContaining({ op: 'http.server', description: 'GET /api/users' }), | ||
]), | ||
); | ||
}); |
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
Oops, something went wrong.