Skip to content

Commit f63d467

Browse files
committed
test(e2e/aws-lambda-layer): Rename test app and improve lambda function
1 parent 30f0c55 commit f63d467

File tree

10 files changed

+30
-24
lines changed

10 files changed

+30
-24
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ jobs:
993993
[
994994
'angular-17',
995995
'angular-18',
996-
'aws-lambda-layer',
996+
'aws-lambda-layer-cjs',
997997
'cloudflare-astro',
998998
'node-express',
999999
'create-react-app',
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const Sentry = require('@sentry/aws-serverless');
2+
3+
const http = require('http');
4+
5+
async function handle() {
6+
await Sentry.startSpan({ name: 'aws-lambda-layer-test-txn', op: 'test' }, async () => {
7+
await new Promise(resolve => {
8+
http.get('http://example.com', res => {
9+
res.on('data', d => {
10+
process.stdout.write(d);
11+
});
12+
13+
res.on('end', () => {
14+
resolve();
15+
});
16+
});
17+
});
18+
});
19+
}
20+
21+
module.exports = { handle };

dev-packages/e2e-tests/test-applications/aws-lambda-layer/src/run.js renamed to dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/src/run.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ child_process.execSync('node ./src/run-lambda.js', {
44
stdio: 'inherit',
55
env: {
66
...process.env,
7-
LAMBDA_TASK_ROOT: '.',
8-
_HANDLER: 'handle',
7+
LAMBDA_TASK_ROOT: '/var/task',
8+
_HANDLER: 'src/lambda-function.handle',
99

1010
NODE_OPTIONS: '--require @sentry/aws-serverless/dist/awslambda-auto',
1111
SENTRY_DSN: 'http://public@localhost:3031/1337',

dev-packages/e2e-tests/test-applications/aws-lambda-layer/start-event-proxy.mjs renamed to dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/start-event-proxy.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import { startEventProxyServer } from '@sentry-internal/test-utils';
22

33
startEventProxyServer({
44
port: 3031,
5-
proxyServerName: 'aws-serverless-lambda-layer',
5+
proxyServerName: 'aws-serverless-lambda-layer-cjs',
66
forwardToSentry: false,
77
});

dev-packages/e2e-tests/test-applications/aws-lambda-layer/tests/basic.test.ts renamed to dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/tests/basic.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ import { expect, test } from '@playwright/test';
33
import { waitForTransaction } from '@sentry-internal/test-utils';
44

55
test('Lambda layer SDK bundle sends events', async ({ request }) => {
6-
const transactionEventPromise = waitForTransaction('aws-serverless-lambda-layer', transactionEvent => {
6+
const transactionEventPromise = waitForTransaction('aws-serverless-lambda-layer-cjs', transactionEvent => {
77
return transactionEvent?.transaction === 'aws-lambda-layer-test-txn';
88
});
99

10+
// Waiting for 1s here because attaching the listener for events in `waitForTransaction` is not synchronous
11+
// Since in this test, we don't start a browser via playwright, we don't have the usual delays (page.goto, etc)
12+
// which are usually enough for us to never have noticed this race condition before.
13+
// This is a workaround but probably sufficient as long as we only experience it in this test.
1014
await new Promise<void>(resolve =>
1115
setTimeout(() => {
1216
resolve();

dev-packages/e2e-tests/test-applications/aws-lambda-layer/src/lambda-function.js

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

0 commit comments

Comments
 (0)