Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
restart: always
container_name: integration-tests-tedious
ports:
- '1433:1433'
- '1433:1338'
environment:
ACCEPT_EULA: 'Y'
MSSQL_SA_PASSWORD: 'TESTing123'
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Sentry.init({

const { Connection, Request } = require('tedious');

const config = {
const connection = new Connection({
Copy link
Member Author

Choose a reason for hiding this comment

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

I changed this because I get TS autocomplete when passing the object in directly (note that this is a js file, so importing types is annoying).

server: '127.0.0.1',
authentication: {
type: 'default',
Expand All @@ -20,12 +20,10 @@ const config = {
},
},
options: {
port: 1433,
port: 1338,
encrypt: false,
},
};

const connection = new Connection(config);
});

function executeAllStatements(span) {
executeStatement('SELECT 1 + 1 AS solution', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';

describe('tedious auto instrumentation', {timeout: 75_000}, () => {
describe('tedious auto instrumentation', { timeout: 75_000 }, () => {
afterAll(() => {
cleanupChildProcesses();
});
Expand All @@ -20,7 +20,7 @@ describe('tedious auto instrumentation', {timeout: 75_000}, () => {
'db.system': 'mssql',
'db.user': 'sa',
'net.peer.name': '127.0.0.1',
'net.peer.port': 1433,
'net.peer.port': 1338,
}),
status: 'ok',
}),
Expand All @@ -34,15 +34,15 @@ describe('tedious auto instrumentation', {timeout: 75_000}, () => {
'db.system': 'mssql',
'db.user': 'sa',
'net.peer.name': '127.0.0.1',
'net.peer.port': 1433,
'net.peer.port': 1338,
}),
status: 'ok',
}),
]),
};

await createRunner(__dirname, 'scenario.js')
.withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['1433'] })
.withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['1338'] })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
Expand Down
Loading