Skip to content

Commit 4eae009

Browse files
author
cod1k
committed
Add Durable Object support and e2e tests for Cloudflare Workers
This commit introduces Durable Object support in the Cloudflare Workers example to enhance functionality and error tracking via Sentry. It removes outdated tests, updates dependencies, configures Playwright for e2e testing, and refines build/test scripts for CI/CD use cases.
1 parent f342341 commit 4eae009

File tree

12 files changed

+193
-144
lines changed

12 files changed

+193
-144
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.wrangler

dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,37 @@
44
"private": true,
55
"scripts": {
66
"deploy": "wrangler deploy",
7-
"dev": "wrangler dev --var E2E_TEST_DSN=$E2E_TEST_DSN",
8-
"build": "wrangler deploy --dry-run --var E2E_TEST_DSN=$E2E_TEST_DSN",
9-
"test": "vitest",
7+
"dev": "wrangler dev --var \"E2E_TEST_DSN:$E2E_TEST_DSN\" --log-level=$(test $CI && echo 'none' || echo 'log')",
8+
"build": "wrangler deploy --dry-run",
9+
"test": "vitest --run",
1010
"typecheck": "tsc --noEmit",
11+
"clean:state": "rimraf .wrangler",
1112
"cf-typegen": "wrangler types",
1213
"test:build": "pnpm install && pnpm build",
13-
"test:assert": "pnpm typecheck"
14+
"test:assert": "pnpm test:dev && pnpm test:prod",
15+
"test:prod": "pnpm clean:state && TEST_ENV=production playwright test",
16+
"test:dev": "pnpm clean:state && TEST_ENV=development playwright test"
1417
},
1518
"dependencies": {
1619
"@sentry/cloudflare": "latest || *"
1720
},
1821
"devDependencies": {
19-
"@cloudflare/vitest-pool-workers": "^0.4.5",
22+
"@playwright/test": "~1.50.0",
23+
"@cloudflare/vitest-pool-workers": "^0.8.19",
2024
"@cloudflare/workers-types": "^4.20240725.0",
25+
"@sentry-internal/test-utils": "link:../../../test-utils",
2126
"typescript": "^5.5.2",
22-
"vitest": "1.6.1",
23-
"wrangler": "4.22.0"
27+
"vitest": "~3.2.0",
28+
"wrangler": "^4.23.0"
2429
},
2530
"volta": {
2631
"extends": "../../package.json"
2732
},
33+
"pnpm": {
34+
"overrides": {
35+
"strip-literal": "~2.0.0"
36+
}
37+
},
2838
"sentryTest": {
2939
"optional": true
3040
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { getPlaywrightConfig } from '@sentry-internal/test-utils';
2+
const testEnv = process.env.TEST_ENV;
3+
4+
if (!testEnv) {
5+
throw new Error('No test env defined');
6+
}
7+
8+
const config = getPlaywrightConfig(
9+
{
10+
startCommand: 'pnpm dev',
11+
port: 8787,
12+
},
13+
{
14+
// This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
15+
workers: '100%',
16+
},
17+
);
18+
19+
export default config;

dev-packages/e2e-tests/test-applications/cloudflare-workers/src/index.ts

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,75 @@
1111
* Learn more at https://developers.cloudflare.com/workers/
1212
*/
1313
import * as Sentry from '@sentry/cloudflare';
14+
import { DurableObject } from "cloudflare:workers";
15+
16+
class MyDurableObjectBase extends DurableObject<Env> {
17+
async throwException(): Promise<string> {
18+
throw new Error("Should be recorded in Sentry.")
19+
}
20+
21+
async fetch(request: Request){
22+
const {pathname} = new URL(request.url)
23+
if(pathname === '/throwException'){
24+
await this.throwException()
25+
}
26+
return new Response('DO is fine')
27+
}
28+
}
29+
30+
export const MyDurableObject = Sentry.instrumentDurableObjectWithSentry(
31+
(env: Env) => ({
32+
dsn: env.E2E_TEST_DSN,
33+
environment: 'qa', // dynamic sampling bias to keep transactions
34+
tunnel: `http://localhost:3031/`, // proxy server
35+
tracesSampleRate: 1.0,
36+
sendDefaultPii: true,
37+
transportOptions: {
38+
// We are doing a lot of events at once in this test
39+
bufferSize: 1000,
40+
},
41+
}),
42+
MyDurableObjectBase,
43+
);
1444

1545
export default Sentry.withSentry(
1646
(env: Env) => ({
1747
dsn: env.E2E_TEST_DSN,
18-
// Set tracesSampleRate to 1.0 to capture 100% of spans for tracing.
48+
environment: 'qa', // dynamic sampling bias to keep transactions
49+
tunnel: `http://localhost:3031/`, // proxy server
1950
tracesSampleRate: 1.0,
51+
sendDefaultPii: true,
52+
transportOptions: {
53+
// We are doing a lot of events at once in this test
54+
bufferSize: 1000,
55+
},
2056
}),
2157
{
22-
async fetch(request, env, ctx) {
58+
async fetch(request, env) {
59+
const url = new URL(request.url);
60+
switch (url.pathname) {
61+
case '/rpc/throwException':
62+
{
63+
const id = env.MY_DURABLE_OBJECT.idFromName('foo');
64+
const stub = env.MY_DURABLE_OBJECT.get(id) as DurableObjectStub<MyDurableObjectBase>;
65+
try {
66+
await stub.throwException();
67+
} catch (e) {
68+
//We will catch this to be sure not to log inside withSentry
69+
return new Response(null, { status: 500 });
70+
}
71+
}
72+
break;
73+
case '/throwException':
74+
throw new Error('To be recorded in Sentry.');
75+
default:
76+
if (url.pathname.startsWith('/pass-to-object/')) {
77+
const id = env.MY_DURABLE_OBJECT.idFromName('foo');
78+
const stub = env.MY_DURABLE_OBJECT.get(id) as DurableObjectStub<MyDurableObjectBase>;
79+
url.pathname = url.pathname.replace('/pass-to-object/', '');
80+
return stub.fetch(new Request(url, request));
81+
}
82+
}
2383
return new Response('Hello World!');
2484
},
2585
} satisfies ExportedHandler<Env>,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import {startEventProxyServer} from '@sentry-internal/test-utils'
2+
3+
startEventProxyServer({
4+
port: 3031,
5+
proxyServerName: 'cloudflare-workers',
6+
})

dev-packages/e2e-tests/test-applications/cloudflare-workers/test/index.spec.ts

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

dev-packages/e2e-tests/test-applications/cloudflare-workers/test/tsconfig.json

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { expect, test } from '@playwright/test';
2+
import { waitForError } from '@sentry-internal/test-utils';
3+
4+
test('Index page', async ({ page }) => {
5+
const result = await page.goto('http://localhost:8787/');
6+
expect(result?.status?.()).toBe(200);
7+
await expect(page.textContent('body > pre')).resolves.toBe('Hello World!');
8+
})
9+
10+
test('worker\'s withSentry', async () => {
11+
const eventWaiter = waitForError('cloudflare-workers', (event) => {
12+
return event.exception?.values?.[0]?.mechanism?.type === 'cloudflare';
13+
});
14+
const response = await fetch('http://localhost:8787/throwException');
15+
expect(response.status).toBe(500);
16+
const event = await eventWaiter;
17+
expect(event.exception?.values?.[0]?.value).toBe('To be recorded in Sentry.');
18+
})
19+
20+
test('RPC method which throws an exception to be logged to sentry', async () => {
21+
const eventWaiter = waitForError('cloudflare-workers', (event) => {
22+
return event.exception?.values?.[0]?.mechanism?.type === 'cloudflare_durableobject';
23+
});
24+
const response = await fetch('http://localhost:8787/rpc/throwException');
25+
expect(response.status).toBe(500);
26+
const event = await eventWaiter;
27+
expect(event.exception?.values?.[0]?.value).toBe('Should be recorded in Sentry.');
28+
});
29+
test('Request processed by DurableObject\'s fetch is recorded', async () => {
30+
const eventWaiter = waitForError('cloudflare-workers', (event) => {
31+
return event.exception?.values?.[0]?.mechanism?.type === 'cloudflare_durableobject';
32+
});
33+
const response = await fetch('http://localhost:8787/pass-to-object/throwException');
34+
expect(response.status).toBe(500);
35+
const event = await eventWaiter;
36+
expect(event.exception?.values?.[0]?.value).toBe('Should be recorded in Sentry.');
37+
});
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"types": ["@cloudflare/vitest-pool-workers"]
5+
},
6+
"include": ["./**/*.ts", "../worker-configuration.d.ts"],
7+
"exclude": []
8+
}

dev-packages/e2e-tests/test-applications/cloudflare-workers/tsconfig.json

Lines changed: 36 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,103 +2,43 @@
22
"compilerOptions": {
33
/* Visit https://aka.ms/tsconfig.json to read more about this file */
44

5-
/* Projects */
6-
// "incremental": true, /* Enable incremental compilation */
7-
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
8-
// "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */
9-
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */
10-
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
11-
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
12-
13-
/* Language and Environment */
14-
"target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
15-
"lib": ["es2021"] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
16-
"jsx": "react-jsx" /* Specify what JSX code is generated. */,
17-
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
18-
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
19-
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
20-
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
21-
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
22-
// "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
23-
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
24-
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
25-
26-
/* Modules */
27-
"module": "es2022" /* Specify what module code is generated. */,
28-
// "rootDir": "./", /* Specify the root folder within your source files. */
29-
"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
30-
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
31-
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
32-
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
33-
// "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */
5+
/* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
6+
"target": "es2021",
7+
/* Specify a set of bundled library declaration files that describe the target runtime environment. */
8+
"lib": ["es2021"],
9+
/* Specify what JSX code is generated. */
10+
"jsx": "react-jsx",
11+
12+
/* Specify what module code is generated. */
13+
"module": "es2022",
14+
/* Specify how TypeScript looks up a file from a given module specifier. */
15+
"moduleResolution": "Bundler",
16+
/* Enable importing .json files */
17+
"resolveJsonModule": true,
18+
19+
/* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
20+
"allowJs": true,
21+
/* Enable error reporting in type-checked JavaScript files. */
22+
"checkJs": false,
23+
24+
/* Disable emitting files from a compilation. */
25+
"noEmit": true,
26+
27+
/* Ensure that each file can be safely transpiled without relying on other imports. */
28+
"isolatedModules": true,
29+
/* Allow 'import x from y' when a module doesn't have a default export. */
30+
"allowSyntheticDefaultImports": true,
31+
/* Ensure that casing is correct in imports. */
32+
"forceConsistentCasingInFileNames": true,
33+
34+
/* Enable all strict type-checking options. */
35+
"strict": true,
36+
37+
/* Skip type checking all .d.ts files. */
38+
"skipLibCheck": true,
3439
"types": [
35-
"@cloudflare/workers-types/2023-07-01"
36-
] /* Specify type package names to be included without being referenced in a source file. */,
37-
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
38-
"resolveJsonModule": true /* Enable importing .json files */,
39-
// "noResolve": true, /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
40-
41-
/* JavaScript Support */
42-
"allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
43-
"checkJs": false /* Enable error reporting in type-checked JavaScript files. */,
44-
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
45-
46-
/* Emit */
47-
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
48-
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
49-
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
50-
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
51-
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
52-
// "outDir": "./", /* Specify an output folder for all emitted files. */
53-
// "removeComments": true, /* Disable emitting comments. */
54-
"noEmit": true /* Disable emitting files from a compilation. */,
55-
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
56-
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
57-
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
58-
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
59-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
60-
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
61-
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
62-
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
63-
// "newLine": "crlf", /* Set the newline character for emitting files. */
64-
// "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
65-
// "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */
66-
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
67-
// "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */
68-
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
69-
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
70-
71-
/* Interop Constraints */
72-
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
73-
"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
74-
// "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
75-
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
76-
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
77-
78-
/* Type Checking */
79-
"strict": true /* Enable all strict type-checking options. */,
80-
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */
81-
// "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
82-
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
83-
// "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
84-
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
85-
// "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
86-
// "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
87-
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
88-
// "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
89-
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
90-
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
91-
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
92-
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
93-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
94-
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
95-
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
96-
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
97-
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
98-
99-
/* Completeness */
100-
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
101-
"skipLibCheck": true /* Skip type checking all .d.ts files. */
40+
"./worker-configuration.d.ts"
41+
]
10242
},
10343
"exclude": ["test"],
10444
"include": ["worker-configuration.d.ts", "src/**/*.ts"]

0 commit comments

Comments
 (0)