Skip to content

fix(pg): fix instrumentation of ESM-imported pg-pool #2807

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
trentm merged 13 commits into from
May 7, 2025
Merged

fix(pg): fix instrumentation of ESM-imported pg-pool #2807

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e36da2d
fix pg pool ESM
maryliag Apr 29, 2025
d00650e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
maryliag Apr 29, 2025
8136008
add test
maryliag May 6, 2025
ce28bff
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
maryliag May 6, 2025
b1be7fa
use different import
maryliag May 6, 2025
0cedfc2
fix
maryliag May 6, 2025
d935e7d
fix
maryliag May 6, 2025
f8470f1
add done
maryliag May 6, 2025
1e99187
fixup pg-pool ESM test; align POSTGRES_DB value used for local and CI…
trentm May 6, 2025
c4056f8
fix lint
trentm May 6, 2025
de6efe4
don't need this
trentm May 6, 2025
bb00805
Update plugins/node/opentelemetry-instrumentation-pg/test/fixtures/us…
maryliag May 7, 2025
8edfd00
Merge branch 'main' into fix-pg-pool
trentm May 7, 2025
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
9 changes: 6 additions & 3 deletions plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ export class PgInstrumentation extends InstrumentationBase<PgInstrumentationConf

protected init() {
const SUPPORTED_PG_VERSIONS = ['>=8.0.3 <9'];
const SUPPORTED_PG_POOL_VERSIONS = ['>=2.0.0 <4'];

const modulePgNativeClient = new InstrumentationNodeModuleFile(
'pg/lib/native/client.js',
Expand Down Expand Up @@ -168,8 +169,9 @@ export class PgInstrumentation extends InstrumentationBase<PgInstrumentationConf

const modulePGPool = new InstrumentationNodeModuleDefinition(
'pg-pool',
['>=2.0.0 <4'],
(moduleExports: typeof pgPoolTypes) => {
SUPPORTED_PG_POOL_VERSIONS,
(module: any) => {
const moduleExports = extractModuleExports(module);
if (isWrapped(moduleExports.prototype.connect)) {
this._unwrap(moduleExports.prototype, 'connect');
}
Expand All @@ -180,7 +182,8 @@ export class PgInstrumentation extends InstrumentationBase<PgInstrumentationConf
);
return moduleExports;
},
(moduleExports: typeof pgPoolTypes) => {
(module: any) => {
const moduleExports = extractModuleExports(module);
if (isWrapped(moduleExports.prototype.connect)) {
this._unwrap(moduleExports.prototype, 'connect');
}
Expand Down