Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
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
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ jobs:
- name: Set up Deno
uses: denoland/setup-deno@v1.1.4
with:
deno-version: v1.38.5
deno-version: v1.x

@brc-ddbrc-ddJun 12, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsr wasn't supported on deno 1.38. deno.land/std/... won't receive non-critical updates and jsr is the recommended way

if needed we can lock it to some minor

re-running CI should pass I guess 👀

- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ tmp.js
packages/deno/build-types
packages/deno/build-test
packages/deno/lib.deno.d.ts
deno.lock

# gatsby
packages/gatsby/gatsby-node.d.ts
4 changes: 2 additions & 2 deletions packages/deno/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,8 @@
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
"test:unit": "deno test --allow-read --allow-run --allow-net",
"test:unit:update": "deno test --allow-read --allow-write --allow-run --allow-net -- --update",
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
},
"volta": {
Expand Down
3 changes: 3 additions & 0 deletions packages/deno/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export {
spanToJSON,
spanToTraceHeader,
spanToBaggageHeader,
spanIsSampled,
getDynamicSamplingContextFromSpan,
} from '@sentry/core';

export { DenoClient } from './client';
Expand All@@ -96,3 +98,4 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
export { contextLinesIntegration } from './integrations/contextlines';
export { denoCronIntegration } from './integrations/deno-cron';
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
export { denoServerIntegration } from './integrations/denoserver';
136 changes: 136 additions & 0 deletions packages/deno/src/integrations/denoserver.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
defineIntegration,
setHttpStatus,
startSpan,
withIsolationScope,
} from '@sentry/core';
import type { IntegrationFn, SpanAttributes } from '@sentry/types';
import { getSanitizedUrlString, parseUrl } from '@sentry/utils';

type RawHandler = (request: Request, info: Deno.ServeHandlerInfo) => Response | Promise<Response>;

const INTEGRATION_NAME = 'DenoServer';

const _denoServerIntegration = (() => {
return {
name: INTEGRATION_NAME,
setupOnce() {
instrumentDenoServe();
},
};
}) satisfies IntegrationFn;

/**
* Instruments `Deno.serve` to automatically create transactions and capture errors.
*
* Enabled by default in the Deno SDK.
*
* ```js
* Sentry.init({
* integrations: [
* Sentry.denoServerIntegration(),
* ],
* })
* ```
*/
export const denoServerIntegration = defineIntegration(_denoServerIntegration);

/**
* Instruments Deno.serve by patching it's options.
*/
export function instrumentDenoServe(): void {
Deno.serve = new Proxy(Deno.serve, {
apply(serveTarget, serveThisArg, serveArgs: unknown[]) {
const [arg1, arg2] = serveArgs;

if (typeof arg1 === 'function') {
serveArgs[0] = instrumentDenoServeOptions(arg1 as RawHandler);
} else if (typeof arg2 === 'function') {
serveArgs[1] = instrumentDenoServeOptions(arg2 as RawHandler);
} else if (arg1 && typeof arg1 === 'object' && 'handler' in arg1 && typeof arg1.handler === 'function') {
arg1.handler = instrumentDenoServeOptions(arg1.handler as RawHandler);
}

return serveTarget.apply(serveThisArg, serveArgs as Parameters<typeof Deno.serve>);
},
});
}

/**
* Instruments Deno.serve handler to automatically create spans and capture errors.
*/
function instrumentDenoServeOptions(handler: RawHandler): RawHandler {
return new Proxy(handler, {
apply(handlerTarget, handlerThisArg, handlerArgs: Parameters<RawHandler>) {
return withIsolationScope(isolationScope => {
isolationScope.clear();

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this line should be removed when #12450 (comment) is resolved


const request = handlerArgs[0];
if (request.method === 'OPTIONS' || request.method === 'HEAD') {
return handlerTarget.apply(handlerThisArg, handlerArgs);
}

const parsedUrl = parseUrl(request.url);
const attributes: SpanAttributes = {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.deno.serve',
'http.request.method': request.method || 'GET',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
};
if (parsedUrl.search) {
attributes['http.query'] = parsedUrl.search;
}

const url = getSanitizedUrlString(parsedUrl);

isolationScope.setSDKProcessingMetadata({
request: {
url,
method: request.method,
headers: Object.fromEntries(request.headers),
},
});

return continueTrace(
{ sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
() => {
return startSpan(
{
attributes,
op: 'http.server',
name: `${request.method} ${parsedUrl.path || '/'}`,
},
async span => {
try {
const response = await (handlerTarget.apply(handlerThisArg, handlerArgs) as ReturnType<RawHandler>);
if (response && response.status) {
setHttpStatus(span, response.status);
isolationScope.setContext('response', {
headers: Object.fromEntries(response.headers),
status_code: response.status,
});
}
return response;
} catch (e) {
captureException(e, {
mechanism: {
type: 'deno',
handled: false,
data: {
function: 'serve',
},
},
});
throw e;
}
},
);
},
);
});
},
});
}
4 changes: 4 additions & 0 deletions packages/deno/src/sdk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import {
functionToStringIntegration,
inboundFiltersIntegration,
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
import type { Integration, Options, StackParser } from '@sentry/types';
Expand All@@ -13,6 +14,7 @@ import { DenoClient } from './client';
import { breadcrumbsIntegration } from './integrations/breadcrumbs';
import { denoContextIntegration } from './integrations/context';
import { contextLinesIntegration } from './integrations/contextlines';
import { denoServerIntegration } from './integrations/denoserver';
import { globalHandlersIntegration } from './integrations/globalhandlers';
import { normalizePathsIntegration } from './integrations/normalizepaths';
import { makeFetchTransport } from './transports';
Expand All@@ -26,13 +28,15 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
inboundFiltersIntegration(),
functionToStringIntegration(),
linkedErrorsIntegration(),
requestDataIntegration(),
dedupeIntegration(),
// Deno Specific
breadcrumbsIntegration(),
denoContextIntegration(),
contextLinesIntegration(),
normalizePathsIntegration(),
globalHandlersIntegration(),
denoServerIntegration(),
];
}

Expand Down
12 changes: 10 additions & 2 deletions packages/deno/test/__snapshots__/mod.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
lineno: 46,
lineno: 23,
post_context: [
"",
" await delay(200);",
Expand All@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
lineno: 43,
lineno: 20,
post_context: [
" }",
"",
Expand DownExpand Up@@ -107,12 +107,14 @@ snapshot[`captureException 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -177,12 +179,14 @@ snapshot[`captureMessage 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -254,12 +258,14 @@ snapshot[`captureMessage twice 1`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand DownExpand Up@@ -338,12 +344,14 @@ snapshot[`captureMessage twice 2`] = `
"InboundFilters",
"FunctionToString",
"LinkedErrors",
"RequestData",
"Dedupe",
"Breadcrumbs",
"DenoContext",
"ContextLines",
"NormalizePaths",
"GlobalHandlers",
"DenoServer",
],
name: "sentry.javascript.deno",
packages: [
Expand Down
25 changes: 25 additions & 0 deletions packages/deno/test/client.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import type { sentryTypes } from '../build-test/index.js';
import { sentryUtils } from '../build-test/index.js';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';

export function getTestClient(
callback: (event?: sentryTypes.Event) => void,
integrations: sentryTypes.Integration[] = [],
): DenoClient {
const client = new DenoClient({
dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
debug: true,
integrations: [...getDefaultIntegrations({}), ...integrations],
stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
transport: makeTestTransport(envelope => {
callback(getNormalizedEvent(envelope));
}),
});

client.init();
getCurrentScope().setClient(client);

return client;
}
Loading