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

feat: add mariadb package instrumentation support #4045

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

feat: add mariadb package instrumentation support #4045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab157fe
init changes
Nisgrak May 24, 2024
3de549c
passing all ways
Nisgrak May 24, 2024
bfd090c
progress
Nisgrak May 24, 2024
8c608fc
streams working
Nisgrak May 24, 2024
9f94e9e
add batch and prepare
Nisgrak May 28, 2024
e971246
update last test
Nisgrak May 28, 2024
90ed7dd
add to tav
Nisgrak May 28, 2024
79881fb
format
Nisgrak May 28, 2024
073e9a6
add changelog
Nisgrak May 28, 2024
ee6cc66
test: add missing tests
Nisgrak May 28, 2024
835617f
chore: remove console log
Nisgrak May 28, 2024
63c3a0f
improved supported versions to 3.1.0
Nisgrak May 28, 2024
0ee7505
Merge branch 'main' into master
Nisgrak May 29, 2024
8f391d2
Allow to use of .js
Nisgrak Jun 4, 2024
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
1 change: 1 addition & 0 deletions .ci/tav.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
{ "name": "mongodb-core", "minMajorVersion": 8 },
{ "name": "mysql", "minMajorVersion": 8 },
{ "name": "mysql2", "minMajorVersion": 8 },
{ "name": "mariadb", "minMajorVersion": 14 },
{ "name": "next", "minMajorVersion": 14 },
{ "name": "pg", "minMajorVersion": 8 },
{ "name": "redis", "minMajorVersion": 8 },
Expand Down
7 changes: 7 additions & 0 deletions .tav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ mysql2:
- node test/instrumentation/modules/mysql2/mysql.test.js
- node test/instrumentation/modules/mysql2/pool-release-1.test.js

mariadb:
- versions: '>=3.1.0 <4'
node: '>=14.0.0'
commands:
- node test/instrumentation/modules/mariadb/mariadb.test.js
- node test/instrumentation/modules/mariadb/pool-release-1.test.js

redis:
- versions: '>=2.0.0 <4.0.0'
commands: node test/instrumentation/modules/redis-2-3.test.js
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ Notes:

See the <<upgrade-to-v4>> guide.


==== Unreleased

[float]
===== Breaking changes

[float]
===== Features
Add support for mariadb >=3.1.0 instrumentation

[float]
===== Bug fixes
Expand All @@ -56,7 +56,6 @@ compatible runtimes (which is advisory) was not updated until now.
[float]
===== Chores


[[release-notes-4.5.4]]
==== 4.5.4 - 2024/05/13

Expand Down
1 change: 1 addition & 0 deletions docs/supported-technologies.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ so those should be supported as well.
|https://www.npmjs.com/package/mongoose[mongoose] |>=5.7.0 <8 |Supported via mongodb
|https://www.npmjs.com/package/mysql[mysql] |^2.0.0 |Will instrument all queries
|https://www.npmjs.com/package/mysql2[mysql2] |>=1.0.0 <4.0.0 |Will instrument all queries
|https://www.npmjs.com/package/mariadb[mariadb] |>=3.1.0 <4.0.0 |Will instrument all queries
|https://www.npmjs.com/package/pg[pg] |>=4.0.0 <9.0.0 |Will instrument all queries
|https://www.npmjs.com/package/redis[redis] |>=2.0.0 <5.0.0 |Will instrument all queries
|https://www.npmjs.com/package/tedious[tedious] |>=1.9 <19.0.0 | (Excluding v4.0.0.) Will instrument all queries
Expand Down
3 changes: 3 additions & 0 deletions lib/instrumentation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ var MODULE_PATCHERS = [
},
{ modPath: 'mysql' },
{ modPath: 'mysql2' },
{ modPath: 'mariadb' },
{ modPath: 'mariadb/callback', patcher: './modules/mariadb.js' },
{ modPath: 'mariadb/callback.js', patcher: './modules/mariadb.js' },
{ modPath: 'next' },
{ modPath: 'next/dist/server/api-utils/node.js' },
{ modPath: 'next/dist/server/dev/next-dev-server.js' },
Expand Down
Loading