From c79a32938fac55237f407dd876cc5cfb55d1e204 Mon Sep 17 00:00:00 2001 From: David Luna Date: Wed, 19 Mar 2025 16:27:54 +0100 Subject: [PATCH 1/5] chore: remove test runs for v4 & v5 --- plugins/node/opentelemetry-instrumentation-mongodb/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 120222a3c0..f25b878d44 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -7,7 +7,7 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { "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 && npm run test-v4 && npm run test-v5-v6 && nyc merge .nyc_output ./coverage/coverage-final.json", + "test": "npm run test-v3", "test-v3": "tav mongodb 3.7.4 npm run test-v3-run", "test-v4": "tav mongodb 4.17.0 npm run test-v4-run", "test-v5-v6": "npm run test-v5-v6-run", From 593c6f23eed66f04b65c16e8994807a9f064098b Mon Sep 17 00:00:00 2001 From: David Luna Date: Wed, 19 Mar 2025 16:43:36 +0100 Subject: [PATCH 2/5] test: add test-v4 --- plugins/node/opentelemetry-instrumentation-mongodb/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index f25b878d44..e3c5c500d1 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -7,7 +7,7 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { "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": "npm run test-v3 && npm run test-v4", "test-v3": "tav mongodb 3.7.4 npm run test-v3-run", "test-v4": "tav mongodb 4.17.0 npm run test-v4-run", "test-v5-v6": "npm run test-v5-v6-run", From ebed04ab99181fc9d73b40cefb1027aa085b0e66 Mon Sep 17 00:00:00 2001 From: David Luna Date: Wed, 19 Mar 2025 16:59:25 +0100 Subject: [PATCH 3/5] chore: restore v5-v6 tests --- plugins/node/opentelemetry-instrumentation-mongodb/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index e3c5c500d1..a01c507115 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -7,7 +7,7 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { "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 && npm run test-v4", + "test": "npm run test-v3 && npm run test-v4 && npm run test-v5-v6", "test-v3": "tav mongodb 3.7.4 npm run test-v3-run", "test-v4": "tav mongodb 4.17.0 npm run test-v4-run", "test-v5-v6": "npm run test-v5-v6-run", From c915bd0677b6a5dc7cc268c64f5283d5828b4546 Mon Sep 17 00:00:00 2001 From: David Luna Date: Thu, 20 Mar 2025 10:39:23 +0100 Subject: [PATCH 4/5] chore: bump mongodb --- package-lock.json | 26 +++++++++---------- .../package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 864c9cb945..fe974827de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36738,7 +36738,7 @@ "@types/bson": "4.0.5", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "mongodb": "6.8.0", + "mongodb": "6.15.0", "nyc": "15.1.0", "rimraf": "5.0.10", "test-all-versions": "6.1.0", @@ -36840,13 +36840,13 @@ } }, "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/mongodb": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz", - "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", "dev": true, "dependencies": { - "@mongodb-js/saslprep": "^1.1.5", - "bson": "^6.7.0", + "@mongodb-js/saslprep": "^1.1.9", + "bson": "^6.10.3", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -36854,7 +36854,7 @@ }, "peerDependencies": { "@aws-sdk/credential-providers": "^3.188.0", - "@mongodb-js/zstd": "^1.1.0", + "@mongodb-js/zstd": "^1.1.0 || ^2.0.0", "gcp-metadata": "^5.2.0", "kerberos": "^2.0.1", "mongodb-client-encryption": ">=6.0.0 <7", @@ -46010,7 +46010,7 @@ "@types/bson": "4.0.5", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "mongodb": "6.8.0", + "mongodb": "6.15.0", "nyc": "15.1.0", "rimraf": "5.0.10", "test-all-versions": "6.1.0", @@ -46091,13 +46091,13 @@ } }, "mongodb": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz", - "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", "dev": true, "requires": { - "@mongodb-js/saslprep": "^1.1.5", - "bson": "^6.7.0", + "@mongodb-js/saslprep": "^1.1.9", + "bson": "^6.10.3", "mongodb-connection-string-url": "^3.0.0" } }, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index a01c507115..828d6cbd04 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -60,7 +60,7 @@ "@types/bson": "4.0.5", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "mongodb": "6.8.0", + "mongodb": "6.15.0", "nyc": "15.1.0", "rimraf": "5.0.10", "test-all-versions": "6.1.0", From 0d84be312dd55b1f51ed79b8f7a6c93f56492642 Mon Sep 17 00:00:00 2001 From: David Luna Date: Thu, 20 Mar 2025 15:16:38 +0100 Subject: [PATCH 5/5] chore: remove v3 tests --- plugins/node/opentelemetry-instrumentation-mongodb/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 828d6cbd04..487eb2bdb4 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -7,7 +7,7 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { "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 && npm run test-v4 && npm run test-v5-v6", + "test": "npm run test-v4 && npm run test-v5-v6", "test-v3": "tav mongodb 3.7.4 npm run test-v3-run", "test-v4": "tav mongodb 4.17.0 npm run test-v4-run", "test-v5-v6": "npm run test-v5-v6-run",