Skip to content

test: fixed mssql docker image #2307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kirrg001 merged 1 commit into from
Jan 23, 2026
Merged

test: fixed mssql docker image #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions docker-compose-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,13 @@ services:
POSTGRES_DB: nodedb

mssql:
image: mcr.microsoft.com/mssql/server:2022-latest
platform: linux/amd64
image: mcr.microsoft.com/azure-sql-edge:1.0.7
Copy link
Copy Markdown
Contributor

@aryamohanan aryamohanan Jan 23, 2026

Choose a reason for hiding this comment

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

Image working fine in my local ❤️

platform: linux/arm64
ports:
- 1433:1433
environment:
ACCEPT_EULA: Y
SA_PASSWORD: stanCanHazMsSQL1
MSSQL_PID: Express
MSSQL_SA_PASSWORD: stanCanHazMsSQL1

rabbitmq:
image: rabbitmq:3.7.8-alpine
Expand Down
18 changes: 10 additions & 8 deletions packages/collector/test/tracing/databases/mssql/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,23 @@ sql.on('error', err => {
log(err);
});

const dbHost = process.env.AZURE_SQL_SERVER;
const dbUser = process.env.AZURE_SQL_USERNAME;
const dbPassword = process.env.AZURE_SQL_PWD;
const userTable = process.env.AZURE_USER_TABLE;
const procedureName = process.env.AZURE_PROCEDURE_NAME;

const dbHost = process.env.AZURE_SQL_SERVER || process.env.MSSQL_HOST;
Copy link
Copy Markdown
Contributor Author

@kirrg001 kirrg001 Jan 22, 2026

Choose a reason for hiding this comment

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

We use AZURE_SQL_SERVER on CI and MSSQL_HOST locally.
Anyone interested to clean this up?

Copy link
Copy Markdown
Contributor

@aryamohanan aryamohanan Jan 23, 2026

Choose a reason for hiding this comment

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

I can open a small PR to clean this up once it’s merged.

const dbUser = process.env.AZURE_SQL_USERNAME || process.env.MSSQL_USER;
const dbPassword = process.env.AZURE_SQL_PWD || process.env.MSSQL_PW;
const userTable = process.env.AZURE_USER_TABLE || process.env.MSSQL_USER_TABLE;
const procedureName = process.env.AZURE_PROCEDURE_NAME || process.env.MSSQL_PROCEDURE_NAME;
const database = process.env.AZURE_SQL_DATABASE || process.env.MSSQL_DB;

const isLocalHost = dbHost === 'localhost' || dbHost === '127.0.0.1';
const connectConfigBase = {
user: dbUser,
password: dbPassword,
server: dbHost,
port: 1433,
database: process.env.AZURE_SQL_DATABASE,
database: database,
options: {
encrypt: true,
trustServerCertificate: false
trustServerCertificate: isLocalHost
}
};

Expand Down
14 changes: 10 additions & 4 deletions packages/collector/test/tracing/databases/mssql/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,10 +694,16 @@ describe('tracing/mssql', function () {
expect(span.ec).to.equal(error ? 1 : 0);
expect(span.data).to.exist;
expect(span.data.mssql).to.exist;
expect(span.data.mssql.host).to.contain('nodejs-team-db-server.database.window');
expect(span.data.mssql.port).to.equal(1433);
expect(span.data.mssql.user).to.equal('admin@instana@nodejs-team-db-server');
expect(span.data.mssql.db).to.equal('azure-nodejs-test');

if (process.env.AZURE_SQL_SERVER) {
expect(span.data.mssql.host).to.contain('nodejs-team-db-server.database.window');
expect(span.data.mssql.user).to.equal('admin@instana@nodejs-team-db-server');
expect(span.data.mssql.db).to.equal('azure-nodejs-test');
} else {
expect(span.data.mssql.host).to.match(/^(localhost|127\.0\.0\.1)$/);
expect(span.data.mssql.user).to.equal('sa');
expect(span.data.mssql.db === undefined || span.data.mssql.db === 'master').to.be.true;
}
}
});
});
Expand Down