test(e2e): Port cloudflare-orchestrion-mysql to span streaming#23860

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
+41 −36
Merged

test(e2e): Port cloudflare-orchestrion-mysql to span streaming #23860

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-orchestrion-mysql/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
(env: Env) => ({
traceLifecycle: 'static',
dsn: env.E2E_TEST_DSN,
environment: 'qa',
tunnel: 'http://localhost:3031/',
Expand Down
76 changes: 41 additions & 35 deletions dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
// Each incoming request gets a Sentry http.server transaction; the mysql
// queries run inside it, so their db spans attach to it. The
// Each incoming request gets a Sentry http.server segment span; the mysql
// queries run inside it, so their db spans share its trace. The
// `orchestrion:mysql:query` channel was injected into the bundled `mysql`
// package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
// subscribes to it once it detects the injection.
const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
return (
event?.contexts?.trace?.op === 'http.server' &&
(event.request?.url ?? '').includes('/test-mysql') &&
(event.spans?.some(span => span.op === 'db') ?? false)
);
});
const spansPromise = collectStreamedSpans(
'cloudflare-orchestrion-mysql',
spans =>
spans.some(
span =>
getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
) && spans.some(span => getSpanOp(span) === 'db'),
);

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

const transaction = await transactionPromise;
const dbSpans = transaction.spans!.filter(span => span.op === 'db');
const spans = await spansPromise;
const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
expect(firstQuery).toBeDefined();
expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
expect(firstQuery!.data?.['server.port']).toBe(3306);
expect(firstQuery!.data?.['db.user']).toBe('root');
// With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
expect(firstQuery!.name).toBe('SELECT');
expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
// The second query runs inside the first query's callback — i.e. across
// mysql's async socket-callback dispatch. Both spans appearing on the SAME
// http.server transaction proves the channel subscriber restored the parent
// span across that async boundary (otherwise the nested query would start its
// own trace and never join this transaction).
const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
return (
event?.contexts?.trace?.op === 'http.server' &&
(event.request?.url ?? '').includes('/test-mysql') &&
(event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
);
});
// mysql's async socket-callback dispatch. Both spans sharing the SAME
// http.server segment's trace proves the channel subscriber restored the
// parent span across that async boundary (otherwise the nested query would
// start its own trace and never join this one).
const spansPromise = collectStreamedSpans(
'cloudflare-orchestrion-mysql',
spans =>
spans.some(
span =>
getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
);

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

const transaction = await transactionPromise;
const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
expect(descriptions).toContain('SELECT 1 + 1 AS solution');
expect(descriptions).toContain('SELECT NOW()');
const spans = await spansPromise;
const queryTexts = spans
.filter(span => getSpanOp(span) === 'db')
.map(span => span.attributes['db.query.text']?.value);
expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
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-orchestrion-mysql to span streaming#23860

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

+41

−36

 Merged


test(e2e): Port cloudflare-orchestrion-mysql to span streaming
#23860
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-orchestrion-mysql/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ interface MysqlModule {

export default Sentry.withSentry(
 (env: Env) => ({
 traceLifecycle: 'static',
 dsn: env.E2E_TEST_DSN,
 environment: 'qa',
 tunnel: 'http://localhost:3031/',
Expand Down

76 changes: 41 additions & 35 deletions
dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/tests/mysql.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';

test('a real mysql query emits a db span with orchestrion-channel attributes', async ({ baseURL }) => {
 // Each incoming request gets a Sentry http.server transaction; the mysql
 // queries run inside it, so their db spans attach to it. The
 // Each incoming request gets a Sentry http.server segment span; the mysql
 // queries run inside it, so their db spans share its trace. The
 // `orchestrion:mysql:query` channel was injected into the bundled `mysql`
 // package at build time by `@sentry/cloudflare/vite`, and the Cloudflare SDK
 // subscribes to it once it detects the injection.
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.some(span => span.op === 'db') ?? false)
 );
 });
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.some(span => getSpanOp(span) === 'db'),
 );

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

 const transaction = await transactionPromise;
 const dbSpans = transaction.spans!.filter(span => span.op === 'db');
 const spans = await spansPromise;
 const dbSpans = spans.filter(span => getSpanOp(span) === 'db');

 const firstQuery = dbSpans.find(span => span.description === 'SELECT 1 + 1 AS solution');
 const firstQuery = dbSpans.find(span => span.attributes['db.query.text']?.value === 'SELECT 1 + 1 AS solution');
 expect(firstQuery).toBeDefined();
 expect(firstQuery!.data?.['sentry.origin']).toBe('auto.db.mysql');
 expect(firstQuery!.data?.['db.system.name']).toBe('mysql');
 expect(firstQuery!.data?.['db.query.text']).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.data?.['server.address']).toBe('127.0.0.1');
 expect(firstQuery!.data?.['server.port']).toBe(3306);
 expect(firstQuery!.data?.['db.user']).toBe('root');
 // With span streaming the span name is the low-cardinality query summary; the statement stays in `db.query.text`.
 expect(firstQuery!.name).toBe('SELECT');
 expect(firstQuery!.attributes['sentry.origin']?.value).toBe('auto.db.mysql');
 expect(firstQuery!.attributes['db.system.name']?.value).toBe('mysql');
 expect(firstQuery!.attributes['db.query.text']?.value).toBe('SELECT 1 + 1 AS solution');
 expect(firstQuery!.attributes['server.address']?.value).toBe('127.0.0.1');
 expect(firstQuery!.attributes['server.port']?.value).toBe(3306);
 expect(firstQuery!.attributes['db.user']?.value).toBe('root');
});

test('a nested query lands on the same transaction (async context restored)', async ({ baseURL }) => {
test('a nested query lands on the same trace (async context restored)', async ({ baseURL }) => {
 // The second query runs inside the first query's callback — i.e. across
 // mysql's async socket-callback dispatch. Both spans appearing on the SAME
 // http.server transaction proves the channel subscriber restored the parent
 // span across that async boundary (otherwise the nested query would start its
 // own trace and never join this transaction).
 const transactionPromise = waitForTransaction('cloudflare-orchestrion-mysql', event => {
 return (
 event?.contexts?.trace?.op === 'http.server' &&
 (event.request?.url ?? '').includes('/test-mysql') &&
 (event.spans?.filter(span => span.op === 'db').length ?? 0) >= 2
 );
 });
 // mysql's async socket-callback dispatch. Both spans sharing the SAME
 // http.server segment's trace proves the channel subscriber restored the
 // parent span across that async boundary (otherwise the nested query would
 // start its own trace and never join this one).
 const spansPromise = collectStreamedSpans(
 'cloudflare-orchestrion-mysql',
 spans =>
 spans.some(
 span =>
 getSpanOp(span) === 'http.server' && span.is_segment && span.attributes['url.path']?.value === '/test-mysql',
 ) && spans.filter(span => getSpanOp(span) === 'db').length >= 2,
 );

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

 const transaction = await transactionPromise;
 const descriptions = transaction.spans!.filter(span => span.op === 'db').map(span => span.description);
 expect(descriptions).toContain('SELECT 1 + 1 AS solution');
 expect(descriptions).toContain('SELECT NOW()');
 const spans = await spansPromise;
 const queryTexts = spans
 .filter(span => getSpanOp(span) === 'db')
 .map(span => span.attributes['db.query.text']?.value);
 expect(queryTexts).toContain('SELECT 1 + 1 AS solution');
 expect(queryTexts).toContain('SELECT NOW()');
});
Loading