From 260270c5912ee5d40a53bca79b1ed4e874915159 Mon Sep 17 00:00:00 2001 From: s1gr1d <32902192+s1gr1d@users.noreply.github.com> Date: Tue, 17 Nov 2026 14:13:51 +0100 Subject: [PATCH 1/3] test(node-integration): Remove port races from scenarios and Mongo suites `MongoMemoryServer` looks for a free port and starts `mongod` on it afterwards. Another process can take the port in between, which failed 11 suites with "Port already in use". Each suite now has its own port below the ephemeral range, where the OS does not assign ports. The hapi, koa, and dataloader scenarios listened on a fixed port, which the child process of the previous run can still hold. They now listen on port 0 and send the real port to the runner. --- .../suites/tracing/dataloader/scenario.mjs | 4 +-- .../suites/tracing/hapi/scenario.mjs | 6 ++--- .../suites/tracing/koa/scenario.mjs | 6 ++--- .../suites/tracing/mongodb-v4/test.ts | 5 ++-- .../suites/tracing/mongodb-v5/test.ts | 5 ++-- .../suites/tracing/mongodb-v6/test.ts | 5 ++-- .../suites/tracing/mongodb-v7/test.ts | 5 ++-- .../suites/tracing/mongodb/test.ts | 5 ++-- .../tracing/mongoose-tracing-channel/test.ts | 5 ++-- .../suites/tracing/mongoose-v5/test.ts | 5 ++-- .../suites/tracing/mongoose-v7/test.ts | 5 ++-- .../suites/tracing/mongoose-v8/test.ts | 5 ++-- .../suites/tracing/mongoose-v9/test.ts | 5 ++-- .../suites/tracing/mongoose/test.ts | 5 ++-- .../utils/mongoMemoryServer.ts | 26 +++++++++++++++++++ 15 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 dev-packages/node-integration-tests/utils/mongoMemoryServer.ts diff --git a/dev-packages/node-integration-tests/suites/tracing/dataloader/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/dataloader/scenario.mjs index 18c397d1e240..08208281c7e0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/dataloader/scenario.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/dataloader/scenario.mjs @@ -2,8 +2,6 @@ import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-int import Dataloader from 'dataloader'; import express from 'express'; -const PORT = 8008; - const batchLoadFn = async keys => keys.map((_, idx) => idx); const run = async () => { @@ -35,7 +33,7 @@ const run = async () => { res.send({ user }); }); - startExpressServerAndSendPortToRunner(app, PORT); + startExpressServerAndSendPortToRunner(app); }; run(); diff --git a/dev-packages/node-integration-tests/suites/tracing/hapi/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/hapi/scenario.mjs index 33a3df241a66..35121d8581dd 100644 --- a/dev-packages/node-integration-tests/suites/tracing/hapi/scenario.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/hapi/scenario.mjs @@ -2,12 +2,10 @@ import Boom from '@hapi/boom'; import Hapi from '@hapi/hapi'; import { sendPortToRunner } from '@sentry-internal/node-integration-tests'; -const port = 5999; - const run = async () => { const server = Hapi.server({ host: 'localhost', - port, + port: 0, }); server.route({ @@ -88,7 +86,7 @@ const run = async () => { await server.start(); - sendPortToRunner(port); + sendPortToRunner(server.info.port); }; run(); diff --git a/dev-packages/node-integration-tests/suites/tracing/koa/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/koa/scenario.mjs index b395137c4c46..ed499e6a8385 100644 --- a/dev-packages/node-integration-tests/suites/tracing/koa/scenario.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/koa/scenario.mjs @@ -2,8 +2,6 @@ import Router from '@koa/router'; import { sendPortToRunner } from '@sentry-internal/node-integration-tests'; import Koa from 'koa'; -const port = 5698; - const app = new Koa(); // The error handler is auto-registered by the koa instrumentation on app start, @@ -30,6 +28,6 @@ router.get('/error', () => { app.use(router.routes()).use(router.allowedMethods()); -app.listen(port, () => { - sendPortToRunner(port); +const server = app.listen(0, () => { + sendPortToRunner(server.address().port); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts index 1aa22d8230fe..f547ede85ba4 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongodb-v4/test.ts @@ -10,8 +10,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongodb 4 so the = 4.0 <6.4 callback-based command band and the @@ -20,7 +21,7 @@ describe('MongoDB v4 auto-instrumentation', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongodb-v4'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts index ac3d08712184..18e6d150deb0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongodb-v5/test.ts @@ -10,8 +10,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongodb 5 so the >= 4.0 < 6.4 callback-based command band and the @@ -20,7 +21,7 @@ describe('MongoDB v5 auto-instrumentation', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongodb-v5'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts index 5033b4bbe039..0860084f4159 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongodb-v6/test.ts @@ -10,8 +10,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongodb 6 so the >= 6.4 promise-based `Connection.prototype.command` @@ -20,7 +21,7 @@ describe('MongoDB v6 auto-instrumentation', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongodb-v6'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts index f38fed0f1692..979dff8b6eec 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts @@ -10,8 +10,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongodb 7 so the >= 6.4 promise-based `Connection.prototype.command` @@ -20,7 +21,7 @@ describe('MongoDB v7 auto-instrumentation', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongodb-v7'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts index c24482f7fa24..ef1823772c88 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts @@ -22,8 +22,9 @@ import { SERVER_PORT, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; describe('MongoDB auto-instrumentation', () => { @@ -31,7 +32,7 @@ describe('MongoDB auto-instrumentation', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongodb'); process.env.MONGO_URL = mongoServer.getUri(); }, 10000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts index 56efaad69243..3118fc5b3c44 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts @@ -12,8 +12,9 @@ import { SERVER_PORT, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // mongoose >= 9.7.0 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes @@ -26,7 +27,7 @@ describe('Mongoose tracing channel Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose-tracing-channel'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-v5/test.ts index 4071fdbdf533..eeacb04f39d0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-v5/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-v5/test.ts @@ -7,8 +7,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongoose 5.9.7 @@ -19,7 +20,7 @@ describe('Mongoose v5 Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose-v5'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-v7/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-v7/test.ts index 42ff84c6dd25..553253cecd94 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-v7/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-v7/test.ts @@ -7,8 +7,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose. @@ -17,7 +18,7 @@ describe('Mongoose v7 Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose-v7'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-v8/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-v8/test.ts index cb3756e4e723..9b5ee164d69e 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-v8/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-v8/test.ts @@ -7,8 +7,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised @@ -18,7 +19,7 @@ describe('Mongoose v8 Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose-v8'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-v9/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-v9/test.ts index abfba23f1f5c..c5c201504f8a 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-v9/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-v9/test.ts @@ -7,8 +7,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; // Pins the highest mongoose 9 below 9.7, the top of the IITM patcher's `>=5.9.7 <9.7.0` range, so the @@ -19,7 +20,7 @@ describe('Mongoose v9 Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose-v9'); process.env.MONGO_URL = mongoServer.getUri(); }, 30000); diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts index beeb52aa100d..432de99e99d2 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts @@ -8,8 +8,9 @@ import { SENTRY_TRACE_LIFECYCLE, } from '@sentry/conventions/attributes'; import { DB } from '@sentry/conventions/op'; -import { MongoMemoryServer } from 'mongodb-memory-server-global'; +import type { MongoMemoryServer } from 'mongodb-memory-server-global'; import { afterAll, beforeAll, describe, expect } from 'vitest'; +import { createMongoMemoryServer } from '../../../utils/mongoMemoryServer'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; describe('Mongoose experimental Test', () => { @@ -18,7 +19,7 @@ describe('Mongoose experimental Test', () => { let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create(); + mongoServer = await createMongoMemoryServer('mongoose'); process.env.MONGO_URL = mongoServer.getUri(); }, 10000); diff --git a/dev-packages/node-integration-tests/utils/mongoMemoryServer.ts b/dev-packages/node-integration-tests/utils/mongoMemoryServer.ts new file mode 100644 index 000000000000..25d9b981fcf6 --- /dev/null +++ b/dev-packages/node-integration-tests/utils/mongoMemoryServer.ts @@ -0,0 +1,26 @@ +import { MongoMemoryServer } from 'mongodb-memory-server-global'; + +// `MongoMemoryServer` finds a free port and starts `mongod` on it afterwards. With a port that the +// OS assigns, another process can get the same port in between, and `mongod` fails with "Port +// already in use". The OS does not assign ports below its ephemeral range (32768 on Linux), so each +// suite has its own port there. The suites run in parallel, so no two suites can share a port. +const MONGO_PORTS = { + mongodb: 27101, + 'mongodb-v4': 27102, + 'mongodb-v5': 27103, + 'mongodb-v6': 27104, + 'mongodb-v7': 27105, + mongoose: 27106, + 'mongoose-v5': 27107, + 'mongoose-v7': 27108, + 'mongoose-v8': 27109, + 'mongoose-v9': 27110, + 'mongoose-tracing-channel': 27111, +} as const; + +/** + * Starts a `MongoMemoryServer` on the port of the given suite. + */ +export function createMongoMemoryServer(suite: keyof typeof MONGO_PORTS): Promise { + return MongoMemoryServer.create({ instance: { port: MONGO_PORTS[suite] } }); +} From 56db855243a83fdef0ca093e56d3ac7079b980cd Mon Sep 17 00:00:00 2001 From: s1gr1d <32902192+s1gr1d@users.noreply.github.com> Date: Tue, 17 Nov 2026 14:13:51 +0100 Subject: [PATCH 2/3] test(test-utils): Keep the refused port of the fake ingest reserved `startFakeIngests` closed a listener to get a port that refuses connections. The OS can give that port to the next listener, for example the app under test, and the tunnel then forwards to the app itself. The port is now the local port of an open connection, which has no listener and which the OS gives to no one. --- .../test-utils/src/tunnel-hardening.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-packages/test-utils/src/tunnel-hardening.ts b/dev-packages/test-utils/src/tunnel-hardening.ts index 76b2145d6eeb..fc62531c07e7 100644 --- a/dev-packages/test-utils/src/tunnel-hardening.ts +++ b/dev-packages/test-utils/src/tunnel-hardening.ts @@ -2,6 +2,7 @@ // app keeps serving after each one. The tunnel must never break the app, whatever the client, the envelope or the // ingest does. Only Node built-ins, so Bun and Deno tests can import this file directly. import { Buffer } from 'node:buffer'; +import { once } from 'node:events'; import * as http from 'node:http'; import * as net from 'node:net'; import * as zlib from 'node:zlib'; @@ -45,23 +46,28 @@ export interface FakeIngests { * Starts the fake ingests on free ports. */ export async function startFakeIngests(): Promise { - const servers: http.Server[] = []; + const servers: net.Server[] = []; const sockets = new Set(); const ports: Record = {}; for (const [name, handler] of Object.entries(INGEST_HANDLERS)) { - const server = http.createServer(handler ?? (() => undefined)); + const server: net.Server = handler ? http.createServer(handler) : net.createServer(); server.on('connection', socket => { sockets.add(socket); socket.on('close', () => sockets.delete(socket)); }); await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); - ports[name] = (server.address() as net.AddressInfo).port; + servers.push(server); + const { port } = server.address() as net.AddressInfo; if (handler) { - servers.push(server); + ports[name] = port; } else { - // Keep the port, refuse connections. - await new Promise(resolve => server.close(() => resolve())); + // The OS can give a closed port to the next listener, for example the app under test. The local port of an + // open connection has no listener either, and the OS gives it to no one until the connection closes. + const socket = net.connect(port, '127.0.0.1'); + await once(socket, 'connect'); + sockets.add(socket); + ports[name] = socket.localPort!; } } From af2629448fbe2e7dcdfd2eec2651a66a08785903 Mon Sep 17 00:00:00 2001 From: s1gr1d <32902192+s1gr1d@users.noreply.github.com> Date: Tue, 17 Nov 2026 14:13:51 +0100 Subject: [PATCH 3/3] test(node-integration): Give each amqplib run its own queue The queues are exclusive, and the broker can still hold the lock of the previous run when the next run declares the same queue name (RESOURCE-LOCKED). The broker now names the queue of the topic scenario, and the callback scenario gets a unique name from the test. --- .../suites/tracing/amqplib/scenario-callback-api.mjs | 2 +- .../suites/tracing/amqplib/scenario-topic-noack.mjs | 9 ++++++--- .../suites/tracing/amqplib/test.ts | 9 +++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-callback-api.mjs b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-callback-api.mjs index 4870e99da9bd..d6d2f8c8c76b 100644 --- a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-callback-api.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-callback-api.mjs @@ -1,7 +1,7 @@ import * as Sentry from '@sentry/node'; import amqp from 'amqplib/callback_api.js'; -const queueName = 'callback-queue'; +const queueName = process.env.AMQP_QUEUE_NAME; const amqpUsername = 'sentry'; const amqpPassword = 'sentry'; diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-topic-noack.mjs b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-topic-noack.mjs index 819f1181cb1f..35678dc54a65 100644 --- a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-topic-noack.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-topic-noack.mjs @@ -3,7 +3,6 @@ import amqp from 'amqplib'; // A topic exchange, so the routing key and the queue name differ. const exchangeName = 'orders'; -const queueName = 'orders-worker'; const routingKey = 'order.created.12345'; const amqpUsername = 'sentry'; const amqpPassword = 'sentry'; @@ -16,8 +15,12 @@ const NO_ACKNOWLEDGEMENT = { noAck: true }; (async () => { const { connection, channel } = await connectToRabbitMQ(); - await channel.assertExchange(exchangeName, 'topic', { durable: false, autoDelete: true }); - await channel.assertQueue(queueName, { durable: false, exclusive: true }); + // The ESM and CJS runs of all versions share the exchange, so it must not go away with the queue + // of an earlier run. + await channel.assertExchange(exchangeName, 'topic', { durable: false }); + // An exclusive queue stays locked until the broker has cleaned up its connection, which can be + // after the next run starts. The broker names the queue, so no two runs share one. + const { queue: queueName } = await channel.assertQueue('', { durable: false, exclusive: true }); await channel.bindQueue(queueName, exchangeName, 'order.created.#'); // Publish before consuming, so the broker sends `BasicConsumeOk` and the delivery back to back. diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts index 5dd002898bff..8ee9c3f007cb 100644 --- a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts @@ -14,6 +14,7 @@ import { URL_FULL, } from '@sentry/conventions/attributes'; import { QUEUE_PROCESS, QUEUE_PUBLISH } from '@sentry/conventions/op'; +import { randomUUID } from 'crypto'; import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner'; @@ -201,18 +202,22 @@ describeWithDockerCompose('amqplib auto-instrumentation', { workingDirectory: [_ createEsmAndCjsTests(__dirname, 'scenario-callback-api.mjs', 'instrument.mjs', (createTestRunner, test) => { test('instruments publish and noAck consume on the callback API', { timeout: 60_000 }, async () => { + // The queue is exclusive, and the broker can still hold the lock of the previous run. + const queueName = `callback-queue-${randomUUID()}`; + await createTestRunner() + .withEnv({ AMQP_QUEUE_NAME: queueName }) .expect({ span: container => { const producerSpan = container.items.find( span => span.attributes[SENTRY_ORIGIN]?.value === 'auto.queue.amqplib.publisher', ); - expect(producerSpan?.name).toBe('send callback-queue'); + expect(producerSpan?.name).toBe(`send ${queueName}`); const consumerSpan = container.items.find( span => span.attributes[SENTRY_ORIGIN]?.value === 'auto.queue.amqplib.consumer', ); - expect(consumerSpan?.name).toBe('process callback-queue'); + expect(consumerSpan?.name).toBe(`process ${queueName}`); expect(consumerSpan?.status).toBe('ok'); }, })