ref(node): Streamline tedious instrumentation#21598

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
nicohrubec merged 1 commit into from
Jun 17, 2026
Merged

ref(node): Streamline tedious instrumentation #21598

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
113 changes: 84 additions & 29 deletions dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
options: {
port: 1433,
encrypt: false,
rowCollectionOnRequestCompletion: true,
},
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
executeStatement('SELECT 1 + 1 AS solution', () => {
executeStatement('SELECT GETDATE()', () => {
span.end();
connection.close();
function connect() {
return new Promise((resolve, reject) => {
const connection = new Connection(config);
connection.on('connect', err => (err ? reject(err) : resolve(connection)));
if (connection.state !== connection.STATE.CONNECTING) {
connection.connect();
}
});
}

function query(connection, sql, method = 'execSql') {
return new Promise((resolve, reject) => {
const request = new Request(sql, err => (err ? reject(err) : resolve()));
connection[method](request);
});
}

function callProcedure(connection) {
return new Promise((resolve, reject) => {
const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
request.addParameter('inputVal', TYPES.VarChar, 'hello world');
request.addOutputParameter('outputCount', TYPES.Int);
connection.callProcedure(request);
});
}

function prepare(connection) {
return new Promise((resolve, reject) => {
const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
if (err) reject(err);
});
request.addParameter('val1', TYPES.Int);
request.addParameter('val2', TYPES.Int);
request.on('prepared', () => resolve(request));
connection.prepare(request);
});
}

function executeStatement(query, callback) {
const request = new Request(query, err => {
if (err) {
throw err;
}
callback();
function execute(connection, request) {
return new Promise((resolve, reject) => {
request.on('error', reject);
request.on('requestCompleted', () => resolve());
connection.execute(request, { val1: 1, val2: 2 });
});
}

connection.execSql(request);
function bulkLoad(connection) {
return new Promise((resolve, reject) => {
const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
request.addColumn('c1', TYPES.Int, { nullable: true });
request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
});
}

connection.connect(err => {
if (err) {
throw err;
}
async function run() {
const connection = await connect();

Sentry.startSpanManual(
{
op: 'transaction',
name: 'Test Transaction',
},
span => {
// span must be ended manually after all queries
executeAllStatements(span);
},
);
});
await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
await query(connection, 'SELECT 1 + 1 AS solution');
await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

await query(connection, 'select !').catch(() => {});

await query(
connection,
`CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
);
await callProcedure(connection);

await query(
connection,
`if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
);
const prepared = await prepare(connection);
await execute(connection, prepared);

await query(
connection,
`if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
);
await bulkLoad(connection);
});

connection.close();
}

run();
52 changes: 26 additions & 26 deletions dev-packages/node-integration-tests/suites/tracing/tedious/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {

@nicohrubecnicohrubecJun 17, 2026•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky

describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
afterAll(() => {
cleanupChildProcesses();
});

const dbSpan = (overrides: Record<string, unknown>) =>
expect.objectContaining({
op: 'db',
origin: 'auto.db.otel.tedious',
data: expect.objectContaining({
'sentry.origin': 'auto.db.otel.tedious',
'sentry.op': 'db',
'db.system': 'mssql',
'db.name': 'master',
'db.user': 'sa',
'net.peer.name': '127.0.0.1',
'net.peer.port': 1433,
}),
...overrides,
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
dbSpan({ description: 'select !', status: 'internal_error' }),
dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
expect.objectContaining({
description: 'SELECT GETDATE()',
data: expect.objectContaining({
'sentry.origin': 'auto.db.otel.tedious',
'sentry.op': 'db',
'db.name': 'master',
'db.statement': 'SELECT GETDATE()',
'db.system': 'mssql',
'db.user': 'sa',
'net.peer.name': '127.0.0.1',
'net.peer.port': 1433,
}),
status: 'ok',
}),
expect.objectContaining({
description: 'SELECT 1 + 1 AS solution',
data: expect.objectContaining({
'sentry.origin': 'auto.db.otel.tedious',
'sentry.op': 'db',
'db.name': 'master',
'db.statement': 'SELECT 1 + 1 AS solution',
'db.system': 'mssql',
'db.user': 'sa',
'net.peer.name': '127.0.0.1',
'net.peer.port': 1433,
}),
description: 'execBulkLoad test_bulk master',
op: 'db',
origin: 'auto.db.otel.tedious',
status: 'ok',
data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
}),
]),
};
Expand Down
35 changes: 3 additions & 32 deletions packages/node/src/integrations/tracing/tedious/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
'callProcedure',
'execSql',
'execSqlBatch',
'execBulkLoad',
'prepare',
'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

return {
name: INTEGRATION_NAME,
setupOnce() {
const instrumentation = instrumentTedious();
instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
},

setup(client) {
instrumentationWrappedCallback?.(() =>
client.on('spanStart', span => {
const { description, data } = spanToJSON(span);
// Tedius integration always set a span name and `db.system` attribute to `mssql`.
if (!description || data['db.system'] !== 'mssql') {
return;
}

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading

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

Skip to content
ref(node): Streamline tedious instrumentation#21598

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

nicohrubec
merged 1 commit into

from

Jun 17, 2026
 Merged


ref(node): Streamline tedious instrumentation
#21598
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


113 changes: 84 additions & 29 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as Sentry from '@sentry/node';
import { Connection, Request } from 'tedious';
import { Connection, Request, TYPES } from 'tedious';

const config = {
 server: '127.0.0.1',
Expand All@@ -13,44 +13,99 @@ const config = {
 options: {
 port: 1433,
 encrypt: false,
 rowCollectionOnRequestCompletion: true,
 },
};

const connection = new Connection(config);
const PROCEDURE_NAME = '[dbo].[test_proced]';
const PREPARED_TABLE = '[dbo].[test_prepared]';
const BULK_TABLE = 'test_bulk';

function executeAllStatements(span) {
 executeStatement('SELECT 1 + 1 AS solution', () => {
 executeStatement('SELECT GETDATE()', () => {
 span.end();
 connection.close();
function connect() {
 return new Promise((resolve, reject) => {
 const connection = new Connection(config);
 connection.on('connect', err => (err ? reject(err) : resolve(connection)));
 if (connection.state !== connection.STATE.CONNECTING) {
 connection.connect();
 }
 });
}

function query(connection, sql, method = 'execSql') {
 return new Promise((resolve, reject) => {
 const request = new Request(sql, err => (err ? reject(err) : resolve()));
 connection[method](request);
 });
}

function callProcedure(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(PROCEDURE_NAME, err => (err ? reject(err) : resolve()));
 request.addParameter('inputVal', TYPES.VarChar, 'hello world');
 request.addOutputParameter('outputCount', TYPES.Int);
 connection.callProcedure(request);
 });
}

function prepare(connection) {
 return new Promise((resolve, reject) => {
 const request = new Request(`INSERT INTO ${PREPARED_TABLE} VALUES (@val1, @val2)`, err => {
 if (err) reject(err);
 });
 request.addParameter('val1', TYPES.Int);
 request.addParameter('val2', TYPES.Int);
 request.on('prepared', () => resolve(request));
 connection.prepare(request);
 });
}

function executeStatement(query, callback) {
 const request = new Request(query, err => {
 if (err) {
 throw err;
 }
 callback();
function execute(connection, request) {
 return new Promise((resolve, reject) => {
 request.on('error', reject);
 request.on('requestCompleted', () => resolve());
 connection.execute(request, { val1: 1, val2: 2 });
 });
}

 connection.execSql(request);
function bulkLoad(connection) {
 return new Promise((resolve, reject) => {
 const request = connection.newBulkLoad(BULK_TABLE, { keepNulls: true }, err => (err ? reject(err) : resolve()));
 request.addColumn('c1', TYPES.Int, { nullable: true });
 request.addColumn('c2', TYPES.NVarChar, { length: 50, nullable: true });
 connection.execBulkLoad(request, [{ c1: 1 }, { c1: 2, c2: 'hello' }]);
 });
}

connection.connect(err => {
 if (err) {
 throw err;
 }
async function run() {
 const connection = await connect();

 Sentry.startSpanManual(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 span => {
 // span must be ended manually after all queries
 executeAllStatements(span);
 },
 );
});
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await query(connection, 'SELECT 1 + 1 AS solution');
 await query(connection, 'SELECT 42; SELECT 42;', 'execSqlBatch');

 await query(connection, 'select !').catch(() => {});

 await query(
 connection,
 `CREATE OR ALTER PROCEDURE ${PROCEDURE_NAME} @inputVal varchar(30), @outputCount int OUTPUT AS set @outputCount = LEN(@inputVal);`,
 );
 await callProcedure(connection);

 await query(
 connection,
 `if object_id('${PREPARED_TABLE}') is null CREATE TABLE ${PREPARED_TABLE} (c1 int, c2 int)`,
 );
 const prepared = await prepare(connection);
 await execute(connection, prepared);

 await query(
 connection,
 `if object_id('[dbo].[${BULK_TABLE}]') is null CREATE TABLE [dbo].[${BULK_TABLE}] (c1 int, c2 varchar(30))`,
 );
 await bulkLoad(connection);
 });

 connection.close();
}

run();

52 changes: 26 additions & 26 deletions
dev-packages/node-integration-tests/suites/tracing/tedious/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe.skip('tedious auto instrumentation', { timeout: 75_000 }, () => {
@nicohrubecnicohrubecJun 17, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

this was a leftover skip from last year because this test used to be flaky
describe('tedious auto instrumentation', { timeout: 90_000 }, () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 const dbSpan = (overrides: Record<string, unknown>) =>
 expect.objectContaining({
 op: 'db',
 origin: 'auto.db.otel.tedious',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.system': 'mssql',
 'db.name': 'master',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 ...overrides,
 });

 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 dbSpan({ description: 'SELECT 1 + 1 AS solution', status: 'ok' }),
 dbSpan({ description: 'SELECT 42; SELECT 42;', status: 'ok' }),
 dbSpan({ description: 'select !', status: 'internal_error' }),
 dbSpan({ description: '[dbo].[test_proced]', status: 'ok' }),
 dbSpan({ description: 'INSERT INTO [dbo].[test_prepared] VALUES (@val1, @val2)', status: 'ok' }),
 expect.objectContaining({
 description: 'SELECT GETDATE()',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT GETDATE()',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 status: 'ok',
 }),
 expect.objectContaining({
 description: 'SELECT 1 + 1 AS solution',
 data: expect.objectContaining({
 'sentry.origin': 'auto.db.otel.tedious',
 'sentry.op': 'db',
 'db.name': 'master',
 'db.statement': 'SELECT 1 + 1 AS solution',
 'db.system': 'mssql',
 'db.user': 'sa',
 'net.peer.name': '127.0.0.1',
 'net.peer.port': 1433,
 }),
 description: 'execBulkLoad test_bulk master',
 op: 'db',
 origin: 'auto.db.otel.tedious',
 status: 'ok',
 data: expect.objectContaining({ 'db.sql.table': 'test_bulk' }),
 }),
 ]),
 };
Expand Down

35 changes: 3 additions & 32 deletions
packages/node/src/integrations/tracing/tedious/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
import { TediousInstrumentation } from './vendored/instrumentation';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';

const TEDIUS_INSTRUMENTED_METHODS = new Set([
 'callProcedure',
 'execSql',
 'execSqlBatch',
 'execBulkLoad',
 'prepare',
 'execute',
]);
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node-core';

const INTEGRATION_NAME = 'Tedious';

export const instrumentTedious = generateInstrumentOnce(INTEGRATION_NAME, () => new TediousInstrumentation({}));

const _tediousIntegration = (() => {
 let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);

 return {
 name: INTEGRATION_NAME,
 setupOnce() {
 const instrumentation = instrumentTedious();
 instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
 },

 setup(client) {
 instrumentationWrappedCallback?.(() =>
 client.on('spanStart', span => {
 const { description, data } = spanToJSON(span);
 // Tedius integration always set a span name and `db.system` attribute to `mssql`.
 if (!description || data['db.system'] !== 'mssql') {
 return;
 }

 const operation = description.split(' ')[0] || '';
 if (TEDIUS_INSTRUMENTED_METHODS.has(operation)) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.tedious');
 }
 }),
 );
 instrumentTedious();
 },
 };
}) satisfies IntegrationFn;
Expand Down
Loading
Loading