Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
20,109 changes: 12,929 additions & 7,180 deletions packages/deno/lib.deno.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
"lint:es-compatibility": "es-check es2022 ./build/esm/*.js --module",
"install:deno": "node ./scripts/install-deno.mjs",
"test": "run-s install:deno deno-types test:unit",
"test:unit": "deno test --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check",
"test:unit:update": "deno test --allow-net --allow-read --allow-run --allow-env --no-check --allow-write -- --update",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/scripts/download-deno-types.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,6 @@ 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.1.5/lib.deno.d.ts');
const code = await download('https://github.com/denoland/deno/releases/download/v2.6.6/lib.deno.d.ts');
writeFileSync('lib.deno.d.ts', code);
}
80 changes: 80 additions & 0 deletions packages/deno/src/async.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
// Need to use node: prefix for deno compatibility
import { AsyncLocalStorage } from 'node:async_hooks';
import type { Scope } from '@sentry/core';
import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';

/**
* Sets the async context strategy to use AsyncLocalStorage.
*
* @internal Only exported to be used in higher-level Sentry packages
* @hidden Only exported to be used in higher-level Sentry packages
*/
export function setAsyncLocalStorageAsyncContextStrategy(): void {
const asyncStorage = new AsyncLocalStorage<{
scope: Scope;
isolationScope: Scope;
}>();

function getScopes(): { scope: Scope; isolationScope: Scope } {
const scopes = asyncStorage.getStore();

if (scopes) {
return scopes;
}

// fallback behavior:
// if, for whatever reason, we can't find scopes on the context here, we have to fix this somehow
return {
scope: getDefaultCurrentScope(),
isolationScope: getDefaultIsolationScope(),
};
}

function withScope<T>(callback: (scope: Scope) => T): T {
const scope = getScopes().scope.clone();
const isolationScope = getScopes().isolationScope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withSetScope<T>(scope: Scope, callback: (scope: Scope) => T): T {
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(scope);
});
}

function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
const isolationScope = getScopes().isolationScope.clone();
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

function withSetIsolationScope<T>(isolationScope: Scope, callback: (isolationScope: Scope) => T): T {
const scope = getScopes().scope;
return asyncStorage.run({ scope, isolationScope }, () => {
return callback(isolationScope);
});
}

// In contrast to the browser, we can rely on async context isolation here
function suppressTracing<T>(callback: () => T): T {
return withScope(scope => {
scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
return callback();
});
}

setAsyncContextStrategy({
suppressTracing,
withScope,
withSetScope,
withIsolationScope,
withSetIsolationScope,
getCurrentScope: () => getScopes().scope,
getIsolationScope: () => getScopes().isolationScope,
});
}
2 changes: 1 addition & 1 deletion packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ export {
export { DenoClient } from './client';

export { getDefaultIntegrations, init } from './sdk';

export { denoServeIntegration } from './integrations/deno-serve';
export { denoContextIntegration } from './integrations/context';
export { globalHandlersIntegration } from './integrations/globalhandlers';
export { normalizePathsIntegration } from './integrations/normalizepaths';
Expand Down
69 changes: 69 additions & 0 deletions packages/deno/src/integrations/deno-serve.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { setAsyncLocalStorageAsyncContextStrategy } from '../async';
import type { RequestHandlerWrapperOptions } from '../wrap-deno-request-handler';
import { wrapDenoRequestHandler } from '../wrap-deno-request-handler';

const INTEGRATION_NAME = 'DenoServe';

export type ServeParams =
// [(Request) => Response]
| [Deno.ServeHandler<Deno.NetAddr>]
// [{ options }, (Request) => Response]
| [Deno.ServeUnixOptions, Deno.ServeHandler<Deno.UnixAddr>]
| [Deno.ServeVsockOptions, Deno.ServeHandler<Deno.VsockAddr>]
| [Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem), Deno.ServeHandler<Deno.NetAddr>]
// [{ handler: (Request) => Response }]
| [Deno.ServeUnixOptions & Deno.ServeInit<Deno.UnixAddr>]
| [Deno.ServeVsockOptions & Deno.ServeInit<Deno.VsockAddr>]
| [(Deno.ServeTcpOptions | (Deno.ServeTcpOptions & Deno.TlsCertifiedKeyPem)) & Deno.ServeInit<Deno.NetAddr>];
Comment thread
isaacs marked this conversation as resolved.

const isSimpleHandler = (p: ServeParams): p is [Deno.ServeHandler<Deno.Addr>] => typeof p[0] === 'function';

const isServeOptWithFunction = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr>, Deno.ServeHandler<Deno.Addr>] =>
p.length >= 2 && typeof p[1] === 'function' && !!p[0] && typeof p[0] === 'object';

const isServeInitOptions = (p: ServeParams): p is [Deno.ServeOptions<Deno.Addr> & Deno.ServeInit<Deno.Addr>] =>
typeof p[0] === 'object' &&
!!p[0] &&
!isServeOptWithFunction(p) &&
'handler' in p[0] &&
typeof p[0].handler === 'function';

