From 1b052301a5f2338051b8d72de05f8c0e9287bdb6 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 19 Aug 2020 15:00:43 -0700 Subject: [PATCH 1/2] Remove duplicate hostname attribute Fixes https://github.com/open-telemetry/opentelemetry-specification/issues/787 Idea from the issue is that we should use `host.name` with either of the proposed values. Signed-off-by: Bogdan Drutu --- specification/resource/semantic_conventions/host.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/resource/semantic_conventions/host.md b/specification/resource/semantic_conventions/host.md index 712ad70506b..025e770e3da 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -6,7 +6,6 @@ | Attribute | Description | Example | |---|---|---| -| host.hostname | Hostname of the host.
It contains what the `hostname` command returns on the host machine. | `opentelemetry-test` | | host.id | Unique host id.
For Cloud this must be the instance_id assigned by the cloud provider | `opentelemetry-test` | | host.name | Name of the host.
It may contain what `hostname` returns on Unix systems, the fully qualified, or a name specified by the user. | `opentelemetry-test` | | host.type | Type of host.
For Cloud this must be the machine type.| `n1-standard-1` | From 6acf009123fda972a18f8f50a8aaf548bebb5df3 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 20 Aug 2020 09:46:23 -0700 Subject: [PATCH 2/2] Update specification/resource/semantic_conventions/host.md Co-authored-by: Armin Ruech --- specification/resource/semantic_conventions/host.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resource/semantic_conventions/host.md b/specification/resource/semantic_conventions/host.md index 025e770e3da..7045de7f251 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -7,7 +7,7 @@ | Attribute | Description | Example | |---|---|---| | host.id | Unique host id.
For Cloud this must be the instance_id assigned by the cloud provider | `opentelemetry-test` | -| host.name | Name of the host.
It may contain what `hostname` returns on Unix systems, the fully qualified, or a name specified by the user. | `opentelemetry-test` | +| host.name | Name of the host.
On Unix systems, it may contain what the `hostname` command returns, or the fully qualified hostname, or another name specified by the user. | `opentelemetry-test` | | host.type | Type of host.
For Cloud this must be the machine type.| `n1-standard-1` | | host.image.name | Name of the VM image or OS install the host was instantiated from. | `infra-ami-eks-worker-node-7d4ec78312`, `CentOS-8-x86_64-1905` | | host.image.id | VM image id. For Cloud, this value is from the provider. | `ami-07b06b442921831e5` |