Skip to content

Commit de5172f

Browse files
committed
Switch to structured deprecated enums
1 parent 46211ef commit de5172f

File tree

5 files changed

+53
-21
lines changed

5 files changed

+53
-21
lines changed

docs/registry/attributes/os.md

Lines changed: 2 additions & 2 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. | `windowsnt`; `windows`; `linux` | ![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_nt`; `windows`; `linux` | ![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
---
@@ -22,4 +22,4 @@ The operating system (OS) on which the process represented by this resource is r
2222
| Value | Description | Stability |
2323
|---|---|---|
2424
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
25-
| `windowsnt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
25+
| `windows_nt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |

docs/registry/entities/os.md

Lines changed: 2 additions & 2 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. | `windowsnt`; `windows`; `linux` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
23+
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows_nt`; `windows`; `linux` | `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) |
@@ -41,7 +41,7 @@
4141
| Value | Description | Stability |
4242
|---|---|---|
4343
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
44-
| `windowsnt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
44+
| `windows_nt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
4545

4646

4747
<!-- markdownlint-restore -->

docs/resource/os.md

Lines changed: 2 additions & 2 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. | `windowsnt`; `windows`; `linux` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
21+
| [`os.type`](/docs/registry/attributes/os.md) | string | The operating system type. | `windows_nt`; `windows`; `linux` | `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) |
@@ -39,7 +39,7 @@ In case of virtualized environments, this is the operating system as it is obser
3939
| Value | Description | Stability |
4040
|---|---|---|
4141
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
42-
| `windowsnt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
42+
| `windows_nt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
4343

4444
<!-- markdownlint-restore -->
4545
<!-- prettier-ignore-end -->

docs/resource/zos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The following table describes how to populate the operating system attributes on
8888
| Value | Description | Stability |
8989
|---|---|---|
9090
| `unix` | Unix | ![Development](https://img.shields.io/badge/-development-blue) |
91-
| `windowsnt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
91+
| `windows_nt` | Microsoft Windows NT based OS | ![Development](https://img.shields.io/badge/-development-blue) |
9292

9393
<!-- markdownlint-restore -->
9494
<!-- prettier-ignore-end -->

model/os/registry.yaml

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,23 @@ groups:
1111
- id: os.type
1212
type:
1313
members:
14-
- id: windowsnt
15-
value: 'windowsnt'
14+
- id: windows_nt
15+
value: 'windows_nt'
1616
brief: "Microsoft Windows NT based OS"
1717
stability: development
1818
- id: windows
1919
value: 'windows'
2020
brief: "Microsoft Windows"
21-
deprecated: Should use `windowsnt` instead'
21+
deprecated:
22+
reason: renamed
23+
renamed_to: windows_nt
2224
stability: development
2325
- id: linux
2426
value: 'linux'
2527
brief: "Linux"
26-
deprecated: Should use `unix` instead'
28+
deprecated:
29+
reason: renamed
30+
renamed_to: unix
2731
stability: development
2832
- id: unix
2933
value: 'unix'
@@ -32,54 +36,82 @@ groups:
3236
- id: darwin
3337
value: 'darwin'
3438
brief: "Apple Darwin"
35-
deprecated: Should be set as the `os.family` instead.
39+
deprecated:
40+
reason: renamed
41+
renamed_to: unix
42+
note: Darwin should be set as a `os.family` member instead.
3643
stability: development
3744
- id: freebsd
3845
value: 'freebsd'
3946
brief: "FreeBSD"
40-
deprecated: "Use `os.name` instead"
47+
deprecated:
48+
reason: renamed
49+
renamed_to: unix
50+
note: FreeBSD should be set as the "Use `os.name` instead.
4151
stability: development
4252
- id: netbsd
4353
value: 'netbsd'
4454
brief: "NetBSD"
45-
deprecated: "Use `os.name` instead"
55+
deprecated:
56+
reason: renamed
57+
renamed_to: unix
58+
note: NetBSD should be set as the "Use `os.name` instead.
4659
stability: development
4760
- id: openbsd
4861
value: 'openbsd'
4962
brief: "OpenBSD"
50-
deprecated: "Use `os.name` instead"
63+
deprecated:
64+
reason: renamed
65+
renamed_to: unix
66+
note: OpenBSD should be set as the "Use `os.name` instead.
5167
stability: development
5268
- id: dragonflybsd
5369
value: 'dragonflybsd'
5470
brief: "DragonFly BSD"
55-
deprecated: "Use `os.name` instead"
71+
deprecated:
72+
reason: renamed
73+
renamed_to: unix
74+
note: DragonFly BSD should be set as the "Use `os.name` instead.
5675
stability: development
5776
- id: hpux
5877
value: 'hpux'
5978
brief: "HP-UX (Hewlett Packard Unix)"
60-
deprecated: "Use `os.name` instead"
79+
deprecated:
80+
reason: renamed
81+
renamed_to: unix
82+
note: HP-UX should be set as the "Use `os.name` instead.
6183
stability: development
6284
- id: aix
6385
value: 'aix'
6486
brief: "AIX (Advanced Interactive eXecutive)"
65-
deprecated: "Use `os.name` instead"
87+
deprecated:
88+
reason: renamed
89+
renamed_to: unix
90+
note: AIX should be set as the "Use `os.name` instead.
6691
stability: development
6792
- id: solaris
6893
value: 'solaris'
6994
brief: "SunOS, Oracle Solaris"
70-
deprecated: "Use `os.name` instead"
95+
deprecated:
96+
reason: renamed
97+
renamed_to: unix
98+
note: Solaris should be set as the "Use `os.name` instead.
7199
stability: development
72100
- id: z_os
73101
value: 'z_os'
74102
brief: "Deprecated. Use `zos` instead."
75103
deprecated:
76104
reason: renamed
77-
renamed_to: "zos"
105+
renamed_to: unix
106+
note: zos should be set as the "Use `os.name` instead.
78107
stability: development
79108
- id: zos
80109
value: 'zos'
81110
brief: "IBM z/OS"
82-
deprecated: "Use `os.name` instead"
111+
deprecated:
112+
reason: renamed
113+
renamed_to: unix
114+
note: zos should be set as the "Use `os.name` instead.
83115
stability: development
84116
brief: >
85117
The operating system type.

0 commit comments

Comments
 (0)