Skip to content

Commit 68d0733

Browse files
committed
genericPool
1 parent 616c391 commit 68d0733

File tree

3 files changed

+39
-38
lines changed

3 files changed

+39
-38
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import * as Sentry from '@sentry/node';
2+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
3+
4+
Sentry.init({
5+
dsn: 'https://[email protected]/1337',
6+
release: '1.0',
7+
tracesSampleRate: 1.0,
8+
transport: loggingTransport,
9+
});

dev-packages/node-integration-tests/suites/tracing/genericPool/scenario.js renamed to dev-packages/node-integration-tests/suites/tracing/genericPool/scenario.mjs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
2-
const Sentry = require('@sentry/node');
3-
4-
Sentry.init({
5-
dsn: 'https://[email protected]/1337',
6-
release: '1.0',
7-
tracesSampleRate: 1.0,
8-
transport: loggingTransport,
9-
});
1+
import * as Sentry from '@sentry/node';
2+
import genericPool from 'generic-pool';
3+
import mysql from 'mysql';
104

115
// Stop the process from exiting before the transaction is sent
126
setInterval(() => {}, 1000);
137

14-
const mysql = require('mysql');
15-
const genericPool = require('generic-pool');
16-
178
const factory = {
189
create: function () {
1910
return mysql.createConnection({
@@ -67,5 +58,4 @@ async function run() {
6758
);
6859
}
6960

70-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
7161
run();
Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
1-
import { afterAll, describe, expect, test } from 'vitest';
2-
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
1+
import { afterAll, describe, expect } from 'vitest';
2+
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
33

44
describe('genericPool auto instrumentation', () => {
55
afterAll(() => {
66
cleanupChildProcesses();
77
});
88

9-
test('should auto-instrument `genericPool` package when calling pool.require()', async () => {
10-
const EXPECTED_TRANSACTION = {
11-
transaction: 'Test Transaction',
12-
spans: expect.arrayContaining([
13-
expect.objectContaining({
14-
description: expect.stringMatching(/^generic-pool\.ac?quire/),
15-
origin: 'auto.db.otel.generic_pool',
16-
data: {
17-
'sentry.origin': 'auto.db.otel.generic_pool',
18-
},
19-
status: 'ok',
20-
}),
9+
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
10+
test('should auto-instrument `genericPool` package when calling pool.require()', async () => {
11+
const EXPECTED_TRANSACTION = {
12+
transaction: 'Test Transaction',
13+
spans: expect.arrayContaining([
14+
expect.objectContaining({
15+
description: expect.stringMatching(/^generic-pool\.ac?quire/),
16+
origin: 'auto.db.otel.generic_pool',
17+
data: {
18+
'sentry.origin': 'auto.db.otel.generic_pool',
19+
},
20+
status: 'ok',
21+
}),
2122

22-
expect.objectContaining({
23-
description: expect.stringMatching(/^generic-pool\.ac?quire/),
24-
origin: 'auto.db.otel.generic_pool',
25-
data: {
26-
'sentry.origin': 'auto.db.otel.generic_pool',
27-
},
28-
status: 'ok',
29-
}),
30-
]),
31-
};
23+
expect.objectContaining({
24+
description: expect.stringMatching(/^generic-pool\.ac?quire/),
25+
origin: 'auto.db.otel.generic_pool',
26+
data: {
27+
'sentry.origin': 'auto.db.otel.generic_pool',
28+
},
29+
status: 'ok',
30+
}),
31+
]),
32+
};
3233

33-
await createRunner(__dirname, 'scenario.js').expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
34+
await createRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
35+
});
3436
});
3537
});

0 commit comments

Comments
 (0)