Skip to content

chore: fixed mariadb url capture for esm #2551

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
aryamohanan merged 2 commits into from
May 15, 2026
Merged

chore: fixed mariadb url capture for esm #2551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4ce8b
chore: fixed mariadb url capture for esm
aryamohanan May 15, 2026
3ea65d1
chore: updated
aryamohanan May 15, 2026
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
19 changes: 14 additions & 5 deletions packages/core/src/tracing/instrumentation/databases/prisma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const mariadbAdapterConfigMap = new WeakMap();
exports.init = function init(config) {
logger = config.logger;

hook.onModuleLoad('@prisma/adapter-mariadb', instrumentMariaDbAdapter);
hook.onModuleLoad('@prisma/adapter-mariadb', instrumentMariaDbAdapter, { nativeEsm: true });
hook.onModuleLoad('@prisma/client', instrumentPrismaClient);
};

Expand Down Expand Up @@ -64,10 +64,19 @@ function instrumentMariaDbAdapter(mariadbAdapterModule) {
}
}

return {
...mariadbAdapterModule,
PrismaMariaDb: InstanaPrismaMariaDb
};
const isGetterExport = !!Object.getOwnPropertyDescriptor(mariadbAdapterModule, 'PrismaMariaDb')?.get;
// CJS: PrismaMariaDb is a getter property
if (isGetterExport) {
Copy link
Copy Markdown
Contributor

@kirrg001 kirrg001 May 15, 2026

Choose a reason for hiding this comment

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

I think something is wrong here.

CJS e.g.

Original vs Modified

{ PrismaMariaDb: [Getter] }
{ PrismaMariaDb: [class InstanaPrismaMariaDb extends PrismaMariaDbAdapterFactory] }

I expect:

{ InstanaPrismaMariaDb: [Getter] }

Copy link
Copy Markdown
Contributor Author

@aryamohanan aryamohanan May 15, 2026

Choose a reason for hiding this comment

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

Updated to preserve the original getter semantics

return {
...mariadbAdapterModule,
get PrismaMariaDb() {
return InstanaPrismaMariaDb;
}
};
}
// ESM: PrismaMariaDb is a direct export
mariadbAdapterModule.PrismaMariaDb = InstanaPrismaMariaDb;
Copy link
Copy Markdown
Contributor

@kirrg001 kirrg001 May 15, 2026

Choose a reason for hiding this comment

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

ESM is correct

return mariadbAdapterModule;
}

function instrumentPrismaClient(prismaClientModule) {
Expand Down