open-telemetry
/
opentelemetry-js
mirror of https://github.com/open-telemetry/opentelemetry-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: remove duplicate hostname resource attribute (#1581) 

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
This commit is contained in:
Matthew Wear 2020-10-09 08:59:16 -07:00 committed by GitHub
parent e62c4817bc
commit 83e6af093d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/opentelemetry-resource-detector-aws/src/detectors/AwsEc2Detector.ts
View File

@ -71,7 +71,6 @@ class AwsEc2Detector implements Detector {
[HOST_RESOURCE.ID]: instanceId, [HOST_RESOURCE.ID]: instanceId,
[HOST_RESOURCE.TYPE]: instanceType, [HOST_RESOURCE.TYPE]: instanceType,
[HOST_RESOURCE.NAME]: hostname, [HOST_RESOURCE.NAME]: hostname,
[HOST_RESOURCE.HOSTNAME]: hostname,
}); });
} }

6
packages/opentelemetry-resources/src/constants.ts
View File

@ -47,12 +47,6 @@ export const CONTAINER_RESOURCE = {
/** Attributes defining a computing instance (e.g. host). */ /** Attributes defining a computing instance (e.g. host). */
export const HOST_RESOURCE = { export const HOST_RESOURCE = {
/**
* Hostname of the host. It contains what the hostname command returns on the
* host machine.
*/
HOSTNAME: 'host.hostname',
/** /**
* Unique host id. For Cloud this must be the instance_id assigned by the * Unique host id. For Cloud this must be the instance_id assigned by the
* cloud provider * cloud provider

1
packages/opentelemetry-resources/test/resource-assertions.test.ts
View File

@ -89,7 +89,6 @@ describe('assertHostResource', () => {
it('validates optional attributes', () => { it('validates optional attributes', () => {
const resource = new Resource({ const resource = new Resource({
[HOST_RESOURCE.HOSTNAME]: 'opentelemetry-test-hostname',
[HOST_RESOURCE.ID]: 'opentelemetry-test-id', [HOST_RESOURCE.ID]: 'opentelemetry-test-id',
[HOST_RESOURCE.NAME]: 'opentelemetry-test-name', [HOST_RESOURCE.NAME]: 'opentelemetry-test-name',
[HOST_RESOURCE.TYPE]: 'n1-standard-1', [HOST_RESOURCE.TYPE]: 'n1-standard-1',

5
packages/opentelemetry-resources/test/util/resource-assertions.ts
View File

@ -122,11 +122,6 @@ export const assertHostResource = (
} }
) => { ) => {
assertHasOneLabel(HOST_RESOURCE, resource); assertHasOneLabel(HOST_RESOURCE, resource);
if (validations.hostName)
assert.strictEqual(
resource.attributes[HOST_RESOURCE.HOSTNAME],
validations.hostName
);
if (validations.id) if (validations.id)
assert.strictEqual(resource.attributes[HOST_RESOURCE.ID], validations.id); assert.strictEqual(resource.attributes[HOST_RESOURCE.ID], validations.id);
if (validations.name) if (validations.name)