Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/dev-packages/node-core-integration-tests/ @getsentry/team-javascript-sdks-server
/dev-packages/cloudflare-integration-tests/ @getsentry/team-javascript-sdks-server
/dev-packages/bun-integration-tests/ @getsentry/team-javascript-sdks-server
/dev-packages/deno-integration-tests/ @getsentry/team-javascript-sdks-server

# Framework integration packages
/packages/angular/ @getsentry/team-javascript-sdks-framework
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ jobs:
changed_bun_integration:
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
'@sentry-internal/bun-integration-tests') }}
changed_deno_integration:
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
'@sentry-internal/deno-integration-tests') }}
changed_browser_integration:
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
'@sentry-internal/browser-integration-tests') }}
Expand Down Expand Up @@ -966,6 +969,36 @@ jobs:
working-directory: dev-packages/bun-integration-tests
run: yarn test

job_deno_integration_tests:
name: Deno Integration Tests
needs: [job_get_metadata, job_build]
if: needs.job_build.outputs.changed_deno_integration == 'true' || github.event_name != 'pull_request'
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v6
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v6
with:
node-version-file: 'package.json'
- name: Set up Deno
uses: denoland/setup-deno@v2.0.4
with:
deno-version: 'v2.8.0'
- name: Restore caches
uses: ./.github/actions/restore-cache
with:
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Build @sentry/deno
working-directory: packages/deno
run: yarn build
- name: Run integration tests
working-directory: dev-packages/deno-integration-tests
run: yarn test

job_build_tarballs:
name: Build tarballs
# We want to run this if:
Expand Down Expand Up @@ -1266,6 +1299,7 @@ jobs:
job_cloudflare_integration_tests,
job_bundler_plugin_integration_tests,
job_bun_integration_tests,
job_deno_integration_tests,
job_browser_playwright_tests,
job_browser_loader_tests,
job_e2e_tests,
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
dev-packages/deno-integration-tests/lib.deno.d.ts
deno.lock