const applyHandlerWrap = <A extends Deno.Addr>(
handler: (request: Request, info: Deno.ServeHandlerInfo<A>) => Response | Promise<Response>,
serveOptions?: Deno.ServeOptions,
): Deno.ServeHandler =>
((request, info) =>
wrapDenoRequestHandler<A>(
{
request,
info,
serveOptions,
} as RequestHandlerWrapperOptions<A>,
() => handler(request, info as Deno.ServeHandlerInfo<A>),
)) as Deno.ServeHandler;

const _denoServeIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
setAsyncLocalStorageAsyncContextStrategy();
Deno.serve = new Proxy(Deno.serve, {
apply(target, thisArg, args: ServeParams) {
if (isSimpleHandler(args)) {
args[0] = applyHandlerWrap(args[0]);
} else if (isServeOptWithFunction(args)) {
args[1] = applyHandlerWrap(args[1], args[0]);
} else if (isServeInitOptions(args)) {
args[0].handler = applyHandlerWrap(args[0].handler, args[0]);
}
// if none of those matched, it'll crash, most likely.
return target.apply(thisArg, args);
},
});
},
};
}) satisfies IntegrationFn;

export const denoServeIntegration = defineIntegration(_denoServeIntegration);
Comment thread
isaacs marked this conversation as resolved.
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,14 @@ import {
initAndBind,
linkedErrorsIntegration,
nodeStackLineParser,
requestDataIntegration,
stackParserFromStackParserOptions,
} from '@sentry/core';
import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServeIntegration } from './integrations/deno-serve';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
Expand All@@ -28,12 +30,14 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
// TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration(),
requestDataIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
denoServeIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion packages/deno/src/transports/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ export function makeFetchTransport(options: BaseTransportOptions): Transport {
consoleSandbox(() => {
// eslint-disable-next-line no-console
console.warn(`Sentry SDK requires 'net' permission to send events.
Run with '--allow-net=${url.host}' to grant the requires permissions.`);
Run with '--allow-net=${url.host}' to grant the required permissions.`);
});
}
})
Expand Down
104 changes: 104 additions & 0 deletions packages/deno/src/utils/streaming.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
import type { Span } from '@sentry/core';

export type StreamingGuess = {
isStreaming: boolean;
};

/**
* Classifies a Response as streaming or non-streaming.
*
* Heuristics:
* - No body → not streaming
* - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
* - text/plain without Content-Length → streaming (some AI APIs)
* - Otherwise → not streaming (conservative default, including HTML/SSR)
*
* We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
* or SSR streams that may not have data ready immediately.
*/
export function classifyResponseStreaming(res: Response): StreamingGuess {
if (!res.body) {
return { isStreaming: false };
}

const contentType = res.headers.get('content-type') ?? '';
const contentLength = res.headers.get('content-length');

// Streaming: Known streaming content types
// - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
// - application/x-ndjson, application/ndjson: Newline-delimited JSON
// - application/stream+json: JSON streaming
// - text/plain (without Content-Length): Some AI APIs use this for streaming text
if (
/^text\/event-stream\b/i.test(contentType) ||
/^application\/(x-)?ndjson\b/i.test(contentType) ||
/^application\/stream\+json\b/i.test(contentType) ||
(/^text\/plain\b/i.test(contentType) && !contentLength)
) {
return { isStreaming: true };
}

// Default: treat as non-streaming
return { isStreaming: false };
}

/**
* Tee a stream, and end the provided span when the stream ends.
* Returns the other side of the tee, which can be used to send the
* response to a client.
*/
export async function streamResponse(span: Span, res: Response): Promise<Response> {
const classification = classifyResponseStreaming(res);

// not streaming, just end the span and return the response
if (!classification.isStreaming || !res.body) {
span.end();
return res;
}

// Streaming response detected - monitor consumption to keep span alive
try {
return new Response(
monitorStream(res.body, () => span.end()),
{
status: res.status,
statusText: res.statusText,
headers: res.headers,
},
);
} catch (e) {
// tee() failed - handle without streaming
span.end();
return res;
}
}

/**
* zero-copy monitoring of stream progress.
*/
function monitorStream(
stream: ReadableStream<Uint8Array<ArrayBufferLike>>,
onDone: () => void,
): ReadableStream<Uint8Array<ArrayBufferLike>> {
const reader = stream.getReader();
reader.closed.finally(() => onDone());
return new ReadableStream({
async start(controller) {
let result: ReadableStreamReadResult<Uint8Array<ArrayBufferLike>>;
do {
result = await reader.read();
if (result.value) {
try {
controller.enqueue(result.value);
} catch (er) {
controller.error(er);
reader.releaseLock();
return;
}
}
} while (!result.done);
controller.close();
Comment thread
isaacs marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
reader.releaseLock();
},
});
Comment thread
isaacs marked this conversation as resolved.
}
Loading
Loading