Merge branch 'main' into 1600-cicd-metrics

.chloggen/improve_cpu_brief.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: system
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Adds note about how `system.cpu.physical.count` and `system.cpu.logical.count` are calculated
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1780]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/profile-frame-type-beam.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: profile
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: 'Extend the list of known frame types with a value for Erlang'
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1735]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

docs/attributes-registry/profile.md

@@ -20,6 +20,7 @@ Describes the origin of a single frame in a Profile.
 
 | Value  | Description | Stability |
 |---|---|---|
+| `beam` | [Erlang](https://en.wikipedia.org/wiki/BEAM_(Erlang_virtual_machine)) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `cpython` | [Python](https://wikipedia.org/wiki/Python_(programming_language)) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `dotnet` | [.NET](https://wikipedia.org/wiki/.NET) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `jvm` | [JVM](https://wikipedia.org/wiki/Java_virtual_machine) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

docs/general/profiles.md

@@ -36,6 +36,7 @@ They may be used in any Profiles record they apply to.
 
 | Value  | Description | Stability |
 |---|---|---|
+| `beam` | [Erlang](https://en.wikipedia.org/wiki/BEAM_(Erlang_virtual_machine)) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `cpython` | [Python](https://wikipedia.org/wiki/Python_(programming_language)) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `dotnet` | [.NET](https://wikipedia.org/wiki/.NET) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `jvm` | [JVM](https://wikipedia.org/wiki/Java_virtual_machine) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

docs/system/system-metrics.md

@@ -201,7 +201,9 @@ This metric is [recommended][MetricRecommended].
 
 | Name     | Instrument Type | Unit (UCUM) | Description    | Stability |
 | -------- | --------------- | ----------- | -------------- | --------- |
-| `system.cpu.physical.count` | UpDownCounter | `{cpu}` | Reports the number of actual physical processor cores on the hardware | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `system.cpu.physical.count` | UpDownCounter | `{cpu}` | Reports the number of actual physical processor cores on the hardware [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+
+**[1]:** Calculated by multiplying the number of sockets by the number of cores per socket
 
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
@@ -221,7 +223,9 @@ This metric is [recommended][MetricRecommended].
 
 | Name     | Instrument Type | Unit (UCUM) | Description    | Stability |
 | -------- | --------------- | ----------- | -------------- | --------- |
-| `system.cpu.logical.count` | UpDownCounter | `{cpu}` | Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `system.cpu.logical.count` | UpDownCounter | `{cpu}` | Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+
+**[1]:** Calculated by multiplying the number of sockets by the number of cores per socket, and then by the number of threads per core
 
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->

model/profile/registry.yaml

@@ -61,3 +61,8 @@ groups:
                 [V8JS](https://wikipedia.org/wiki/V8_(JavaScript_engine))
               value: "v8js"
               stability: experimental
+            - id: beam
+              brief: >
+                [Erlang](https://en.wikipedia.org/wiki/BEAM_(Erlang_virtual_machine))
+              value: "beam"
+              stability: experimental

model/system/metrics.yaml

@@ -53,6 +53,7 @@ groups:
     metric_name: system.cpu.physical.count
     stability: experimental
     brief: "Reports the number of actual physical processor cores on the hardware"
+    note: "Calculated by multiplying the number of sockets by the number of cores per socket"
     instrument: updowncounter
     unit: "{cpu}"
     attributes: []
@@ -62,6 +63,7 @@ groups:
     metric_name: system.cpu.logical.count
     stability: experimental
     brief: "Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking"
+    note: "Calculated by multiplying the number of sockets by the number of cores per socket, and then by the number of threads per core"
     instrument: updowncounter
     unit: "{cpu}"
     attributes: []