Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bb771aa

Browse files
authored
test: remove get-port usage in grpc and molecular tests (#6540)
The tests instead rely on native port assignment.
1 parent 016c112 commit bb771aa

File tree

6 files changed

+16
-36
lines changed

6 files changed

+16
-36
lines changed

packages/datadog-plugin-grpc/test/client.spec.js

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const { expect } = require('chai')
4-
const { describe, it, beforeEach, afterEach } = require('mocha')
4+
const { describe, it, afterEach } = require('mocha')
55
const semver = require('semver')
66

77
const path = require('node:path')
@@ -18,10 +18,9 @@ const pkgs = nodeMajor > 14 ? ['@grpc/grpc-js'] : ['grpc', '@grpc/grpc-js']
1818

1919
describe('Plugin', () => {
2020
let grpc
21-
let port
21+
let port = 0
2222
let server
2323
let tracer
24-
let getPort
2524

2625
const clientBuilders = {
2726
protobuf: buildProtoClient,
@@ -42,16 +41,17 @@ describe('Plugin', () => {
4241
ClientService = ClientService || TestService
4342

4443
if (server.bindAsync) {
45-
server.bindAsync(`127.0.0.1:${port}`, grpc.ServerCredentials.createInsecure(), (err) => {
44+
server.bindAsync('127.0.0.1:0', grpc.ServerCredentials.createInsecure(), (err, boundPort) => {
4645
if (err) return reject(err)
46+
port = boundPort
4747

4848
server.addService(TestService.service, service)
4949
server.start()
5050

5151
resolve(new ClientService(`127.0.0.1:${port}`, grpc.credentials.createInsecure()))
5252
})
5353
} else {
54-
server.bind(`127.0.0.1:${port}`, grpc.ServerCredentials.createInsecure())
54+
port = server.bind('127.0.0.1:0', grpc.ServerCredentials.createInsecure())
5555
server.addService(TestService.service, service)
5656
server.start()
5757

@@ -73,17 +73,7 @@ describe('Plugin', () => {
7373
return buildGenericService(service, TestService, ClientService)
7474
}
7575

76-
before(async () => {
77-
getPort = (await import('get-port')).default
78-
})
79-
8076
describe('grpc/client', () => {
81-
beforeEach(() => {
82-
return getPort().then(newPort => {
83-
port = newPort
84-
})
85-
})
86-
8777
afterEach(() => {
8878
server.forceShutdown()
8979
})

packages/datadog-plugin-grpc/test/integration-test/client.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('esm', () => {
1717
withVersions('grpc', '@grpc/grpc-js', version => {
1818
before(async function () {
1919
this.timeout(20000)
20-
sandbox = await createSandbox([`'@grpc/grpc-js@${version}'`, '@grpc/proto-loader', 'get-port@^3.2.0'], false, [
20+
sandbox = await createSandbox([`'@grpc/grpc-js@${version}'`, '@grpc/proto-loader'], false, [
2121
'./packages/datadog-plugin-grpc/test/*'])
2222
})
2323

packages/datadog-plugin-grpc/test/integration-test/server.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import 'dd-trace/init.js'
22
import * as grpc from '@grpc/grpc-js'
33
import * as protoLoader from '@grpc/proto-loader'
44
import path from 'path'
5-
import getPort from 'get-port'
65

76
const currentDirectoryPath = path.dirname(new URL(import.meta.url).pathname)
87
const parentDirectoryPath = path.resolve(currentDirectoryPath, '..')
98

109
let server
11-
const port = await getPort()
10+
let port
1211

1312
function buildClient (service, callback) {
1413
service = Object.assign(
@@ -28,16 +27,17 @@ function buildClient (service, callback) {
2827

2928
return new Promise((resolve, reject) => {
3029
if (server.bindAsync) {
31-
server.bindAsync(`127.0.0.1:${port}`, grpc.ServerCredentials.createInsecure(), (err) => {
30+
server.bindAsync('127.0.0.1:0', grpc.ServerCredentials.createInsecure(), (err, boundPort) => {
3231
if (err) return reject(err)
32+
port = boundPort
3333

3434
server.addService(TestService.service, service)
3535
server.start()
3636

3737
resolve(new TestService(`127.0.0.1:${port}`, grpc.credentials.createInsecure()))
3838
})
3939
} else {
40-
server.bind(`127.0.0.1:${port}`, grpc.ServerCredentials.createInsecure())
40+
port = server.bind('127.0.0.1:0', grpc.ServerCredentials.createInsecure())
4141
server.addService(TestService.service, service)
4242
server.start()
4343

packages/datadog-plugin-grpc/test/server.spec.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ const pkgs = nodeMajor > 14 ? ['@grpc/grpc-js'] : ['grpc', '@grpc/grpc-js']
1616

1717
describe('Plugin', () => {
1818
let grpc
19-
let port
19+
let port = 0
2020
let server
2121
let tracer
2222
let call
23-
let getPort
2423

2524
function buildClient (service, callback) {
2625
service = Object.assign({
@@ -38,16 +37,17 @@ describe('Plugin', () => {
3837

3938
return new Promise((resolve, reject) => {
4039
if (server.bindAsync) {
41-
server.bindAsync(`0.0.0.0:${port}`, grpc.ServerCredentials.createInsecure(), (err) => {
40+
server.bindAsync('0.0.0.0:0', grpc.ServerCredentials.createInsecure(), (err, boundPort) => {
4241
if (err) return reject(err)
42+
port = boundPort
4343

4444
server.addService(TestService.service, service)
4545
server.start()
4646

4747
resolve(new TestService(`localhost:${port}`, grpc.credentials.createInsecure()))
4848
})
4949
} else {
50-
server.bind(`0.0.0.0:${port}`, grpc.ServerCredentials.createInsecure())
50+
port = server.bind('0.0.0.0:0', grpc.ServerCredentials.createInsecure())
5151
server.addService(TestService.service, service)
5252
server.start()
5353

@@ -56,16 +56,9 @@ describe('Plugin', () => {
5656
})
5757
}
5858

59-
before(async () => {
60-
getPort = (await import('get-port')).default
61-
})
62-
6359
describe('grpc/server', () => {
6460
beforeEach(() => {
6561
call = null
66-
return getPort().then(newPort => {
67-
port = newPort
68-
})
6962
})
7063

7164
afterEach(() => {

packages/datadog-plugin-moleculer/test/integration-test/client.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('esm', () => {
1717
withVersions('moleculer', 'moleculer', '>0.14.0', version => {
1818
before(async function () {
1919
this.timeout(20000)
20-
sandbox = await createSandbox([`'moleculer@${version}'`, 'get-port'], false, [
20+
sandbox = await createSandbox([`'moleculer@${version}'`], false, [
2121
'./packages/datadog-plugin-moleculer/test/integration-test/*'])
2222
})
2323

packages/datadog-plugin-moleculer/test/integration-test/server.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import 'dd-trace/init.js'
22
import { ServiceBroker } from 'moleculer'
3-
import getPort from 'get-port'
4-
5-
const port = await getPort()
63

74
const broker = new ServiceBroker({
85
namespace: 'multi',
96
nodeID: `server-${process.pid}`,
107
logger: false,
11-
transporter: `tcp://127.0.0.1:${port}/server-${process.pid}`
8+
transporter: `tcp://127.0.0.1:0/server-${process.pid}`
129
})
1310

1411
broker.createService({

0 commit comments

Comments
 (0)