From 9a89d5232e9392e5c36497c77b09d6e8d61ab94b Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 22 Nov 2022 20:04:40 +0100 Subject: [PATCH 1/6] List the machine-id as potential source for a unique host.id Signed-off-by: svrnm --- semantic_conventions/resource/host.yaml | 3 ++- specification/resource/semantic_conventions/host.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/semantic_conventions/resource/host.yaml b/semantic_conventions/resource/host.yaml index 50439c5431f..67ef654052a 100644 --- a/semantic_conventions/resource/host.yaml +++ b/semantic_conventions/resource/host.yaml @@ -9,7 +9,8 @@ groups: type: string brief: > Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. - examples: ['opentelemetry-test'] + For linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. + examples: ['fdbf79e8af94cb7f9e8df36789187052'] - id: name type: string brief: > diff --git a/specification/resource/semantic_conventions/host.md b/specification/resource/semantic_conventions/host.md index 847d58b7f6d..0d97f5ecb9a 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -9,7 +9,7 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. | `opentelemetry-test` | Recommended | +| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | | `host.name` | string | 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` | Recommended | | `host.type` | string | Type of host. For Cloud, this must be the machine type. | `n1-standard-1` | Recommended | | `host.arch` | string | The CPU architecture the host system is running on. | `amd64` | Recommended | From f8dd9ed1fcaa32523c142eb9d6f8afc0f9379e61 Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 22 Nov 2022 21:01:42 +0100 Subject: [PATCH 2/6] s/linux/Linux Signed-off-by: svrnm --- semantic_conventions/resource/host.yaml | 2 +- specification/resource/semantic_conventions/host.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/semantic_conventions/resource/host.yaml b/semantic_conventions/resource/host.yaml index 67ef654052a..593aae9a2b7 100644 --- a/semantic_conventions/resource/host.yaml +++ b/semantic_conventions/resource/host.yaml @@ -9,7 +9,7 @@ groups: type: string brief: > Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. - For linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. + For Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. examples: ['fdbf79e8af94cb7f9e8df36789187052'] - id: name type: string diff --git a/specification/resource/semantic_conventions/host.md b/specification/resource/semantic_conventions/host.md index 0d97f5ecb9a..6e0ec832a59 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -9,7 +9,7 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | +| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | | `host.name` | string | 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` | Recommended | | `host.type` | string | Type of host. For Cloud, this must be the machine type. | `n1-standard-1` | Recommended | | `host.arch` | string | The CPU architecture the host system is running on. | `amd64` | Recommended | From dbfcdbde87cc3595a907cff96eb1f917cc0ced11 Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 23 Nov 2022 08:58:52 +0100 Subject: [PATCH 3/6] Add 'non-containerised' to host.id description Signed-off-by: svrnm --- semantic_conventions/resource/host.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic_conventions/resource/host.yaml b/semantic_conventions/resource/host.yaml index 593aae9a2b7..2e38c1c4a20 100644 --- a/semantic_conventions/resource/host.yaml +++ b/semantic_conventions/resource/host.yaml @@ -9,7 +9,7 @@ groups: type: string brief: > Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. - For Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. + For non-containerised Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. examples: ['fdbf79e8af94cb7f9e8df36789187052'] - id: name type: string From c639eb5d1037b0e1c3cfa1892ec0053313082fdd Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 23 Nov 2022 08:59:31 +0100 Subject: [PATCH 4/6] Add 'non-containerised' to host.id description (update table) Signed-off-by: svrnm --- 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 6e0ec832a59..fe878c812b2 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -9,7 +9,7 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | +| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For non-containerised Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | | `host.name` | string | 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` | Recommended | | `host.type` | string | Type of host. For Cloud, this must be the machine type. | `n1-standard-1` | Recommended | | `host.arch` | string | The CPU architecture the host system is running on. | `amd64` | Recommended | From c153f5a708dbdc07691b322eacc1ad7451ec24a0 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 28 Nov 2022 19:50:14 +0100 Subject: [PATCH 5/6] Update semantic_conventions/resource/host.yaml Co-authored-by: Armin Ruech --- semantic_conventions/resource/host.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic_conventions/resource/host.yaml b/semantic_conventions/resource/host.yaml index 2e38c1c4a20..cdf361a4e5f 100644 --- a/semantic_conventions/resource/host.yaml +++ b/semantic_conventions/resource/host.yaml @@ -9,7 +9,7 @@ groups: type: string brief: > Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. - For non-containerised Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. + For non-containerized Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. examples: ['fdbf79e8af94cb7f9e8df36789187052'] - id: name type: string From 076548606e3a1d703f05f8fe2e4b57e56b816317 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 28 Nov 2022 19:50:24 +0100 Subject: [PATCH 6/6] 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 fe878c812b2..c993d099148 100644 --- a/specification/resource/semantic_conventions/host.md +++ b/specification/resource/semantic_conventions/host.md @@ -9,7 +9,7 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For non-containerised Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | +| `host.id` | string | Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For non-containerized Linux systems, the `machine-id` located in `/etc/machine-id` or `/var/lib/dbus/machine-id` may be used. | `fdbf79e8af94cb7f9e8df36789187052` | Recommended | | `host.name` | string | 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` | Recommended | | `host.type` | string | Type of host. For Cloud, this must be the machine type. | `n1-standard-1` | Recommended | | `host.arch` | string | The CPU architecture the host system is running on. | `amd64` | Recommended |