# gatsby
Expand Down
25 changes: 25 additions & 0 deletions dev-packages/deno-integration-tests/.oxlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema": "../../node_modules/oxlint/configuration_schema.json",
"extends": ["../.oxlintrc.json"],
"env": {
"node": true
},
"overrides": [
{
"files": ["suites/**/*.ts", "suites/**/*.mjs"],
"globals": {
"Deno": "readonly"
},
"rules": {
"typescript/ban-ts-comment": [
"error",
{
"ts-ignore": "allow-with-description",
"ts-expect-error": true
}
],
"import/first": "off"
}
}
]
}
26 changes: 26 additions & 0 deletions dev-packages/deno-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
Comment thread
isaacs marked this conversation as resolved.
"name": "@sentry-internal/deno-integration-tests",
"version": "10.63.0",
"license": "MIT",
"engines": {
"node": ">=18"
},
"private": true,
"scripts": {
"deno-types": "node ./scripts/download-deno-types.mjs",
"install:deno": "node ./scripts/install-deno.mjs",
"lint": "OXLINT_TSGOLINT_DANGEROUSLY_SUPPRESS_PROGRAM_DIAGNOSTICS=true oxlint . --type-aware",
"lint:fix": "OXLINT_TSGOLINT_DANGEROUSLY_SUPPRESS_PROGRAM_DIAGNOSTICS=true oxlint . --fix --type-aware",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check"
Comment thread
isaacs marked this conversation as resolved.
},
"dependencies": {
"@sentry/core": "10.63.0",
"@sentry/deno": "10.63.0",
"mysql": "^2.18.1",
"pg": "^8.22.0"
},
"volta": {
"extends": "../../package.json"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { existsSync, writeFileSync } from 'fs';
import { download } from './download.mjs';

if (!existsSync('lib.deno.d.ts')) {
const code = await download('https://github.com/denoland/deno/releases/download/v2.8.0/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
Comment thread
isaacs marked this conversation as resolved.
Dismissed
Comment thread
isaacs marked this conversation as resolved.
Dismissed
}
16 changes: 16 additions & 0 deletions dev-packages/deno-integration-tests/scripts/download.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/** Download a url to a string */
export async function download(url) {
try {
// `fetch` only rejects on network errors, so check the status explicitly — otherwise an error body
// (e.g. a 404 HTML page) would be treated as success and fed to `execSync`/written to disk.
const res = await fetch(url);
if (!res.ok) {
throw new Error(`HTTP ${res.status} ${res.statusText}`);
}
return await res.text();
} catch (e) {
// eslint-disable-next-line no-console
console.error('Failed to download', url, e);
process.exit(1);
}
}
26 changes: 26 additions & 0 deletions dev-packages/deno-integration-tests/scripts/install-deno.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { execSync } from 'child_process';

import { download } from './download.mjs';

try {
execSync('deno --version', { stdio: 'inherit' });
} catch {
// eslint-disable-next-line no-console
console.error('Deno is not installed. Installing...');
if (process.platform === 'win32') {
// TODO
// eslint-disable-next-line no-console
console.error('Please install Deno manually: https://docs.deno.com/runtime/manual/getting_started/installation');
process.exit(1);
} else {
const script = await download('https://deno.land/x/install/install.sh');
Comment thread
isaacs marked this conversation as resolved.

try {
execSync(script, { stdio: 'inherit' });
Comment thread
isaacs marked this conversation as resolved.
Dismissed
Comment thread
isaacs marked this conversation as resolved.
} catch (e) {
// eslint-disable-next-line no-console
console.error('Failed to install Deno', e);
process.exit(1);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Spawned by orchestrion-mysql.test.ts via `deno run`.
// Spawned by test.ts via `deno run`.
//
// Importing `@sentry/deno/import` FIRST registers the orchestrion module hook,
// so the subsequent `mysql` import is transformed to publish to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import { tracingChannel } from 'node:diagnostics_channel';
import type { TransactionEvent } from '@sentry/core';
import type { DenoClient } from '@sentry/deno';
import { getCurrentScope, getGlobalScope, getIsolationScope, init, startSpan } from '@sentry/deno';
import { assert } from 'https://deno.land/std@0.212.0/assert/assert.ts';
import { assertEquals } from 'https://deno.land/std@0.212.0/assert/assert_equals.ts';
import { assertExists } from 'https://deno.land/std@0.212.0/assert/assert_exists.ts';
import type { DenoClient } from '../build/esm/index.js';
import { getCurrentScope, getGlobalScope, getIsolationScope, init, startSpan } from '../build/esm/index.js';

function resetGlobals(): void {
getCurrentScope().clear();
Expand Down Expand Up @@ -65,10 +65,11 @@ Deno.test('denoMysqlIntegration: included in default integrations (Deno 2.8.0+)'
// import inside the entry graph in Deno 2.8.0 through 2.8.2.
// TODO: revisit a `--import` or `--preload` approach once Deno 2.8.3 ships.
Deno.test('@sentry/deno/import: transforms mysql so it publishes the orchestrion channel', async () => {
const scenario = new URL('./orchestrion-mysql/scenario.mjs', import.meta.url);
const scenario = new URL('./scenario.mjs', import.meta.url);
Comment thread
isaacs marked this conversation as resolved.

// packages/deno — where node_modules resolves
const cwd = new URL('../', import.meta.url);
// The package root — where `node_modules` (and thus `@sentry/deno` / `mysql`)
// resolves for the spawned `deno run`.
const cwd = new URL('../../', import.meta.url);

const command = new Deno.Command('deno', {
args: ['run', '--allow-all', scenario.pathname],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Spawned by orchestrion-postgres.test.ts via `deno run`.
// Spawned by test.ts via `deno run`.
//
// Importing `@sentry/deno/import` FIRST registers the orchestrion module hook,
// so the subsequent `pg` import is transformed to publish to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import { tracingChannel } from 'node:diagnostics_channel';
import type { TransactionEvent } from '@sentry/core';
import type { DenoClient } from '@sentry/deno';
import { getCurrentScope, getGlobalScope, getIsolationScope, init, startSpan } from '@sentry/deno';
import { assert } from 'https://deno.land/std@0.212.0/assert/assert.ts';
import { assertEquals } from 'https://deno.land/std@0.212.0/assert/assert_equals.ts';
import { assertExists } from 'https://deno.land/std@0.212.0/assert/assert_exists.ts';
import type { DenoClient } from '../build/esm/index.js';
import { getCurrentScope, getGlobalScope, getIsolationScope, init, startSpan } from '../build/esm/index.js';

function resetGlobals(): void {
getCurrentScope().clear();
Expand All @@ -15,7 +15,7 @@ function resetGlobals(): void {
getGlobalScope().clear();
}

/** See `deno-redis.test.ts` same sink shape, deduped for clarity. */
/** See deno-redis.test.ts same sink shape, deduped for clarity. */
function transactionSink(): {
beforeSendTransaction: (event: TransactionEvent) => null;
waitFor: (predicate: (event: TransactionEvent) => boolean) => Promise<TransactionEvent>;
Expand Down Expand Up @@ -65,10 +65,11 @@ Deno.test('denoPostgresIntegration: included in default integrations (Deno 2.8.0
// import inside the entry graph in Deno 2.8.0 through 2.8.2.
// TODO: revisit a `--import` or `--preload` approach once Deno 2.8.3 ships.
Deno.test('@sentry/deno/import: transforms pg so it publishes the orchestrion channel', async () => {
const scenario = new URL('./orchestrion-postgres/scenario.mjs', import.meta.url);
const scenario = new URL('./scenario.mjs', import.meta.url);

// packages/deno, where node_modules resolves
const cwd = new URL('../', import.meta.url);
// The package root — where `node_modules` (and thus `@sentry/deno` / `pg`)
// resolves for the spawned `deno run`.
const cwd = new URL('../../', import.meta.url);

const command = new Deno.Command('deno', {
args: ['run', '--allow-all', scenario.pathname],
Expand All @@ -94,13 +95,12 @@ Deno.test('@sentry/deno/import: transforms pg so it publishes the orchestrion ch
assert(line.includes('"runtime":true'), `expected runtime marker, got: ${line}`);
});

// Exercises the SDK path e2e: `init()` wires `denoPostgresIntegration`
// (which installs the AsyncLocalStorage context strategy and subscribes to
// the channel), and we drive the `orchestrion:pg:query` channel manually,
// the same events the orchestrion transform publishes around
// `client.query()`, so no live database is needed. Asserting a nested `db`
// span proves the subscriber, the emitted attributes, AND the
// context-strategy wiring all work.
// Exercises the SDK path end-to-end: `init()` wires `denoPostgresIntegration`
// (which installs the AsyncLocalStorage context strategy and subscribes to the
// channel), and we drive the `orchestrion:pg:query` channel manually — the
// same events the orchestrion transform publishes around `client.query()` —
// so no live database is needed. Asserting a nested `db` span proves the
// subscriber, the emitted attributes, AND the context-strategy wiring all work.
Deno.test('denoPostgresIntegration: orchestrion:pg:query channel produces a nested db span', async () => {
resetGlobals();
const sink = transactionSink();
Expand All @@ -112,17 +112,17 @@ Deno.test('denoPostgresIntegration: orchestrion:pg:query channel produces a nest

const channel = tracingChannel('orchestrion:pg:query');

// The shared context object orchestrion reuses across the lifecycle events
//
// `arguments[0]` is the SQL; `self.connectionParameters` is pg's resolved
// connection config.
// The shared context object orchestrion reuses across the lifecycle events.
// `arguments[0]` is the SQL; `self.connectionParameters` is pg's resolved connection config.
const ctx = {
arguments: ['SELECT 1 AS solution'],
self: { connectionParameters: { host: '127.0.0.1', port: 5432, database: 'mydb', user: 'root' } },
};

// Callback-success order published by orchestrion's transform:
// start -> end -> asyncStart -> asyncEnd (the span closes on asyncEnd).
// start → end → asyncStart → asyncEnd (the span closes on asyncEnd).
// `start`/`asyncStart` go through `runStores` (not bare `publish`), exactly as the transform's
// `wrapCallback` does — that's what activates the store the subscriber binds, so the span opens.
startSpan({ name: 'parent', op: 'test' }, () => {
channel.start.runStores(ctx, () => {
channel.end.publish(ctx);
Expand Down
8 changes: 8 additions & 0 deletions dev-packages/deno-integration-tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.json",
"include": ["suites/**/*"],
"compilerOptions": {
"lib": ["esnext"],
"target": "esnext"
}
}
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"dedupe-deps:check": "yarn-deduplicate yarn.lock --list --fail",
"dedupe-deps:fix": "yarn-deduplicate yarn.lock",
"postpublish": "nx run-many -t postpublish --parallel=1",
"test": "nx run-many -t test --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test": "nx run-many -t test --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,deno-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test:scripts": "vitest run scripts/*.test.ts",
"test:unit": "nx run-many -t test:unit --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test:unit": "nx run-many -t test:unit --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,deno-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test:update-snapshots": "nx run-many -t test:update-snapshots",
"test:pr": "nx affected -t test --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test:pr": "nx affected -t test --exclude \"@sentry-internal/{browser-integration-tests,bun-integration-tests,deno-integration-tests,e2e-tests,integration-shims,node-integration-tests,node-core-integration-tests,cloudflare-integration-tests,bundler-plugin-integration-tests}\"",
"test:pr:browser": "UNIT_TEST_ENV=browser ts-node ./scripts/ci-unit-tests.ts --affected",
"test:pr:node": "UNIT_TEST_ENV=node ts-node ./scripts/ci-unit-tests.ts --affected",
"test:ci:browser": "UNIT_TEST_ENV=browser ts-node ./scripts/ci-unit-tests.ts",
Expand Down Expand Up @@ -105,6 +105,7 @@
"dev-packages/e2e-tests",
"dev-packages/node-integration-tests",
"dev-packages/bun-integration-tests",
"dev-packages/deno-integration-tests",
Comment thread
cursor[bot] marked this conversation as resolved.
"dev-packages/cloudflare-integration-tests",
"dev-packages/node-core-integration-tests",
"dev-packages/test-utils",
Expand Down
4 changes: 0 additions & 4 deletions packages/deno/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
"@sentry/core": "10.63.0",
"@sentry/server-utils": "10.63.0"
},
"devDependencies": {
Comment thread
isaacs marked this conversation as resolved.
"mysql": "^2.18.1",
"pg": "8.16.0"
},
"scripts": {
"deno-types": "node ./scripts/download-deno-types.mjs",
"build": "run-s build:transpile build:types",
Expand Down
Loading
Loading