Skip to content

Commit 61a508e

Browse files
committed
Reworked based on review feedback
1 parent 779ece8 commit 61a508e

File tree

5 files changed

+22
-150
lines changed

5 files changed

+22
-150
lines changed

docs/registry/attributes/os.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The operating system (OS) on which the process represented by this resource is r
1212
| <a id="os-build-id" href="#os-build-id">`os.build_id`</a> | string | Unique identifier for a particular build or compilation of the operating system. | `TQ3C.230805.001.B2`; `20E247`; `22621` | ![Development](https://img.shields.io/badge/-development-blue) |
1313
| <a id="os-description" href="#os-description">`os.description`</a> | string | Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. | `Microsoft Windows [Version 10.0.18363.778]`; `Ubuntu 18.04.1 LTS` | ![Development](https://img.shields.io/badge/-development-blue) |
1414
| <a id="os-name" href="#os-name">`os.name`</a> | string | Human readable operating system name. | `iOS`; `Android`; `Ubuntu` | ![Development](https://img.shields.io/badge/-development-blue) |
15-
| <a id="os-type" href="#os-type">`os.type`</a> | string | The operating system type. | `windows`; `linux`; `darwin` | ![Development](https://img.shields.io/badge/-development-blue) |
15+
| <a id="os-type" href="#os-type">`os.type`</a> | string | The operating system type. | `windows`; `linux`; `unix` | ![Development](https://img.shields.io/badge/-development-blue) |
1616
| <a id="os-version" href="#os-version">`os.version`</a> | string | The version string of the operating system as defined in [Version Attributes](/docs/resource/README.md#version-attributes). | `14.2.1`; `18.04.1` | ![Development](https://img.shields.io/badge/-development-blue) |
1717

1818
---
@@ -21,26 +21,5 @@ The operating system (OS) on which the process represented by this resource is r
2121

2222
| Value | Description | Stability |
2323
|---|---|---|
24-
| `aix` | AIX (Advanced Interactive eXecutive) | ![Development](https://img.shields.io/badge/-development-blue) |
25-
| `android` | Android | ![Development](https://img.shields.io/badge/-development-blue) |
26-
| `archlinux` | Arch Linux | ![Development](https://img.shields.io/badge/-development-blue) |
27-
| `centos` | CentOS | ![Development](https://img.shields.io/badge/-development-blue) |
28-
| `chromeos` | ChromeOS | ![Development](https://img.shields.io/badge/-development-blue) |
29-
| `chromiumos` | ChromiumOS | ![Development](https://img.shields.io/badge/-development-blue) |
30-
| `dragonflybsd` | DragonFly BSD | ![Development](https://img.shields.io/badge/-development-blue) |
31-
| `fireos` | Fire OS | ![Development](https://img.shields.io/badge/-development-blue) |
32-
| `freebsd` | FreeBSD | ![Development](https://img.shields.io/badge/-development-blue) |
33-
| `hpux` | HP-UX (Hewlett Packard Unix) | ![Development](https://img.shields.io/badge/-development-blue) |
34-
| `ios` | Apple ios | ![Development](https://img.shields.io/badge/-development-blue) |
35-
| `manjaro` | Manjaro | ![Development](https://img.shields.io/badge/-development-blue) |
36-
| `netbsd` | NetBSD | ![Development](https://img.shields.io/badge/-development-blue) |
37-
| `openbsd` | OpenBSD | ![Development](https://img.shields.io/badge/-development-blue) |
38-
| `rhel` | Red Hat Enterprise Linux | ![Development](https://img.shields.io/badge/-development-blue) |
39-
| `solaris` | SunOS, Oracle Solaris | ![Development](https://img.shields.io/badge/-development-blue) |
40-
| `steamos` | SteamOS | ![Development](https://img.shields.io/badge/-development-blue) |
41-
| `suse` | SUSE Linux Enterprise | ![Development](https://img.shields.io/badge/-development-blue) |
42-
| `tvos` | Apple tvos | ![Development](https://img.shields.io/badge/-development-blue) |
43-
| `ubuntu` | Ubuntu | ![Development](https://img.shields.io/badge/-development-blue) |
44-
| `watchos` | Apple WatchOS | ![Development](https://img.shields.io/badge/-development-blue) |
24+
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
4525
| `windows` | Microsoft Windows | ![Development](https://img.shields.io/badge/-development-blue) |
46-
| `zos` | IBM z/OS | ![Development](https://img.shields.io/badge/-development-blue) |

docs/registry/entities/os.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
2222
|---|---|---|---|---|---|
23-
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows`; `linux`; `darwin` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
23+
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows`; `linux`; `unix` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
2424
| [`os.build_id`](/docs/registry/attributes/os.md) | string | Unique identifier for a particular build or compilation of the operating system. [1] | `TQ3C.230805.001.B2`; `20E247`; `22621` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
2525
| [`os.description`](/docs/registry/attributes/os.md) | string | Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. | `Microsoft Windows [Version 10.0.18363.778]`; `Ubuntu 18.04.1 LTS` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
2626
| [`os.name`](/docs/registry/attributes/os.md) | string | Human readable operating system name. | `iOS`; `Android`; `Ubuntu` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
@@ -40,29 +40,8 @@
4040

4141
| Value | Description | Stability |
4242
|---|---|---|
43-
| `aix` | AIX (Advanced Interactive eXecutive) | ![Development](https://img.shields.io/badge/-development-blue) |
44-
| `android` | Android | ![Development](https://img.shields.io/badge/-development-blue) |
45-
| `archlinux` | Arch Linux | ![Development](https://img.shields.io/badge/-development-blue) |
46-
| `centos` | CentOS | ![Development](https://img.shields.io/badge/-development-blue) |
47-
| `chromeos` | ChromeOS | ![Development](https://img.shields.io/badge/-development-blue) |
48-
| `chromiumos` | ChromiumOS | ![Development](https://img.shields.io/badge/-development-blue) |
49-
| `dragonflybsd` | DragonFly BSD | ![Development](https://img.shields.io/badge/-development-blue) |
50-
| `fireos` | Fire OS | ![Development](https://img.shields.io/badge/-development-blue) |
51-
| `freebsd` | FreeBSD | ![Development](https://img.shields.io/badge/-development-blue) |
52-
| `hpux` | HP-UX (Hewlett Packard Unix) | ![Development](https://img.shields.io/badge/-development-blue) |
53-
| `ios` | Apple ios | ![Development](https://img.shields.io/badge/-development-blue) |
54-
| `manjaro` | Manjaro | ![Development](https://img.shields.io/badge/-development-blue) |
55-
| `netbsd` | NetBSD | ![Development](https://img.shields.io/badge/-development-blue) |
56-
| `openbsd` | OpenBSD | ![Development](https://img.shields.io/badge/-development-blue) |
57-
| `rhel` | Red Hat Enterprise Linux | ![Development](https://img.shields.io/badge/-development-blue) |
58-
| `solaris` | SunOS, Oracle Solaris | ![Development](https://img.shields.io/badge/-development-blue) |
59-
| `steamos` | SteamOS | ![Development](https://img.shields.io/badge/-development-blue) |
60-
| `suse` | SUSE Linux Enterprise | ![Development](https://img.shields.io/badge/-development-blue) |
61-
| `tvos` | Apple tvos | ![Development](https://img.shields.io/badge/-development-blue) |
62-
| `ubuntu` | Ubuntu | ![Development](https://img.shields.io/badge/-development-blue) |
63-
| `watchos` | Apple WatchOS | ![Development](https://img.shields.io/badge/-development-blue) |
43+
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
6444
| `windows` | Microsoft Windows | ![Development](https://img.shields.io/badge/-development-blue) |
65-
| `zos` | IBM z/OS | ![Development](https://img.shields.io/badge/-development-blue) |
6645

6746

6847
<!-- markdownlint-restore -->

docs/resource/os.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In case of virtualized environments, this is the operating system as it is obser
1818

1919
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
2020
|---|---|---|---|---|---|
21-
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows`; `linux`; `darwin` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
21+
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows`; `linux`; `unix` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
2222
| [`os.build_id`](/docs/registry/attributes/os.md) | string | Unique identifier for a particular build or compilation of the operating system. [1] | `TQ3C.230805.001.B2`; `20E247`; `22621` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
2323
| [`os.description`](/docs/registry/attributes/os.md) | string | Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. | `Microsoft Windows [Version 10.0.18363.778]`; `Ubuntu 18.04.1 LTS` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
2424
| [`os.name`](/docs/registry/attributes/os.md) | string | Human readable operating system name. | `iOS`; `Android`; `Ubuntu` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
@@ -38,29 +38,8 @@ In case of virtualized environments, this is the operating system as it is obser
3838

3939
| Value | Description | Stability |
4040
|---|---|---|
41-
| `aix` | AIX (Advanced Interactive eXecutive) | ![Development](https://img.shields.io/badge/-development-blue) |
42-
| `android` | Android | ![Development](https://img.shields.io/badge/-development-blue) |
43-
| `archlinux` | Arch Linux | ![Development](https://img.shields.io/badge/-development-blue) |
44-
| `centos` | CentOS | ![Development](https://img.shields.io/badge/-development-blue) |
45-
| `chromeos` | ChromeOS | ![Development](https://img.shields.io/badge/-development-blue) |
46-
| `chromiumos` | ChromiumOS | ![Development](https://img.shields.io/badge/-development-blue) |
47-
| `dragonflybsd` | DragonFly BSD | ![Development](https://img.shields.io/badge/-development-blue) |
48-
| `fireos` | Fire OS | ![Development](https://img.shields.io/badge/-development-blue) |
49-
| `freebsd` | FreeBSD | ![Development](https://img.shields.io/badge/-development-blue) |
50-
| `hpux` | HP-UX (Hewlett Packard Unix) | ![Development](https://img.shields.io/badge/-development-blue) |
51-
| `ios` | Apple ios | ![Development](https://img.shields.io/badge/-development-blue) |
52-
| `manjaro` | Manjaro | ![Development](https://img.shields.io/badge/-development-blue) |
53-
| `netbsd` | NetBSD | ![Development](https://img.shields.io/badge/-development-blue) |
54-
| `openbsd` | OpenBSD | ![Development](https://img.shields.io/badge/-development-blue) |
55-
| `rhel` | Red Hat Enterprise Linux | ![Development](https://img.shields.io/badge/-development-blue) |
56-
| `solaris` | SunOS, Oracle Solaris | ![Development](https://img.shields.io/badge/-development-blue) |
57-
| `steamos` | SteamOS | ![Development](https://img.shields.io/badge/-development-blue) |
58-
| `suse` | SUSE Linux Enterprise | ![Development](https://img.shields.io/badge/-development-blue) |
59-
| `tvos` | Apple tvos | ![Development](https://img.shields.io/badge/-development-blue) |
60-
| `ubuntu` | Ubuntu | ![Development](https://img.shields.io/badge/-development-blue) |
61-
| `watchos` | Apple WatchOS | ![Development](https://img.shields.io/badge/-development-blue) |
41+
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
6242
| `windows` | Microsoft Windows | ![Development](https://img.shields.io/badge/-development-blue) |
63-
| `zos` | IBM z/OS | ![Development](https://img.shields.io/badge/-development-blue) |
6443

6544
<!-- markdownlint-restore -->
6645
<!-- prettier-ignore-end -->

docs/resource/zos.md

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,8 @@ The following table describes how to populate the operating system attributes on
8787

8888
| Value | Description | Stability |
8989
|---|---|---|
90-
| `aix` | AIX (Advanced Interactive eXecutive) | ![Development](https://img.shields.io/badge/-development-blue) |
91-
| `android` | Android | ![Development](https://img.shields.io/badge/-development-blue) |
92-
| `archlinux` | Arch Linux | ![Development](https://img.shields.io/badge/-development-blue) |
93-
| `centos` | CentOS | ![Development](https://img.shields.io/badge/-development-blue) |
94-
| `chromeos` | ChromeOS | ![Development](https://img.shields.io/badge/-development-blue) |
95-
| `chromiumos` | ChromiumOS | ![Development](https://img.shields.io/badge/-development-blue) |
96-
| `dragonflybsd` | DragonFly BSD | ![Development](https://img.shields.io/badge/-development-blue) |
97-
| `fireos` | Fire OS | ![Development](https://img.shields.io/badge/-development-blue) |
98-
| `freebsd` | FreeBSD | ![Development](https://img.shields.io/badge/-development-blue) |
99-
| `hpux` | HP-UX (Hewlett Packard Unix) | ![Development](https://img.shields.io/badge/-development-blue) |
100-
| `ios` | Apple ios | ![Development](https://img.shields.io/badge/-development-blue) |
101-
| `manjaro` | Manjaro | ![Development](https://img.shields.io/badge/-development-blue) |
102-
| `netbsd` | NetBSD | ![Development](https://img.shields.io/badge/-development-blue) |
103-
| `openbsd` | OpenBSD | ![Development](https://img.shields.io/badge/-development-blue) |
104-
| `rhel` | Red Hat Enterprise Linux | ![Development](https://img.shields.io/badge/-development-blue) |
105-
| `solaris` | SunOS, Oracle Solaris | ![Development](https://img.shields.io/badge/-development-blue) |
106-
| `steamos` | SteamOS | ![Development](https://img.shields.io/badge/-development-blue) |
107-
| `suse` | SUSE Linux Enterprise | ![Development](https://img.shields.io/badge/-development-blue) |
108-
| `tvos` | Apple tvos | ![Development](https://img.shields.io/badge/-development-blue) |
109-
| `ubuntu` | Ubuntu | ![Development](https://img.shields.io/badge/-development-blue) |
110-
| `watchos` | Apple WatchOS | ![Development](https://img.shields.io/badge/-development-blue) |
90+
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
11191
| `windows` | Microsoft Windows | ![Development](https://img.shields.io/badge/-development-blue) |
112-
| `zos` | IBM z/OS | ![Development](https://img.shields.io/badge/-development-blue) |
11392

11493
<!-- markdownlint-restore -->
11594
<!-- prettier-ignore-end -->

model/os/registry.yaml

Lines changed: 15 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,58 @@ groups:
1111
- id: os.type
1212
type:
1313
members:
14-
- id: windows
14+
- id: windowsnt
1515
value: 'windows'
1616
brief: "Microsoft Windows"
1717
stability: development
1818
- id: linux
1919
value: 'linux'
2020
brief: "Linux"
21-
deprecated: Should be set as the `os.family` instead
21+
deprecated: Should use `unix` instead'
22+
stability: development
23+
- id: unix
24+
value: 'unix'
25+
brief: "Unix"
2226
stability: development
2327
- id: darwin
2428
value: 'darwin'
2529
brief: "Apple Darwin"
26-
deprecated: Should be set as the `os.classifcation` instead.
30+
deprecated: Should be set as the `os.family` instead.
2731
stability: development
2832
- id: freebsd
2933
value: 'freebsd'
3034
brief: "FreeBSD"
35+
deprecated: "Use `os.name` instead"
3136
stability: development
3237
- id: netbsd
3338
value: 'netbsd'
3439
brief: "NetBSD"
40+
deprecated: "Use `os.name` instead"
3541
stability: development
3642
- id: openbsd
3743
value: 'openbsd'
3844
brief: "OpenBSD"
45+
deprecated: "Use `os.name` instead"
3946
stability: development
4047
- id: dragonflybsd
4148
value: 'dragonflybsd'
4249
brief: "DragonFly BSD"
50+
deprecated: "Use `os.name` instead"
4351
stability: development
4452
- id: hpux
4553
value: 'hpux'
4654
brief: "HP-UX (Hewlett Packard Unix)"
55+
deprecated: "Use `os.name` instead"
4756
stability: development
4857
- id: aix
4958
value: 'aix'
5059
brief: "AIX (Advanced Interactive eXecutive)"
60+
deprecated: "Use `os.name` instead"
5161
stability: development
5262
- id: solaris
5363
value: 'solaris'
5464
brief: "SunOS, Oracle Solaris"
65+
deprecated: "Use `os.name` instead"
5566
stability: development
5667
- id: z_os
5768
value: 'z_os'
@@ -61,62 +72,7 @@ groups:
6172
- id: zos
6273
value: 'zos'
6374
brief: "IBM z/OS"
64-
stability: development
65-
- id: android
66-
value: 'android'
67-
brief: "Android"
68-
stability: development
69-
- id: ios
70-
value: 'ios'
71-
brief: "Apple ios"
72-
stability: development
73-
- id: tvos
74-
value: 'tvos'
75-
brief: "Apple tvos"
76-
stability: development
77-
- id: watchos
78-
value: 'watchos'
79-
brief: "Apple WatchOS"
80-
stability: development
81-
- id: ubuntu
82-
value: 'ubuntu'
83-
brief: "Ubuntu"
84-
stability: development
85-
- id: manjaro
86-
value: 'manjaro'
87-
brief: "Manjaro"
88-
stability: development
89-
- id: steamos
90-
value: 'steamos'
91-
brief: "SteamOS"
92-
stability: development
93-
- id: centos
94-
value: 'centos'
95-
brief: "CentOS"
96-
stability: development
97-
- id: archlinux
98-
value: 'archlinux'
99-
brief: "Arch Linux"
100-
stability: development
101-
- id: rhel
102-
value: 'rhel'
103-
brief: "Red Hat Enterprise Linux "
104-
stability: development
105-
- id: suse
106-
value: 'suse'
107-
brief: "SUSE Linux Enterprise"
108-
stability: development
109-
- id: chromeos
110-
value: 'chromeos'
111-
brief: "ChromeOS"
112-
stability: development
113-
- id: chromiumos
114-
value: 'chromiumos'
115-
brief: "ChromiumOS"
116-
stability: development
117-
- id: fireos
118-
value: 'fireos'
119-
brief: "Fire OS"
75+
deprecated: "Use `os.name` instead"
12076
stability: development
12177
brief: >
12278
The operating system type.

0 commit comments

Comments
 (0)