Skip to content
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

fix(dns): remove lookupPromise polyfill for node8 dns promise tests #1223

Merged
merged 3 commits into from
Oct 10, 2022
Merged

fix(dns): remove lookupPromise polyfill for node8 dns promise tests #1223

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12bbefd
fix(dns): remove lookupPromise polyfill for node8 dns promise tests
evantorrie Oct 9, 2022
b10017d
chore(lint): eliminate unused type parameter in dns instrumentation
evantorrie Oct 9, 2022
25bffa1
Merge branch 'main' into dns-node8-removal
rauno56 Oct 10, 2022
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
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const setLookupAttributes = (
* @param obj obj to inspect
* @param pattern Match pattern
*/
export const satisfiesPattern = <T>(
export const satisfiesPattern = (
constant: string,
pattern: IgnoreMatcher
): boolean => {
Expand Down
33 changes: 8 additions & 25 deletions plugins/node/opentelemetry-instrumentation-dns/test/integrations/dnspromise-lookup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,6 @@ const memoryExporter = new InMemorySpanExporter();
const provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));

async function lookupPromise(
hostname: string,
options: dns.LookupOptions = {}
): Promise<any> {
return new Promise((resolve, reject) => {
dns.lookup(hostname, options, (err, address, family) => {
if (err) reject(err);
if (options.all) {
resolve(address);
} else {
resolve({ address, family });
}
});
});
}

describe('dns.promises.lookup()', () => {
let instrumentation: DnsInstrumentation;

Expand Down Expand Up @@ -83,7 +67,7 @@ describe('dns.promises.lookup()', () => {
[4, 6].forEach(ipversion => {
it(`should export a valid span with "family" arg to ${ipversion}`, async () => {
const hostname = 'google.com';
const { address, family } = await lookupPromise(hostname, {
const { address, family } = await dns.promises.lookup(hostname, {
family: ipversion,
});
assert.ok(address);
Expand All @@ -100,7 +84,7 @@ describe('dns.promises.lookup()', () => {
describe('with no options param', () => {
it('should export a valid span', async () => {
const hostname = 'google.com';
const { address, family } = await lookupPromise(hostname);
const { address, family } = await dns.promises.lookup(hostname);

assert.ok(address);
assert.ok(family);
Expand All @@ -119,7 +103,7 @@ describe('dns.promises.lookup()', () => {
it('should export a valid span with error NOT_FOUND', async () => {
const hostname = 'ᚕ';
try {
await lookupPromise(hostname);
await dns.promises.lookup(hostname);
assert.fail();
} catch (error) {
const spans = memoryExporter.getFinishedSpans();
Expand All @@ -141,7 +125,7 @@ describe('dns.promises.lookup()', () => {
it('should export a valid span with error INVALID_ARGUMENT when "family" param is equal to -1', async () => {
const hostname = 'google.com';
try {
await lookupPromise(hostname, { family: -1 });
await dns.promises.lookup(hostname, { family: -1 });
assert.fail();
} catch (error) {
const spans = memoryExporter.getFinishedSpans();
Expand All @@ -163,8 +147,7 @@ describe('dns.promises.lookup()', () => {
it('should export a valid span with error INVALID_ARGUMENT when "hostname" param is a number', async () => {
const hostname = 1234;
try {
// tslint:disable-next-line:no-any
await lookupPromise(hostname as any, { family: 4 });
await dns.promises.lookup(hostname as any, { family: 4 });
assert.fail();
} catch (error) {
const spans = memoryExporter.getFinishedSpans();
Expand All @@ -187,7 +170,7 @@ describe('dns.promises.lookup()', () => {
[4, 6].forEach(ipversion => {
it(`should export a valid span with "family" to ${ipversion}`, async () => {
const hostname = 'google.com';
const { address, family } = await lookupPromise(hostname, {
const { address, family } = await dns.promises.lookup(hostname, {
family: ipversion,
});

Expand All @@ -203,7 +186,7 @@ describe('dns.promises.lookup()', () => {

it(`should export a valid span when setting "verbatim" property to true and "family" to ${ipversion}`, async () => {
const hostname = 'google.com';
const { address, family } = await lookupPromise(hostname, {
const { address, family } = await dns.promises.lookup(hostname, {
family: ipversion,
verbatim: true,
});
Expand All @@ -221,7 +204,7 @@ describe('dns.promises.lookup()', () => {

it('should export a valid span when setting "all" property to true', async () => {
const hostname = 'montreal.ca';
const addresses = await lookupPromise(hostname, { all: true });
const addresses = await dns.promises.lookup(hostname, { all: true });

assert.ok(addresses instanceof Array);

Expand Down