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(instrumentation-mongodb): add support for mongodb v6 #1760

Merged
merged 13 commits into from
Nov 28, 2023
Merged

feat(instrumentation-mongodb): add support for mongodb v6 #1760

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d181f3d
feat: add support for mongodb v6
david-luna Oct 30, 2023
34ad6ab
chore: lint fix
david-luna Oct 30, 2023
df6ca27
chore: revert bump of mongodb
david-luna Oct 30, 2023
928b8fc
chore: revert test script
david-luna Nov 10, 2023
141e826
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
david-luna Nov 10, 2023
271b09b
chore: revert changelog
david-luna Nov 15, 2023
e0257cc
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
david-luna Nov 15, 2023
7b89953
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
david-luna Nov 16, 2023
7d3a4ce
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
david-luna Nov 20, 2023
ccf3e79
chore: filter node versions in TAV
david-luna Nov 20, 2023
2990880
chore: fix .tav.yml
david-luna Nov 21, 2023
e250fb5
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
david-luna Nov 23, 2023
6ae7848
Merge branch 'main' into dluna/1666-feat-instrument-mongodb-v6
dyladan Nov 28, 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
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ mongodb:
commands: npm run test-v3
- versions: ">=4 <5"
commands: npm run test-v4
- versions: ">=5 <6"
commands: npm run test-v5
- versions: ">=5 <7"
commands: npm run test-v5-v6

# Fix missing `contrib-test-utils` package
pretest: npm run --prefix ../../../ lerna:link
6 changes: 6 additions & 0 deletions plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Features

* **mongodb:** support v6 ([#1666](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1666))

Copy link
Member

Choose a reason for hiding this comment

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

Changelog is automatically updated by the release automation. There is no need to do it here. It comes from the PR title.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed :)

## [0.37.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.37.0...instrumentation-mongodb-v0.37.1) (2023-10-10)


Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mongodb/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-mongodb

### Supported Versions

- `>=3.3 <5`
- `>=3.3 <7`

## Usage

Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-mongodb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo",
"test": "npm run test-v3",
"test-v3": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'",
"test-v4": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v4.test.ts'",
"test-v5": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v5.test.ts'",
"test-v4": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5-v6.metrics.test.ts' 'test/**/mongodb-v4.test.ts'",
"test-v5-v6": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5-v6.metrics.test.ts' 'test/**/mongodb-v5-v6.test.ts'",
"test-all-versions": "tav",
"tdd": "npm run test -- --watch-extensions ts --watch",
"clean": "rimraf build/*",
Expand Down Expand Up @@ -53,8 +53,8 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.34.2",
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/contrib-test-utils": "^0.34.2",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/bson": "4.0.5",
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,31 @@ export class MongoDBInstrumentation extends InstrumentationBase {
),
new InstrumentationNodeModuleDefinition<any>(
'mongodb',
['4.*', '5.*'],
['4.*', '5.*', '6.*'],
undefined,
undefined,
[
new InstrumentationNodeModuleFile<V4Connection>(
'mongodb/lib/cmap/connection.js',
['4.*', '5.*'],
['4.*', '5.*', '6.*'],
v4PatchConnection,
v4UnpatchConnection
),
new InstrumentationNodeModuleFile<V4ConnectionPool>(
'mongodb/lib/cmap/connection_pool.js',
['4.*', '5.*'],
['4.*', '5.*', '6.*'],
v4PatchConnectionPool,
v4UnpatchConnectionPool
),
new InstrumentationNodeModuleFile<V4Connect>(
'mongodb/lib/cmap/connect.js',
['4.*', '5.*'],
['4.*', '5.*', '6.*'],
v4PatchConnect,
v4UnpatchConnect
),
new InstrumentationNodeModuleFile<V4Session>(
'mongodb/lib/sessions.js',
['4.*', '5.*'],
['4.*', '5.*', '6.*'],
v4PatchSessions,
v4UnpatchSessions
),
Expand Down
0 ...ongodb/test/mongodb-v4-v5.metrics.test.ts → ...odb/test/mongodb-v4-v5-v6.metrics.test.ts
View file
Open in desktop
File renamed without changes.
0 ...mentation-mongodb/test/mongodb-v5.test.ts → ...tation-mongodb/test/mongodb-v5-v6.test.ts
View file
Open in desktop
File renamed without changes.
Loading