From 6d2bc36975c61514d4aa63fd2187c11c63512b2c Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 9 Nov 2023 13:58:54 +0100 Subject: [PATCH 1/2] [model/resource] Change `host.cpu.model.family` and `host.cpu.model.id` to be strings --- CHANGELOG.md | 3 +++ docs/resource/host.md | 4 ++-- model/resource/host.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1368259f..2b68e99128 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ release. ### Breaking +- BREAKING: Change type of `host.cpu.model.id` and `host.cpu.model.family` to string. + ([#495](https://github.com/open-telemetry/semantic-conventions/issues/495)) + ### Features ### Fixes diff --git a/docs/resource/host.md b/docs/resource/host.md index f7e2286af5..3bfedb3715 100644 --- a/docs/resource/host.md +++ b/docs/resource/host.md @@ -46,8 +46,8 @@ To report host metrics, the `system.*` namespace SHOULD be used. | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| | `host.cpu.cache.l2.size` | int | The amount of level 2 memory cache available to the processor (in Bytes). | `12288000` | Opt-In | -| `host.cpu.family` | int | Numeric value specifying the family or generation of the CPU. | `6` | Opt-In | -| `host.cpu.model.id` | int | Model identifier. It provides more granular information about the CPU, distinguishing it from other CPUs within the same family. | `6` | Opt-In | +| `host.cpu.family` | string | Family or generation of the CPU. | `6`; `PA-RISC 1.1e` | Opt-In | +| `host.cpu.model.id` | string | Model identifier. It provides more granular information about the CPU, distinguishing it from other CPUs within the same family. | `6`; `9000/778/B180L` | Opt-In | | `host.cpu.model.name` | string | Model designation of the processor. | `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` | Opt-In | | `host.cpu.stepping` | int | Stepping or core revisions. | `1` | Opt-In | | `host.cpu.vendor.id` | string | Processor manufacturer identifier. A maximum 12-character string. [1] | `GenuineIntel` | Opt-In | diff --git a/model/resource/host.yaml b/model/resource/host.yaml index 9b63976db5..9665d09c58 100644 --- a/model/resource/host.yaml +++ b/model/resource/host.yaml @@ -106,17 +106,17 @@ groups: examples: [ 'GenuineIntel' ] - id: family requirement_level: opt_in - type: int + type: string brief: > - Numeric value specifying the family or generation of the CPU. - examples: [ 6 ] + Family or generation of the CPU. + examples: [ '6', 'PA-RISC 1.1e' ] - id: model.id requirement_level: opt_in - type: int + type: string brief: > Model identifier. It provides more granular information about the CPU, distinguishing it from other CPUs within the same family. - examples: [ 6 ] + examples: [ '6', '9000/778/B180L' ] - id: model.name requirement_level: opt_in type: string From a90b0bda0bdebdfccebd934b6ea2c7b00e27a75f Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 13 Nov 2023 10:12:07 +0100 Subject: [PATCH 2/2] Fix merge --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29dc33f4c6..f2657cb0ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ release. ([#317](https://github.com/open-telemetry/semantic-conventions/pull/317)) - BREAKING: Change type of `host.cpu.model.id` and `host.cpu.model.family` to string. ([#495](https://github.com/open-telemetry/semantic-conventions/issues/495)) - + ### Features - Add `code.stacktrace` attribute