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

feat: add support for tedious v17 #3901

Merged
merged 7 commits into from
Mar 7, 2024
Merged

feat: add support for tedious v17 #3901

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b445b28
feat: add support for tedious v17
david-luna Mar 5, 2024
5f045af
chore: update changelog
david-luna Mar 5, 2024
e4418b0
chore: update ock file
david-luna Mar 5, 2024
02ceb9a
Update .tav.yml
david-luna Mar 5, 2024
1c62693
Merge branch 'main' into dluna/feat-support-tedious-17
david-luna Mar 5, 2024
2f46c14
chore: add version check in tedious tests
david-luna Mar 6, 2024
1345d83
Merge branch 'dluna/feat-support-tedious-17' of github.com:elastic/ap…
david-luna Mar 6, 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
3 changes: 3 additions & 0 deletions .tav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ tedious:
- versions: '16.0.0 || 16.1.0 || >16.1.0 <17' # first and last majors subset of '16.x'
node: '>=16'
commands: node test/instrumentation/modules/tedious.test.js
- versions: '>=17.0.0 <18' # first and last majors subset of '17.x' (as for now there is only v17.0.0)
node: '>=20'
david-luna marked this conversation as resolved.
Show resolved Hide resolved
commands: node test/instrumentation/modules/tedious.test.js

cassandra-driver:
# 3.1.0 is broken
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ See the <<upgrade-to-v4>> guide.
[float]
===== Features

* Add support for `tedious` version v17. ({pull}3901[#3901])

[float]
===== Bug fixes

Expand Down
2 changes: 1 addition & 1 deletion docs/supported-technologies.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ so those should be supported as well.
|https://www.npmjs.com/package/mysql2[mysql2] |>=1.0.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 <17.0.0 | (Excluding v4.0.0.) Will instrument all queries
|https://www.npmjs.com/package/tedious[tedious] |>=1.9 <18.0.0 | (Excluding v4.0.0.) Will instrument all queries
|https://www.npmjs.com/package/undici[undici] | >=4.7.1 <6 | Will instrument undici HTTP requests, except HTTP CONNECT. Requires node v14.17.0 or later, or the user to have installed the https://www.npmjs.com/package/diagnostics_channel['diagnostics_channel' polyfill].
|https://www.npmjs.com/package/ws[ws] |>=1.0.0 <8.0.0 |Will instrument outgoing WebSocket messages
|=======================================================================
Expand Down
2 changes: 1 addition & 1 deletion lib/instrumentation/modules/tedious.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var { getDBDestination } = require('../context');

module.exports = function (tedious, agent, { version, enabled }) {
if (!enabled) return tedious;
if (version === '4.0.0' || !semver.satisfies(version, '>=1.9.0 <17')) {
if (version === '4.0.0' || !semver.satisfies(version, '>=1.9.0 <18')) {
agent.logger.debug(
'tedious version %s not supported - aborting...',
version,
Expand Down
18 changes: 8 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
"rimraf": "^5.0.1",
"tap-junit": "^5.0.1",
"tape": "^5.0.0",
"tedious": "^16.1.0",
"tedious": "^17.0.0",
"test-all-versions": "^6.1.0",
"thunky": "^1.1.0",
"tree-kill": "^1.2.2",
Expand Down
Loading