ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPeer264 merged 1 commit into from
Feb 18, 2026
Merged

ref(cloudflare): Move internal files and functions around #19369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
"SENTRY_DSN": "https://username@domain/123",
"SENTRY_ENVIRONMENT": "qa",
"SENTRY_TRACES_SAMPLE_RATE": "1.0",
"SENTRY_TUNNEL": "http://localhost:3031/"
"SENTRY_TUNNEL": "http://localhost:3031/",
},
"assets": {
"binding": "ASSETS",
"directory": "./dist"
}
"directory": "./dist",
},
}

155 changes: 5 additions & 150 deletions packages/cloudflare/src/durableobject.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
captureException,
flush,
getClient,
isThenable,
type Scope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
startSpan,
withIsolationScope,
withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
spanName?: string;
spanOp?: string;
options: CloudflareOptions;
context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
wrapperOptions: MethodWrapperOptions,
handler: T,
callback?: (...args: Parameters<T>) => void,
noMark?: true,
): T {
if (isInstrumented(handler)) {
return handler;
}

if (!noMark) {
markAsInstrumented(handler);
}

return new Proxy(handler, {
apply(target, thisArg, args: Parameters<T>) {
const currentClient = getClient();
// if a client is already set, use withScope, otherwise use withIsolationScope
const sentryWithScope = currentClient ? withScope : withIsolationScope;

const wrappedFunction = (scope: Scope): unknown => {
// In certain situations, the passed context can become undefined.
// For example, for Astro while prerendering pages at build time.
// see: https://github.com/getsentry/sentry-javascript/issues/13217
const context = wrapperOptions.context as ExecutionContext | undefined;

const waitUntil = context?.waitUntil?.bind?.(context);

const currentClient = scope.getClient();
if (!currentClient) {
const client = init({ ...wrapperOptions.options, ctx: context });
scope.setClient(client);
}

if (!wrapperOptions.spanName) {
try {
if (callback) {
callback(...args);
}
const result = Reflect.apply(target, thisArg, args);

if (isThenable(result)) {
return result.then(
(res: unknown) => {
waitUntil?.(flush(2000));
return res;
},
(e: unknown) => {
captureException(e, {
mechanism: {
type: 'auto.faas.cloudflare.durable_object',
handled: false,
},
});
waitUntil?.(flush(2000));
throw e;
},
);
} else {
waitUntil?.(flush(2000));
return result;
}
} catch (e) {
captureException(e, {
mechanism: {
type: 'auto.faas.cloudflare.durable_object',
handled: false,
},
});
waitUntil?.(flush(2000));
throw e;
}
}

const attributes = wrapperOptions.spanOp
? {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
}
: {};

return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
try {
const result = Reflect.apply(target, thisArg, args);

if (isThenable(result)) {
return result.then(
(res: unknown) => {
waitUntil?.(flush(2000));
return res;
},
(e: unknown) => {
captureException(e, {
mechanism: {
type: 'auto.faas.cloudflare.durable_object',
handled: false,
},
});
waitUntil?.(flush(2000));
throw e;
},
);
} else {
waitUntil?.(flush(2000));
return result;
}
} catch (e) {
captureException(e, {
mechanism: {
type: 'auto.faas.cloudflare.durable_object',
handled: false,
},
});
waitUntil?.(flush(2000));
throw e;
}
});
};

return sentryWithScope(wrappedFunction);
},
});
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
* Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
return new Proxy(DurableObjectClass, {
construct(target, [ctx, env]) {
setAsyncLocalStorageAsyncContextStrategy();
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);

const options = getFinalOptions(optionsCallback(env), env);

Expand Down
12 changes: 6 additions & 6 deletions packages/cloudflare/src/handler.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
* Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
handler.fetch = new Proxy(handler.fetch, {
apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
const [request, env, ctx] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[2] = context;

const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
handler.scheduled = new Proxy(handler.scheduled, {
apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
const [event, env, ctx] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[2] = context;

return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
handler.email = new Proxy(handler.email, {
apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
const [emailMessage, env, ctx] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[2] = context;

return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
handler.queue = new Proxy(handler.queue, {
apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
const [batch, env, ctx] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[2] = context;

return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
handler.tail = new Proxy(handler.tail, {
apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
const [, env, ctx] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[2] = context;

return withIsolationScope(async isolationScope => {
Expand Down
34 changes: 20 additions & 14 deletions ...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
* Creates a new copy of the given execution context, optionally overriding methods.
* Instruments an execution context or DurableObjectState with Sentry tracing.
*
* @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
* @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
* Creates a copy of the context that:
* - Allows overriding of methods (e.g., waitUntil)
*
* @param ctx - The execution context or DurableObjectState to instrument
* @returns An instrumented copy of the context
*/
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
if (!ctx) return ctx;

const overrides: OverridesStore<T> = new Map();
const contextPrototype = Object.getPrototypeOf(ctx);
const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
const instrumented = new Set<unknown>(['constructor']);
const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
if (instrumented.has(methodName)) return prevDescriptors;
if (typeof ctx[methodName] !== 'function') return prevDescriptors;
instrumented.add(methodName);
const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
return {
...prevDescriptors,
[methodName]: overridableDescriptor,
};
}, {});
const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
(prevDescriptors, methodName) => {
if (instrumented.has(methodName)) return prevDescriptors;
if (typeof ctx[methodName] !== 'function') return prevDescriptors;
instrumented.add(methodName);
const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
return {
...prevDescriptors,
[methodName]: overridableDescriptor,
};
},
{} as PropertyDescriptorMap,
);

return Object.create(ctx, descriptors);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/workflows.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
return new Proxy(WorkFlowClass, {
construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
const [ctx, env] = args;
const context = copyExecutionContext(ctx);
const context = instrumentContext(ctx);
args[0] = context;

const options = optionsCallback(env);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ref(cloudflare): Move internal files and functions around#19369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

JPeer264
merged 1 commit into

from

Feb 18, 2026
 Merged


ref(cloudflare): Move internal files and functions around
#19369
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 3 additions & 4 deletions
dev-packages/e2e-tests/test-applications/astro-5-cf-workers/wrangler.jsonc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,10 @@
 "SENTRY_DSN": "https://username@domain/123",
 "SENTRY_ENVIRONMENT": "qa",
 "SENTRY_TRACES_SAMPLE_RATE": "1.0",
 "SENTRY_TUNNEL": "http://localhost:3031/"
 "SENTRY_TUNNEL": "http://localhost:3031/",
 },
 "assets": {
 "binding": "ASSETS",
 "directory": "./dist"
 }
 "directory": "./dist",
 },
}


155 changes: 5 additions & 150 deletions
packages/cloudflare/src/durableobject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,159 +1,14 @@
/* eslint-disable @typescript-eslint/unbound-method */
import {
 captureException,
 flush,
 getClient,
 isThenable,
 type Scope,
 SEMANTIC_ATTRIBUTE_SENTRY_OP,
 SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
 startSpan,
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { captureException } from '@sentry/core';
import type { DurableObject } from 'cloudflare:workers';
import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { isInstrumented, markAsInstrumented } from './instrument';
import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';

type MethodWrapperOptions = {
 spanName?: string;
 spanOp?: string;
 options: CloudflareOptions;
 context: ExecutionContext | DurableObjectState;
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type UncheckedMethod = (...args: any[]) => any;
type OriginalMethod = UncheckedMethod;

function wrapMethodWithSentry<T extends OriginalMethod>(
 wrapperOptions: MethodWrapperOptions,
 handler: T,
 callback?: (...args: Parameters<T>) => void,
 noMark?: true,
): T {
 if (isInstrumented(handler)) {
 return handler;
 }

 if (!noMark) {
 markAsInstrumented(handler);
 }

 return new Proxy(handler, {
 apply(target, thisArg, args: Parameters<T>) {
 const currentClient = getClient();
 // if a client is already set, use withScope, otherwise use withIsolationScope
 const sentryWithScope = currentClient ? withScope : withIsolationScope;

 const wrappedFunction = (scope: Scope): unknown => {
 // In certain situations, the passed context can become undefined.
 // For example, for Astro while prerendering pages at build time.
 // see: https://github.com/getsentry/sentry-javascript/issues/13217
 const context = wrapperOptions.context as ExecutionContext | undefined;

 const waitUntil = context?.waitUntil?.bind?.(context);

 const currentClient = scope.getClient();
 if (!currentClient) {
 const client = init({ ...wrapperOptions.options, ctx: context });
 scope.setClient(client);
 }

 if (!wrapperOptions.spanName) {
 try {
 if (callback) {
 callback(...args);
 }
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 }

 const attributes = wrapperOptions.spanOp
 ? {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.durable_object',
 }
 : {};

 return startSpan({ name: wrapperOptions.spanName, attributes }, () => {
 try {
 const result = Reflect.apply(target, thisArg, args);

 if (isThenable(result)) {
 return result.then(
 (res: unknown) => {
 waitUntil?.(flush(2000));
 return res;
 },
 (e: unknown) => {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 },
 );
 } else {
 waitUntil?.(flush(2000));
 return result;
 }
 } catch (e) {
 captureException(e, {
 mechanism: {
 type: 'auto.faas.cloudflare.durable_object',
 handled: false,
 },
 });
 waitUntil?.(flush(2000));
 throw e;
 }
 });
 };

 return sentryWithScope(wrappedFunction);
 },
 });
}
import { instrumentContext } from './utils/instrumentContext';
import type { UncheckedMethod } from './wrapMethodWithSentry';
import { wrapMethodWithSentry } from './wrapMethodWithSentry';

/**
 * Instruments a Durable Object class to capture errors and performance data.
Expand DownExpand Up@@ -196,7 +51,7 @@ export function instrumentDurableObjectWithSentry<
 return new Proxy(DurableObjectClass, {
 construct(target, [ctx, env]) {
 setAsyncLocalStorageAsyncContextStrategy();
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);

 const options = getFinalOptions(optionsCallback(env), env);

Expand Down

12 changes: 6 additions & 6 deletions
packages/cloudflare/src/handler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ import { getFinalOptions } from './options';
import { wrapRequestHandler } from './request';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

/**
 * Wrapper for Cloudflare handlers.
Expand DownExpand Up@@ -46,7 +46,7 @@ export function withSentry<
 handler.fetch = new Proxy(handler.fetch, {
 apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
 const [request, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 const options = getFinalOptions(optionsCallback(env), env);
Expand DownExpand Up@@ -82,7 +82,7 @@ export function withSentry<
 handler.scheduled = new Proxy(handler.scheduled, {
 apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
 const [event, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -128,7 +128,7 @@ export function withSentry<
 handler.email = new Proxy(handler.email, {
 apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {
 const [emailMessage, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -172,7 +172,7 @@ export function withSentry<
 handler.queue = new Proxy(handler.queue, {
 apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {
 const [batch, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(isolationScope => {
Expand DownExpand Up@@ -224,7 +224,7 @@ export function withSentry<
 handler.tail = new Proxy(handler.tail, {
 apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {
 const [, env, ctx] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[2] = context;

 return withIsolationScope(async isolationScope => {
Expand Down

34 changes: 20 additions & 14 deletions
...udflare/src/utils/copyExecutionContext.ts → ...cloudflare/src/utils/instrumentContext.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,35 @@ type ContextType = ExecutionContext | DurableObjectState;
type OverridesStore<T extends ContextType> = Map<keyof T, (...args: unknown[]) => unknown>;

/**
 * Creates a new copy of the given execution context, optionally overriding methods.
 * Instruments an execution context or DurableObjectState with Sentry tracing.
 *
 * @param {ContextType|void} ctx - The execution context to be copied. Can be of type `ContextType` or `void`.
 * @return {ContextType|void} A new execution context with the same properties and overridden methods if applicable.
 * Creates a copy of the context that:
 * - Allows overriding of methods (e.g., waitUntil)
 *
 * @param ctx - The execution context or DurableObjectState to instrument
 * @returns An instrumented copy of the context
 */
export function copyExecutionContext<T extends ContextType>(ctx: T): T {
export function instrumentContext<T extends ContextType>(ctx: T): T {
 if (!ctx) return ctx;

 const overrides: OverridesStore<T> = new Map();
 const contextPrototype = Object.getPrototypeOf(ctx);
 const prototypeMethodNames = Object.getOwnPropertyNames(contextPrototype) as unknown as (keyof T)[];
 const ownPropertyNames = Object.getOwnPropertyNames(ctx) as unknown as (keyof T)[];
 const instrumented = new Set<unknown>(['constructor']);
 const descriptors = [...ownPropertyNames, ...prototypeMethodNames].reduce((prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 }, {});
 const descriptors: PropertyDescriptorMap = [...ownPropertyNames, ...prototypeMethodNames].reduce(
 (prevDescriptors, methodName) => {
 if (instrumented.has(methodName)) return prevDescriptors;
 if (typeof ctx[methodName] !== 'function') return prevDescriptors;
 instrumented.add(methodName);
 const overridableDescriptor = makeOverridableDescriptor(overrides, ctx, methodName);
 return {
 ...prevDescriptors,
 [methodName]: overridableDescriptor,
 };
 },
 {} as PropertyDescriptorMap,
 );

 return Object.create(ctx, descriptors);
}
Expand Down

4 changes: 2 additions & 2 deletions
packages/cloudflare/src/workflows.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { setAsyncLocalStorageAsyncContextStrategy } from './async';
import type { CloudflareOptions } from './client';
import { addCloudResourceContext } from './scope-utils';
import { init } from './sdk';
import { copyExecutionContext } from './utils/copyExecutionContext';
import { instrumentContext } from './utils/instrumentContext';

const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;

Expand DownExpand Up@@ -158,7 +158,7 @@ export function instrumentWorkflowWithSentry<
 return new Proxy(WorkFlowClass, {
 construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {
 const [ctx, env] = args;
 const context = copyExecutionContext(ctx);
 const context = instrumentContext(ctx);
 args[0] = context;

 const options = optionsCallback(env);
Expand Down
Loading
Loading