-
-
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 branch 'develop' into fn/replay-unwrapped-setTimeout-billy
- Loading branch information
Showing
84 changed files
with
1,099 additions
and
496 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,5 +6,5 @@ | |
| "strict": true, | ||
| "noEmit": true | ||
| }, | ||
| "include": ["*.ts"] | ||
| "include": ["src/*.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
File renamed without changes.
45 changes: 0 additions & 45 deletions
45
dev-packages/e2e-tests/test-applications/node-express/tests/transaction.test.ts
This file was deleted.
Oops, something went wrong.
155 changes: 155 additions & 0 deletions
155
dev-packages/e2e-tests/test-applications/node-express/tests/transactions.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,155 @@ | ||
| import { expect, test } from '@playwright/test'; | ||
| import { waitForTransaction } from '@sentry-internal/event-proxy-server'; | ||
| import axios, { AxiosError } from 'axios'; | ||
|
|
||
| const authToken = process.env.E2E_TEST_AUTH_TOKEN; | ||
| const sentryTestOrgSlug = process.env.E2E_TEST_SENTRY_ORG_SLUG; | ||
| const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT; | ||
| const EVENT_POLLING_TIMEOUT = 90_000; | ||
|
|
||
| test('Sends an API route transaction', async ({ baseURL }) => { | ||
| const pageloadTransactionEventPromise = waitForTransaction('node-express', transactionEvent => { | ||
| return ( | ||
| transactionEvent?.contexts?.trace?.op === 'http.server' && | ||
| transactionEvent?.transaction === 'GET /test-transaction' | ||
| ); | ||
| }); | ||
|
|
||
| await axios.get(`${baseURL}/test-transaction`); | ||
|
|
||
| const transactionEvent = await pageloadTransactionEventPromise; | ||
| const transactionEventId = transactionEvent.event_id; | ||
|
|
||
| expect(transactionEvent.contexts?.trace).toEqual({ | ||
| data: { | ||
| 'sentry.source': 'route', | ||
| 'sentry.origin': 'auto.http.otel.http', | ||
| 'sentry.op': 'http.server', | ||
| 'sentry.sample_rate': 1, | ||
| url: 'http://localhost:3030/test-transaction', | ||
| 'otel.kind': 'SERVER', | ||
| 'http.response.status_code': 200, | ||
| 'http.url': 'http://localhost:3030/test-transaction', | ||
| 'http.host': 'localhost:3030', | ||
| 'net.host.name': 'localhost', | ||
| 'http.method': 'GET', | ||
| 'http.scheme': 'http', | ||
| 'http.target': '/test-transaction', | ||
| 'http.user_agent': 'axios/1.6.7', | ||
| 'http.flavor': '1.1', | ||
| 'net.transport': 'ip_tcp', | ||
| 'net.host.ip': expect.any(String), | ||
| 'net.host.port': expect.any(Number), | ||
| 'net.peer.ip': expect.any(String), | ||
| 'net.peer.port': expect.any(Number), | ||
| 'http.status_code': 200, | ||
| 'http.status_text': 'OK', | ||
| 'http.route': '/test-transaction', | ||
| }, | ||
| op: 'http.server', | ||
| span_id: expect.any(String), | ||
| status: 'ok', | ||
| trace_id: expect.any(String), | ||
| origin: 'auto.http.otel.http', | ||
| }); | ||
|
|
||
| expect(transactionEvent).toEqual( | ||
| expect.objectContaining({ | ||
| transaction: 'GET /test-transaction', | ||
| type: 'transaction', | ||
| transaction_info: { | ||
| source: 'route', | ||
| }, | ||
| }), | ||
| ); | ||
|
|
||
| const spans = transactionEvent.spans || []; | ||
|
|
||
| expect(spans).toContainEqual({ | ||
| data: { | ||
| 'sentry.origin': 'auto.http.otel.express', | ||
| 'sentry.op': 'middleware.express', | ||
| 'http.route': '/', | ||
| 'express.name': 'query', | ||
| 'express.type': 'middleware', | ||
| 'otel.kind': 'INTERNAL', | ||
| }, | ||
| description: 'query', | ||
| op: 'middleware.express', | ||
| origin: 'auto.http.otel.express', | ||
| parent_span_id: expect.any(String), | ||
| span_id: expect.any(String), | ||
| start_timestamp: expect.any(Number), | ||
| status: 'ok', | ||
| timestamp: expect.any(Number), | ||
| trace_id: expect.any(String), | ||
| }); | ||
|
|
||
| expect(spans).toContainEqual({ | ||
| data: { | ||
| 'sentry.origin': 'auto.http.otel.express', | ||
| 'sentry.op': 'middleware.express', | ||
| 'http.route': '/', | ||
| 'express.name': 'expressInit', | ||
| 'express.type': 'middleware', | ||
| 'otel.kind': 'INTERNAL', | ||
| }, | ||
| description: 'expressInit', | ||
| op: 'middleware.express', | ||
| origin: 'auto.http.otel.express', | ||
| parent_span_id: expect.any(String), | ||
| span_id: expect.any(String), | ||
| start_timestamp: expect.any(Number), | ||
| status: 'ok', | ||
| timestamp: expect.any(Number), | ||
| trace_id: expect.any(String), | ||
| }); | ||
|
|
||
| expect(spans).toContainEqual({ | ||
| data: { | ||
| 'sentry.origin': 'auto.http.otel.express', | ||
| 'sentry.op': 'request_handler.express', | ||
| 'http.route': '/test-transaction', | ||
| 'express.name': '/test-transaction', | ||
| 'express.type': 'request_handler', | ||
| 'otel.kind': 'INTERNAL', | ||
| }, | ||
| description: '/test-transaction', | ||
| op: 'request_handler.express', | ||
| origin: 'auto.http.otel.express', | ||
| parent_span_id: expect.any(String), | ||
| span_id: expect.any(String), | ||
| start_timestamp: expect.any(Number), | ||
| status: 'ok', | ||
| timestamp: expect.any(Number), | ||
| trace_id: expect.any(String), | ||
| }); | ||
|
|
||
| await expect | ||
| .poll( | ||
| async () => { | ||
| try { | ||
| const response = await axios.get( | ||
| `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${transactionEventId}/`, | ||
| { headers: { Authorization: `Bearer ${authToken}` } }, | ||
| ); | ||
|
|
||
| return response.status; | ||
| } catch (e) { | ||
| if (e instanceof AxiosError && e.response) { | ||
| if (e.response.status !== 404) { | ||
| throw e; | ||
| } else { | ||
| return e.response.status; | ||
| } | ||
| } else { | ||
| throw e; | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| timeout: EVENT_POLLING_TIMEOUT, | ||
| }, | ||
| ) | ||
| .toBe(200); | ||
| }); |
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.