test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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
Sep 2, 2026
+46 −36
Merged

test(e2e): Port cloudflare-autoinstrument to span streaming #23861

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
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
traceLifecycle: 'static' as const,
dsn: env.E2E_TEST_DSN,
environment: 'qa',
tunnel: 'http://localhost:3031/',
Expand Down
81 changes: 46 additions & 35 deletions ...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
});
const spanPromise = waitForStreamedSpan(
'cloudflare-autoinstrument',
span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
);

const res = await fetch(`${baseURL}/plain-do`);
expect(res.status).toBe(200);
await expect(res.json()).resolves.toEqual({ durableObject: true });

const transaction = await transactionPromise;
const span = await spanPromise;

expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
// `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
// proves the plugin sourced its options callback from that file rather than
// falling back to reading configuration off `env`.
expect(transaction.environment).toBe('qa');
expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
const instance = `${binding}-instance`;

const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
return (
event.transaction === 'webSocketMessage' &&
(event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
);
});
// The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
// streamed in a later envelope, so collect until both have arrived.
const spansPromise = collectStreamedSpans(
'cloudflare-autoinstrument',
spans =>
spans.some(
span =>
getSpanOp(span) === 'rpc' &&
span.name === 'greet' &&
Comment on lines +60 to +64

@sentrysentryBotSep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM

Suggested Fix

Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.

Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
);

// Each agent's greet() returns a string naming its class, so the reply
// identifies exactly which class handled the call.
const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
expect(reply).toBe(`Hello, World! (from ${agentClass})`);

const transaction = await transactionPromise;
const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
const spans = await spansPromise;
const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.
span =>
getSpanOp(span) === 'rpc' &&
span.name === 'greet' &&
String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
)!;

expect(rpcSpan).toEqual(
expect.objectContaining({
op: 'rpc',
description: 'greet',
origin: 'auto.faas.cloudflare.agents',
data: expect.objectContaining({
// Read back off the instance at runtime (`_ParentClass.name`), so it
// confirms the wrapper landed on the user's real class. Matched loosely
// because the transform renames the class it wraps to
// `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
'gen_ai.agent.name': expect.stringContaining(agentClass),
}),
}),
);
expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
// Read back off the instance at runtime (`_ParentClass.name`), so it
// confirms the wrapper landed on the user's real class. Matched loosely
// because the transform renames the class it wraps to
// `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
});
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
});
const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
spans.some(
span =>
getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
),
);

const res = await fetch(`${baseURL}/plain-do`);
expect(res.status).toBe(200);

const transaction = await transactionPromise;
const spans = await spansPromise;

// A plain Durable Object must NOT pick up agent instrumentation: detection has
// to discriminate, not blanket-upgrade every `durable_objects` binding.
const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
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
test(e2e): Port cloudflare-autoinstrument to span streaming#23861

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

Sep 2, 2026

+46

−36

 Merged


test(e2e): Port cloudflare-autoinstrument to span streaming
#23861
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


