From 91c1c992e5ccae82c8d7ac7b3e1e4f691c736384 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Wed, 6 Apr 2022 21:46:20 +0100 Subject: [PATCH 1/5] ref(test): Switch to `mongodb-memory-server-global` --- packages/node-integration-tests/package.json | 2 +- .../suites/tracing/auto-instrument/mongodb/test.ts | 2 +- yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/node-integration-tests/package.json b/packages/node-integration-tests/package.json index 3f10098ba15b..acea1d86e8dd 100644 --- a/packages/node-integration-tests/package.json +++ b/packages/node-integration-tests/package.json @@ -21,7 +21,7 @@ "cors": "^2.8.5", "express": "^4.17.3", "mongodb": "^3.7.3", - "mongodb-memory-server": "^7.6.3", + "mongodb-memory-server-global": "^7.6.3", "mysql": "^2.18.1", "nock": "^13.1.0", "pg": "^8.7.3", diff --git a/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts b/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts index dd5f88f860ca..90ecd915b372 100644 --- a/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts +++ b/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts @@ -1,4 +1,4 @@ -import { MongoMemoryServer } from 'mongodb-memory-server'; +import { MongoMemoryServer } from 'mongodb-memory-server-global'; import { assertSentryTransaction, conditionalTest, getEnvelopeRequest, runServer } from '../../../../utils'; diff --git a/yarn.lock b/yarn.lock index 7a8d5c41fb37..3e1371b79241 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16329,10 +16329,10 @@ mongodb-memory-server-core@7.6.3: uuid "^8.3.1" yauzl "^2.10.0" -mongodb-memory-server@^7.6.3: +mongodb-memory-server-global@^7.6.3: version "7.6.3" - resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-7.6.3.tgz#8b2827363ca16aaf250cba07f7a2b49e502735d4" - integrity sha512-yHDE9FGxOpSRUzitF9Qx3JjEgayCSJI3JOW2wgeBH/5PAsUdisy2nRxRiNwwLDooQ7tohllWCRTXlWqyarUEMQ== + resolved "https://registry.yarnpkg.com/mongodb-memory-server-global/-/mongodb-memory-server-global-7.6.3.tgz#ad662a640db254eea7927668834c26b665c13547" + integrity sha512-WLlMqkEasuanHjoxyMxlyvQ/HtJgq0eGyrfCXX6lTnY/26Zfs96W2daeWLOQ48VLInSOh2umBvE74Ykqj7gVyA== dependencies: mongodb-memory-server-core "7.6.3" tslib "^2.3.0" From 1bdcf86fccdad91b90e9bd693c7aa2018fd76896 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Wed, 6 Apr 2022 22:21:19 +0100 Subject: [PATCH 2/5] Specify download directory to trigger postinstall. --- packages/node-integration-tests/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/node-integration-tests/package.json b/packages/node-integration-tests/package.json index acea1d86e8dd..539a89afb9ae 100644 --- a/packages/node-integration-tests/package.json +++ b/packages/node-integration-tests/package.json @@ -26,5 +26,10 @@ "nock": "^13.1.0", "pg": "^8.7.3", "portfinder": "^1.0.28" + }, + "config": { + "mongodbMemoryServer": { + "downloadDir": "./node_modules/mongodb-memory-server" + } } } From 9b47d2ee8129663ac042a126556e819854b100d2 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Wed, 13 Apr 2022 22:27:27 +0300 Subject: [PATCH 3/5] Disable runtime downloads, prefer global downloads. --- packages/node-integration-tests/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/node-integration-tests/package.json b/packages/node-integration-tests/package.json index 539a89afb9ae..ed9ee98ceaec 100644 --- a/packages/node-integration-tests/package.json +++ b/packages/node-integration-tests/package.json @@ -29,7 +29,8 @@ }, "config": { "mongodbMemoryServer": { - "downloadDir": "./node_modules/mongodb-memory-server" + "preferGlobalPath": true, + "runtimeDownload": false } } } From 47f8623c6f25afc8def2b299068bb06ee00e2f62 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Thu, 14 Apr 2022 11:09:25 +0300 Subject: [PATCH 4/5] Cache mongodb-binaries on CI. --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21d0fd5685f9..bfefea5392c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ env: ${{ github.workspace }}/node_modules ${{ github.workspace }}/packages/**/node_modules ~/.cache/ms-playwright/ + ~/.cache/mongodb-binaries/ # DEPENDENCY_CACHE_KEY: can't be set here because we don't have access to yarn.lock From e7e2f8a027471b4cf4648026c8675f530399f9e3 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Thu, 14 Apr 2022 11:52:33 +0300 Subject: [PATCH 5/5] Decrease `beforeAll` timeout, increase overall test timeout. --- .../suites/tracing/auto-instrument/mongodb/test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts b/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts index 90ecd915b372..76cadd1518dd 100644 --- a/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts +++ b/packages/node-integration-tests/suites/tracing/auto-instrument/mongodb/test.ts @@ -2,13 +2,16 @@ import { MongoMemoryServer } from 'mongodb-memory-server-global'; import { assertSentryTransaction, conditionalTest, getEnvelopeRequest, runServer } from '../../../../utils'; +// This test can take longer. +jest.setTimeout(15000); + conditionalTest({ min: 12 })('MongoDB Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { mongoServer = await MongoMemoryServer.create(); process.env.MONGO_URL = mongoServer.getUri(); - }, 40000); + }, 10000); afterAll(async () => { await mongoServer.stop();