remove system.cpu.logical_number

open-telemetry · Feb 10, 2025 · 439b377 · 439b377
1 parent a0b6467
commit 439b377
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/docs/attributes-registry/system.md b/docs/attributes-registry/system.md
@@ -4,7 +4,6 @@
 # System
 
 - [General System Attributes](#general-system-attributes)
-- [System CPU Attributes](#system-cpu-attributes)
 - [Filesystem Attributes](#filesystem-attributes)
 - [System Memory Attributes](#system-memory-attributes)
 - [System Paging Attributes](#system-paging-attributes)
@@ -19,14 +18,6 @@ Describes System attributes
 |---|---|---|---|---|
 | <a id="system-device" href="#system-device">`system.device`</a> | string | The device identifier | `(identifier)` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 
-## System CPU Attributes
-
-Describes System CPU attributes
-
-| Attribute | Type | Description | Examples | Stability |
-|---|---|---|---|---|
-| <a id="system-cpu-logical-number" href="#system-cpu-logical-number">`system.cpu.logical_number`</a> | int | The logical CPU number [0..n-1] | `1` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-
 ## Filesystem Attributes
 
 Describes Filesystem attributes

diff --git a/docs/system/cpu-metrics.md b/docs/system/cpu-metrics.md
@@ -1,4 +1,3 @@
-
 <!--- Hugo front matter used to generate the website version of this page:
 linkTitle: CPU
 --->
@@ -15,6 +14,7 @@ in OpenTelemetry.
 - [CPU Metrics](#cpu-metrics)
   - [Metric: `cpu.time`](#metric-cputime)
   - [Metric: `cpu.utilization`](#metric-cpuutilization)
+  - [Metric: `cpu.frequency`](#metric-cpufrequency)
 
 <!-- tocstop -->
 
@@ -127,3 +127,7 @@ This metric is [recommended][MetricRecommended].
 <!-- prettier-ignore-end -->
 <!-- END AUTOGENERATED TEXT -->
 <!-- endsemconv -->
+
+[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status
+[MetricOptIn]: /docs/general/metric-requirement-level.md#opt-in
+[MetricRecommended]: /docs/general/metric-requirement-level.md#recommended
diff --git a/model/system/registry.yaml b/model/system/registry.yaml
@@ -10,17 +10,6 @@ groups:
         stability: experimental
         brief: "The device identifier"
         examples: ["(identifier)"]
-  # system.cpu.* attribute group
-  - id: registry.system.cpu
-    type: attribute_group
-    display_name: System CPU Attributes
-    brief: "Describes System CPU attributes"
-    attributes:
-      - id: system.cpu.logical_number
-        type: int
-        stability: experimental
-        brief: "The logical CPU number [0..n-1]"
-        examples: [1]
   # system.memory.* attribute group
   - id: registry.system.memory
     type: attribute_group

diff --git a/schema-next.yaml b/schema-next.yaml
@@ -7,6 +7,15 @@ versions:
         - rename_metrics:
             k8s.replication_controller.desired_pods: k8s.replicationcontroller.desired_pods
             k8s.replication_controller.available_pods: k8s.replicationcontroller.available_pods
+        # https://github.com/open-telemetry/semantic-conventions/pull/1896
+        - rename_metrics:
+            system.cpu.time: cpu.time
+            system.cpu.utilization: cpu.utilization
+            system.cpu.frequency: cpu.frequency
+        # https://github.com/open-telemetry/semantic-conventions/pull/1896
+        - rename_attributes:
+            attribute_map:
+              system.cpu.logical_number: cpu.logical_number
   1.30.0:
     all:
       changes: