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

Do not multiwrap pool queries #880

Merged
merged 5 commits into from
Mar 19, 2020
Merged

Do not multiwrap pool queries #880

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
181c4a7
fix: do not multiwrap pool queries
dyladan Mar 19, 2020
7442c35
chore: lint
dyladan Mar 19, 2020
e8ffdec
Merge branch 'master' into prevent-multi-wrap-pool
dyladan Mar 19, 2020
fcd18a8
chore: use wrap check from core
dyladan Mar 19, 2020
9f61585
Merge branch 'prevent-multi-wrap-pool' of github.com:dynatrace-oss-co…
dyladan Mar 19, 2020
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
12 changes: 7 additions & 5 deletions packages/opentelemetry-plugin-mysql/src/mysql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,13 @@ export class MysqlPlugin extends BasePlugin<typeof mysqlTypes> {
if (arguments[1]) {
// this is the callback passed into a query
// no need to unwrap
shimmer.wrap(
arguments[1],
'query',
thisPlugin._patchQuery(arguments[1])
);
if (!arguments[1].query.__wrapped) {
dyladan marked this conversation as resolved.
Show resolved Hide resolved
shimmer.wrap(
arguments[1],
'query',
thisPlugin._patchQuery(arguments[1])
);
}
}
if (typeof cb === 'function') {
cb(...arguments);
Expand Down