Skip to content
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

Jump to bottom

fix(pg): fix instrumentation of ESM-imported pg #1701

Merged
merged 5 commits into from
Oct 17, 2023
Merged

fix(pg): fix instrumentation of ESM-imported pg #1701

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bec9a23
fix(pg): fix instrumentation of ESM-imported pg
trentm Sep 27, 2023
ff9cc01
Merge branch 'main' into tm-issue1693-pg-esm
trentm Sep 27, 2023
ec38a6b
Merge branch 'main' into tm-issue1693-pg-esm
trentm Oct 4, 2023
a22498d
Merge branch 'main' into tm-issue1693-pg-esm
pichlermarc Oct 12, 2023
7246328
Merge branch 'main' into tm-issue1693-pg-esm
pichlermarc Oct 17, 2023
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
14 changes: 11 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 @@ -66,7 +66,11 @@
const modulePG = new InstrumentationNodeModuleDefinition<typeof pgTypes>(
'pg',
['8.*'],
moduleExports => {
(module: any) => {
const moduleExports: typeof pgTypes =
module[Symbol.toStringTag] === 'Module'
? module.default // ESM

Check warning on line 72 in plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts

View check run for this annotation

Codecov / codecov/patch

plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts#L72 

Added line #L72 was not covered by tests
: module; // CommonJS
if (isWrapped(moduleExports.Client.prototype.query)) {
this._unwrap(moduleExports.Client.prototype, 'query');
}
Expand All @@ -87,9 +91,13 @@
this._getClientConnectPatch() as any
);

return moduleExports;
return module;
},
moduleExports => {
(module: any) => {

Check warning on line 96 in plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts

View check run for this annotation

Codecov / codecov/patch

plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts#L96 

Added line #L96 was not covered by tests
const moduleExports: typeof pgTypes =
module[Symbol.toStringTag] === 'Module'
? module.default // ESM
: module; // CommonJS

Check warning on line 100 in plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts

View check run for this annotation

Codecov / codecov/patch

plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts#L98-L100 

Added lines #L98 - L100 were not covered by tests
if (isWrapped(moduleExports.Client.prototype.query)) {
this._unwrap(moduleExports.Client.prototype, 'query');
}
Expand Down
Loading