ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
Merged

ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs #21523

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
33 changes: 33 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
name: 'test',
create: callback => callback(new Error('Cannot create resource')),
destroy: () => {},
max: 10,
min: 0,
});

function acquire() {
return new Promise(resolve => {
pool.acquire(() => resolve());
});
}

async function run() {
await Sentry.startSpan(
{
op: 'transaction',
name: 'Test Transaction',
},
async () => {
await acquire();
},
);
}

run();
26 changes: 26 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
},
{ additionalDependencies: { 'generic-pool': '^2.5.0' } },
);

createEsmAndCjsTests(
__dirname,
'scenario-error.mjs',
'instrument.mjs',
(createRunner, test) => {
test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
description: 'generic-pool.acquire',
origin: 'auto.db.otel.generic_pool',
data: {
'sentry.origin': 'auto.db.otel.generic_pool',
},
status: 'internal_error',
}),
]),
};

await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { 'generic-pool': '^2.5.0' } },
);
});
28 changes: 28 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
create: function () {
return new Promise(() => {});
},
destroy: function () {
return Promise.resolve();
},
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
await Sentry.startSpan(
{
op: 'transaction',
name: 'Test Transaction',
},
async () => {
await myPool.acquire().catch(() => {});
},
);
}

run();
20 changes: 20 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
});

createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
description: 'generic-pool.acquire',
origin: 'auto.db.otel.generic_pool',
data: {
'sentry.origin': 'auto.db.otel.generic_pool',
},
status: 'internal_error',
}),
]),
};

await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
});
});
29 changes: 7 additions & 22 deletions packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
* - Minor TypeScript strictness adjustments for this repository's compiler settings
*/

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
}

private _acquirePatcher(original: AcquireFn) {
const tracer = this.tracer;
return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
const parent = api.context.active();
const span = tracer.startSpan('generic-pool.acquire', {}, parent);

return api.context.with(api.trace.setSpan(parent, span), () => {
return (original.call(this, ...args) as PromiseLike<unknown>).then(
(value: unknown) => {
span.end();
return value;
},
(err: unknown) => {
span.recordException(err as Error);
span.end();
throw err;
},
);
return startSpan({ name: 'generic-pool.acquire' }, () => {
return original.call(this, ...args) as PromiseLike<unknown>;
});
};
}
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
}

private _acquireWithCallbacksPatcher(original: AcquireFn) {
const tracer = this.tracer;
const isDisabled = (): boolean => this._isDisabled;
return function wrapped_acquire(
this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
if (isDisabled()) {
return original.call(this, cb, priority);
}
const parent = api.context.active();
const span = tracer.startSpan('generic-pool.acquire', {}, parent);

return api.context.with(api.trace.setSpan(parent, span), () => {
return startSpanManual({ name: 'generic-pool.acquire' }, span => {
original.call(
this,
(err: unknown, client: unknown) => {
if (err) {

@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)

span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
}
span.end();
// Not checking whether cb is a function because
// the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
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): Migrate vendored generic-pool instrumentation to Sentry APIs#21523

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 15, 2026
 Merged


ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs
#21523
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


33 changes: 33 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// v2 uses the callback API; a `create` error reaches the `acquire` callback and the span is errored.
const Pool = genericPool.Pool;

const pool = new Pool({
 name: 'test',
 create: callback => callback(new Error('Cannot create resource')),
 destroy: () => {},
 max: 10,
 min: 0,
});

function acquire() {
 return new Promise(resolve => {
 pool.acquire(() => resolve());
 });
}

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await acquire();
 },
 );
}

run();

26 changes: 26 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool-v2/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,4 +40,30 @@ describe('genericPool v2 auto instrumentation', () => {
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );

 createEsmAndCjsTests(
 __dirname,
 'scenario-error.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 },
 { additionalDependencies: { 'generic-pool': '^2.5.0' } },
 );
});

28 changes: 28 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/scenario-error.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import * as Sentry from '@sentry/node';
import genericPool from 'generic-pool';

// `create` never resolves, so `acquire` rejects and the span is errored.
const factory = {
 create: function () {
 return new Promise(() => {});
 },
 destroy: function () {
 return Promise.resolve();
 },
};

const myPool = genericPool.createPool(factory, { max: 2, min: 0, acquireTimeoutMillis: 500 });

async function run() {
 await Sentry.startSpan(
 {
 op: 'transaction',
 name: 'Test Transaction',
 },
 async () => {
 await myPool.acquire().catch(() => {});
 },
 );
}

run();

20 changes: 20 additions & 0 deletions
dev-packages/node-integration-tests/suites/tracing/genericPool/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,4 +34,24 @@ describe('genericPool auto instrumentation', () => {
 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });

 createEsmAndCjsTests(__dirname, 'scenario-error.mjs', 'instrument.mjs', (createRunner, test) => {
 test('marks the `generic-pool.acquire` span as errored when acquiring fails', async () => {
 const EXPECTED_TRANSACTION = {
 transaction: 'Test Transaction',
 spans: expect.arrayContaining([
 expect.objectContaining({
 description: 'generic-pool.acquire',
 origin: 'auto.db.otel.generic_pool',
 data: {
 'sentry.origin': 'auto.db.otel.generic_pool',
 },
 status: 'internal_error',
 }),
 ]),
 };

 await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
 });
 });
});

29 changes: 7 additions & 22 deletions
packages/node/src/integrations/tracing/genericPool/vendored/instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,9 @@
 * - Minor TypeScript strictness adjustments for this repository's compiler settings
 */

import * as api from '@opentelemetry/api';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';
import type * as genericPool from './generic-pool-types';

const MODULE_NAME = 'generic-pool';
Expand DownExpand Up@@ -102,23 +101,9 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquirePatcher(original: AcquireFn) {
 const tracer = this.tracer;
 return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return (original.call(this, ...args) as PromiseLike<unknown>).then(
 (value: unknown) => {
 span.end();
 return value;
 },
 (err: unknown) => {
 span.recordException(err as Error);
 span.end();
 throw err;
 },
 );
 return startSpan({ name: 'generic-pool.acquire' }, () => {
 return original.call(this, ...args) as PromiseLike<unknown>;
 });
 };
 }
Expand All@@ -134,7 +119,6 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 }

 private _acquireWithCallbacksPatcher(original: AcquireFn) {
 const tracer = this.tracer;
 const isDisabled = (): boolean => this._isDisabled;
 return function wrapped_acquire(
 this: genericPool.Pool<unknown>,
Expand All@@ -145,13 +129,14 @@ export class GenericPoolInstrumentation extends InstrumentationBase {
 if (isDisabled()) {
 return original.call(this, cb, priority);
 }
 const parent = api.context.active();
 const span = tracer.startSpan('generic-pool.acquire', {}, parent);

 return api.context.with(api.trace.setSpan(parent, span), () => {
 return startSpanManual({ name: 'generic-pool.acquire' }, span => {
 original.call(
 this,
 (err: unknown, client: unknown) => {
 if (err) {
@nicohrubecnicohrubecJun 15, 2026

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 aligns the v2 and v3 error path (so both set internal error on the span)
 span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 }
 span.end();
 // Not checking whether cb is a function because
 // the original code doesn't do that either.
Expand Down
Loading