From 79b14ba10db2064790f274e9621b29073cc57b89 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Tue, 18 May 2021 13:15:01 +0200 Subject: [PATCH 1/4] fix: replace net.peer.name with dns.hostname in dns plugin --- .../src/enums/AttributeNames.ts | 1 + .../opentelemetry-instrumentation-dns/src/instrumentation.ts | 4 ++-- .../test/utils/assertSpan.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts index 2364b3769c..ac711cf575 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts @@ -18,4 +18,5 @@ export enum AttributeNames { DNS_ERROR_CODE = 'dns.error_code', DNS_ERROR_NAME = 'dns.error_name', DNS_ERROR_MESSAGE = 'dns.error_message', + DNS_HOSTNAME = 'dns.hostname' } diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts index 3ab8d09657..1e367fd77a 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts @@ -16,7 +16,6 @@ import { LookupAddress } from 'dns'; import { diag, Span, SpanKind } from '@opentelemetry/api'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { InstrumentationBase, InstrumentationNodeModuleDefinition, @@ -33,6 +32,7 @@ import { } from './types'; import * as utils from './utils'; import { VERSION } from './version'; +import { AttributeNames } from './enums/AttributeNames'; /** * Dns instrumentation for Opentelemetry @@ -114,7 +114,7 @@ export class DnsInstrumentation extends InstrumentationBase { const span = plugin.tracer.startSpan(name, { kind: SpanKind.CLIENT, attributes: { - [SemanticAttributes.NET_PEER_NAME]: hostname, + [AttributeNames.DNS_HOSTNAME]: hostname, }, }); diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts index be30c58b32..7311a3eef3 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts @@ -45,7 +45,7 @@ export const assertSpan = ( span.status.message ); assert.strictEqual( - span.attributes[SemanticAttributes.NET_PEER_NAME], + span.attributes[AttributeNames.DNS_HOSTNAME], validations.hostname ); From 288667913f12b1c7f169a5dd826ca3a43ca6e5ca Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Tue, 18 May 2021 13:18:23 +0200 Subject: [PATCH 2/4] fix: run lint fix --- .../src/enums/AttributeNames.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts index ac711cf575..39b9a467bf 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts @@ -18,5 +18,5 @@ export enum AttributeNames { DNS_ERROR_CODE = 'dns.error_code', DNS_ERROR_NAME = 'dns.error_name', DNS_ERROR_MESSAGE = 'dns.error_message', - DNS_HOSTNAME = 'dns.hostname' + DNS_HOSTNAME = 'dns.hostname', } From f5cccd20487cae5bcc531c86daff66de5f1e147b Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Tue, 18 May 2021 14:56:52 +0200 Subject: [PATCH 3/4] fix: remove import for semantic conventions from assertSpan.ts --- .../opentelemetry-instrumentation-dns/test/utils/assertSpan.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts index 7311a3eef3..204f252804 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts @@ -17,7 +17,6 @@ import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api'; import { hrTimeToNanoseconds } from '@opentelemetry/core'; import { ReadableSpan } from '@opentelemetry/tracing'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; import type { LookupAddress } from 'dns'; import { AttributeNames } from '../../src/enums/AttributeNames'; From 0203d9d5218f0b48cb37cf818c551e039d0780da Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Wed, 26 May 2021 13:18:34 +0200 Subject: [PATCH 4/4] fix: remove dns hostname --- .../src/enums/AttributeNames.ts | 1 - .../opentelemetry-instrumentation-dns/src/instrumentation.ts | 4 ---- .../test/utils/assertSpan.ts | 4 ---- 3 files changed, 9 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts index 39b9a467bf..2364b3769c 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts @@ -18,5 +18,4 @@ export enum AttributeNames { DNS_ERROR_CODE = 'dns.error_code', DNS_ERROR_NAME = 'dns.error_name', DNS_ERROR_MESSAGE = 'dns.error_message', - DNS_HOSTNAME = 'dns.hostname', } diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts index 1e367fd77a..477efd0ca4 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts @@ -32,7 +32,6 @@ import { } from './types'; import * as utils from './utils'; import { VERSION } from './version'; -import { AttributeNames } from './enums/AttributeNames'; /** * Dns instrumentation for Opentelemetry @@ -113,9 +112,6 @@ export class DnsInstrumentation extends InstrumentationBase { const name = utils.getOperationName('lookup'); const span = plugin.tracer.startSpan(name, { kind: SpanKind.CLIENT, - attributes: { - [AttributeNames.DNS_HOSTNAME]: hostname, - }, }); const originalCallback = args[argsCount - 1]; diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts index 204f252804..76a943f033 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts @@ -43,10 +43,6 @@ export const assertSpan = ( span.attributes[AttributeNames.DNS_ERROR_MESSAGE], span.status.message ); - assert.strictEqual( - span.attributes[AttributeNames.DNS_HOSTNAME], - validations.hostname - ); validations.addresses.forEach((_, i) => { assert.strictEqual(