Skip to content

Commit 9b01e48

Browse files
authored
feat(service-provider-server): log more detailed information about DNS lookups (#1191)
In particular, include whether os-dns-native made lookups using the native OS DNS APIs or not.
1 parent cac1523 commit 9b01e48

File tree

8 files changed

+39
-29
lines changed

8 files changed

+39
-29
lines changed

packages/logging/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/logging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"node": ">=12.4.0"
1818
},
1919
"dependencies": {
20-
"@mongodb-js/devtools-connect": "^1.0.0",
20+
"@mongodb-js/devtools-connect": "^1.1.1",
2121
"@mongosh/errors": "0.0.0-dev.0",
2222
"@mongosh/history": "0.0.0-dev.0",
2323
"@mongosh/types": "0.0.0-dev.0",

packages/logging/src/setup-logger-and-telemetry.spec.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,17 @@ describe('setupLoggerAndTelemetry', () => {
102102
bus.emit('devtools-connect:connect-heartbeat-succeeded', { connectionId: 'localhost' });
103103
bus.emit('devtools-connect:connect-fail-early');
104104
bus.emit('devtools-connect:connect-attempt-finished');
105-
bus.emit('devtools-connect:resolve-srv-error', { from: 'mongodb+srv://foo:[email protected]/', error: new Error('failed'), duringLoad: false });
106-
bus.emit('devtools-connect:resolve-srv-succeeded', { from: 'mongodb+srv://foo:[email protected]/', to: 'mongodb://foo:[email protected]/' });
105+
bus.emit('devtools-connect:resolve-srv-error', {
106+
from: 'mongodb+srv://foo:[email protected]/',
107+
error: new Error('failed'),
108+
duringLoad: false,
109+
resolutionDetails: []
110+
});
111+
bus.emit('devtools-connect:resolve-srv-succeeded', {
112+
from: 'mongodb+srv://foo:[email protected]/',
113+
to: 'mongodb://foo:[email protected]/',
114+
resolutionDetails: []
115+
});
107116
bus.emit('devtools-connect:missing-optional-dependency', { name: 'kerberos', error: new Error('no kerberos') });
108117
bus.emit('mongosh-sp:reset-connection-options');
109118

@@ -201,9 +210,9 @@ describe('setupLoggerAndTelemetry', () => {
201210
expect(logOutput[i++].msg).to.equal('Aborting connection attempt as irrecoverable');
202211
expect(logOutput[i++].msg).to.equal('Connection attempt finished');
203212
expect(logOutput[i].msg).to.equal('Resolving SRV record failed');
204-
expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://<credentials>@hello.world/', error: 'failed', duringLoad: false });
213+
expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://<credentials>@hello.world/', error: 'failed', duringLoad: false, resolutionDetails: [] });
205214
expect(logOutput[i].msg).to.equal('Resolving SRV record succeeded');
206-
expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://<credentials>@hello.world/', to: 'mongodb://<credentials>@db.hello.world/' });
215+
expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://<credentials>@hello.world/', to: 'mongodb://<credentials>@db.hello.world/', resolutionDetails: [] });
207216
expect(logOutput[i].msg).to.equal('Missing optional dependency');
208217
expect(logOutput[i++].attr).to.deep.equal({ name: 'kerberos', error: 'no kerberos' });
209218
expect(logOutput[i++].msg).to.equal('Reconnect because of changed connection options');

packages/node-runtime-worker-thread/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ const config = {
4242
'mongodb-client-encryption': 'commonjs2 mongodb-client-encryption',
4343
kerberos: 'commonjs2 kerberos',
4444
snappy: 'commonjs2 snappy',
45-
interruptor: 'commonjs2 interruptor'
45+
interruptor: 'commonjs2 interruptor',
46+
'os-dns-native': 'commonjs2 os-dns-native',
4647
}
4748
};
4849

packages/service-provider-server/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/service-provider-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
]
3939
},
4040
"dependencies": {
41-
"@mongodb-js/devtools-connect": "^1.0.0",
41+
"@mongodb-js/devtools-connect": "^1.1.1",
4242
"@mongosh/errors": "0.0.0-dev.0",
4343
"@mongosh/service-provider-core": "0.0.0-dev.0",
4444
"@mongosh/types": "0.0.0-dev.0",

packages/types/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"unitTestsOnly": true
3333
},
3434
"dependencies": {
35-
"@mongodb-js/devtools-connect": "^1.0.0"
35+
"@mongodb-js/devtools-connect": "^1.1.1"
3636
}
3737
}

0 commit comments

Comments
 (0)