Skip to content

Commit dd8ef03

Browse files
authored
test: fixed mssql docker image (#2307)
refs https://jsw.ibm.com/browse/INSTA-73218 I got segmentation fault when starting the container.
1 parent e1f8a76 commit dd8ef03

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

docker-compose-base.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,13 @@ services:
164164
POSTGRES_DB: nodedb
165165

166166
mssql:
167-
image: mcr.microsoft.com/mssql/server:2022-latest
168-
platform: linux/amd64
167+
image: mcr.microsoft.com/azure-sql-edge:1.0.7
168+
platform: linux/arm64
169169
ports:
170170
- 1433:1433
171171
environment:
172172
ACCEPT_EULA: Y
173-
SA_PASSWORD: stanCanHazMsSQL1
174-
MSSQL_PID: Express
173+
MSSQL_SA_PASSWORD: stanCanHazMsSQL1
175174

176175
rabbitmq:
177176
image: rabbitmq:3.7.8-alpine

packages/collector/test/tracing/databases/mssql/app.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,23 @@ sql.on('error', err => {
3434
log(err);
3535
});
3636

37-
const dbHost = process.env.AZURE_SQL_SERVER;
38-
const dbUser = process.env.AZURE_SQL_USERNAME;
39-
const dbPassword = process.env.AZURE_SQL_PWD;
40-
const userTable = process.env.AZURE_USER_TABLE;
41-
const procedureName = process.env.AZURE_PROCEDURE_NAME;
42-
37+
const dbHost = process.env.AZURE_SQL_SERVER || process.env.MSSQL_HOST;
38+
const dbUser = process.env.AZURE_SQL_USERNAME || process.env.MSSQL_USER;
39+
const dbPassword = process.env.AZURE_SQL_PWD || process.env.MSSQL_PW;
40+
const userTable = process.env.AZURE_USER_TABLE || process.env.MSSQL_USER_TABLE;
41+
const procedureName = process.env.AZURE_PROCEDURE_NAME || process.env.MSSQL_PROCEDURE_NAME;
42+
const database = process.env.AZURE_SQL_DATABASE || process.env.MSSQL_DB;
43+
44+
const isLocalHost = dbHost === 'localhost' || dbHost === '127.0.0.1';
4345
const connectConfigBase = {
4446
user: dbUser,
4547
password: dbPassword,
4648
server: dbHost,
4749
port: 1433,
48-
database: process.env.AZURE_SQL_DATABASE,
50+
database: database,
4951
options: {
5052
encrypt: true,
51-
trustServerCertificate: false
53+
trustServerCertificate: isLocalHost
5254
}
5355
};
5456

packages/collector/test/tracing/databases/mssql/test.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,16 @@ describe('tracing/mssql', function () {
694694
expect(span.ec).to.equal(error ? 1 : 0);
695695
expect(span.data).to.exist;
696696
expect(span.data.mssql).to.exist;
697-
expect(span.data.mssql.host).to.contain('nodejs-team-db-server.database.window');
698-
expect(span.data.mssql.port).to.equal(1433);
699-
expect(span.data.mssql.user).to.equal('admin@instana@nodejs-team-db-server');
700-
expect(span.data.mssql.db).to.equal('azure-nodejs-test');
697+
698+
if (process.env.AZURE_SQL_SERVER) {
699+
expect(span.data.mssql.host).to.contain('nodejs-team-db-server.database.window');
700+
expect(span.data.mssql.user).to.equal('admin@instana@nodejs-team-db-server');
701+
expect(span.data.mssql.db).to.equal('azure-nodejs-test');
702+
} else {
703+
expect(span.data.mssql.host).to.match(/^(localhost|127\.0\.0\.1)$/);
704+
expect(span.data.mssql.user).to.equal('sa');
705+
expect(span.data.mssql.db === undefined || span.data.mssql.db === 'master').to.be.true;
706+
}
701707
}
702708
});
703709
});

0 commit comments

Comments
 (0)