1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/src/instrument.server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
// the worker entry named in wrangler's `main`) and imports its default export as
// the options callback for every wrapper it injects.
export default (env: Env) => ({
 traceLifecycle: 'static' as const,
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

81 changes: 46 additions & 35 deletions
...ckages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
import { callRpc } from './agent-socket';

// The worker entry (`src/index.ts`) contains no Sentry calls at all — every
// wrapper below was injected by the Vite auto-instrument plugin at build time.
// Any transaction arriving here therefore proves the injection happened.
// Any span arriving here therefore proves the injection happened.
//
// With span streaming, URL-sourced `http.server` spans are named by method only, so the
// `/plain-do` request segment is identified by its `url.path` attribute.

test('wraps the default export with withSentry (options from instrument.server.ts)', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spanPromise = waitForStreamedSpan(
 'cloudflare-autoinstrument',
 span => getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);
 await expect(res.json()).resolves.toEqual({ durableObject: true });

 const transaction = await transactionPromise;
 const span = await spanPromise;

 expect(transaction.contexts?.trace?.origin).toBe('auto.http.cloudflare');
 expect(span.attributes['sentry.origin']?.value).toBe('auto.http.cloudflare');
 // `environment: 'qa'` is only set in `instrument.server.ts`, so seeing it here
 // proves the plugin sourced its options callback from that file rather than
 // falling back to reading configuration off `env`.
 expect(transaction.environment).toBe('qa');
 expect(span.attributes['sentry.environment']?.value).toBe('qa');
});

// Each of these three classes is registered in wrangler.jsonc exactly like the
Expand DownExpand Up@@ -49,50 +53,57 @@ for (const { title, binding, agentClass } of [
 test(`applies agent instrumentation to ${title}`, async ({ baseURL }) => {
 const instance = `${binding}-instance`;

 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return (
 event.transaction === 'webSocketMessage' &&
 (event.spans ?? []).some(span => span.op === 'rpc' && span.description === 'greet')
 );
 });
 // The rpc span is a child of the `webSocketMessage` segment span, which ends after it and is
 // streamed in a later envelope, so collect until both have arrived.
 const spansPromise = collectStreamedSpans(
 'cloudflare-autoinstrument',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&

Comment on lines

+60
 to 
+64

@sentrysentryBotSep 2, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Bug: The waitForStreamedSpan test utility lacks trace isolation, which can cause race conditions and flaky results when tests are run in parallel.
Severity: MEDIUM
Suggested Fix
Modify waitForStreamedSpan to implement trace isolation. It should group spans by trace_id before evaluating them, similar to how collectStreamedSpans is implemented. This will ensure that the function only resolves with a span that belongs to the same trace as the action that triggered it, preventing cross-test contamination during parallel execution.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location:
dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts#L60-L64
Potential issue: The `waitForStreamedSpan` test utility function lacks trace isolation.
It filters incoming spans by a timestamp but not by `trace_id`. When tests are run in
parallel, as configured with `workers: '100%'`, a race condition can occur. If two tests
concurrently make requests that generate similar spans, the test calling
`waitForStreamedSpan` may incorrectly capture and validate a span generated by the other
test. This can lead to flaky tests that pass or fail based on timing and not because
their own specific action was correctly instrumented.

 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 ) && spans.some(span => span.is_segment && span.name === 'webSocketMessage'),
 );

 // Each agent's greet() returns a string naming its class, so the reply
 // identifies exactly which class handled the call.
 const reply = await callRpc(baseURL!, { binding, instance, method: 'greet', args: ['World'] });
 expect(reply).toBe(`Hello, World! (from ${agentClass})`);

 const transaction = await transactionPromise;
 const rpcSpan = (transaction.spans ?? []).find(span => span.op === 'rpc' && span.description === 'greet');
 const spans = await spansPromise;
 const rpcSpan = spans.find(
Comment thread
sentry[bot] marked this conversation as resolved.

 span =>
 getSpanOp(span) === 'rpc' &&
 span.name === 'greet' &&
 String(span.attributes['gen_ai.agent.name']?.value ?? '').includes(agentClass),
 )!;

 expect(rpcSpan).toEqual(
 expect.objectContaining({
 op: 'rpc',
 description: 'greet',
 origin: 'auto.faas.cloudflare.agents',
 data: expect.objectContaining({
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 'gen_ai.agent.name': expect.stringContaining(agentClass),
 }),
 }),
 );
 expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
 expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
 // Read back off the instance at runtime (`_ParentClass.name`), so it
 // confirms the wrapper landed on the user's real class. Matched loosely
 // because the transform renames the class it wraps to
 // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
 expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
 });
}

test('applies plain Durable Object instrumentation to a non-Agent class', async ({ baseURL }) => {
 const transactionPromise = waitForTransaction('cloudflare-autoinstrument', event => {
 return event.contexts?.trace?.op === 'http.server' && (event.request?.url ?? '').includes('/plain-do');
 });
 const spansPromise = collectStreamedSpans('cloudflare-autoinstrument', spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/plain-do',
 ),
 );

 const res = await fetch(`${baseURL}/plain-do`);
 expect(res.status).toBe(200);

 const transaction = await transactionPromise;
 const spans = await spansPromise;

 // A plain Durable Object must NOT pick up agent instrumentation: detection has
 // to discriminate, not blanket-upgrade every `durable_objects` binding.
 const agentSpans = (transaction.spans ?? []).filter(span => span.origin === 'auto.faas.cloudflare.agents');
 const agentSpans = spans.filter(span => span.attributes['sentry.origin']?.value === 'auto.faas.cloudflare.agents');
 expect(agentSpans).toEqual([]);
});
Loading