From ca18a96127753e08a089ef8cca86f229055334e4 Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Mon, 20 Nov 2023 11:56:51 +0000 Subject: [PATCH 1/7] moving android to the registry attributes Signed-off-by: Miguel Luna <39376769+mlunadia@users.noreply.github.com> --- docs/attributes-registry/README.md | 1 + docs/attributes-registry/android.md | 15 +++++++++++++++ docs/resource/android.md | 2 +- model/registry/android.yaml | 14 ++++++++++++++ model/resource/android.yaml | 8 +------- 5 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 docs/attributes-registry/android.md create mode 100644 model/registry/android.yaml diff --git a/docs/attributes-registry/README.md b/docs/attributes-registry/README.md index c8a0702d3e..2b607b6ca3 100644 --- a/docs/attributes-registry/README.md +++ b/docs/attributes-registry/README.md @@ -27,6 +27,7 @@ All registered attributes are listed by namespace in this registry. Currently, the following namespaces exist: +* [Android](android.md) * [Client](client.md) * [Cloud](cloud.md) * [Code](code.md) diff --git a/docs/attributes-registry/android.md b/docs/attributes-registry/android.md new file mode 100644 index 0000000000..57a695d14d --- /dev/null +++ b/docs/attributes-registry/android.md @@ -0,0 +1,15 @@ +# Android + +**Status**: [Experimental][DocumentStatus] + +**type:** `android` + +**Description**: The Android platform on which the Android application is running. + + +| Attribute | Type | Description | Examples | Requirement Level | +|---|---|---|---|---| +| `android.os.api_level` | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | Recommended | + + +[DocumentStatus]: https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/document-status.md diff --git a/docs/resource/android.md b/docs/resource/android.md index 39daee5a8f..aa635d29ef 100644 --- a/docs/resource/android.md +++ b/docs/resource/android.md @@ -9,7 +9,7 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| `android.os.api_level` | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | Recommended | +| [`android.os.api_level`](../attributes-registry/android.md) | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | Recommended | [DocumentStatus]: https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/document-status.md diff --git a/model/registry/android.yaml b/model/registry/android.yaml new file mode 100644 index 0000000000..bb5ca6bedd --- /dev/null +++ b/model/registry/android.yaml @@ -0,0 +1,14 @@ +groups: + - id: registry.android + prefix: android + type: resource + brief: > + The Android platform on which the Android application is running. + attributes: + - id: os.api_level + type: string + brief: > + Uniquely identifies the framework API revision offered by a version + (`os.version`) of the android operating system. More information can be found + [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). + examples: ['33', '32'] diff --git a/model/resource/android.yaml b/model/resource/android.yaml index dcc236d846..0f2b756eb9 100644 --- a/model/resource/android.yaml +++ b/model/resource/android.yaml @@ -5,10 +5,4 @@ groups: brief: > The Android platform on which the Android application is running. attributes: - - id: os.api_level - type: string - brief: > - Uniquely identifies the framework API revision offered by a version - (`os.version`) of the android operating system. More information can be found - [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). - examples: ['33', '32'] + - ref: android.os.api_level From c1a57a866251a400fdb5ca0ff843820bad8bf6bf Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Fri, 8 Dec 2023 08:32:55 +0100 Subject: [PATCH 2/7] Update android.md amending title --- docs/attributes-registry/android.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/attributes-registry/android.md b/docs/attributes-registry/android.md index 57a695d14d..21e192a160 100644 --- a/docs/attributes-registry/android.md +++ b/docs/attributes-registry/android.md @@ -1,11 +1,6 @@ # Android -**Status**: [Experimental][DocumentStatus] - -**type:** `android` - -**Description**: The Android platform on which the Android application is running. - +## Android Attributes | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| From aeeebad44c17e5e7d903020cd6224c7d44a0b95e Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Fri, 8 Dec 2023 08:35:31 +0100 Subject: [PATCH 3/7] Update android.md adding omit_requirement_level --- docs/attributes-registry/android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/attributes-registry/android.md b/docs/attributes-registry/android.md index 21e192a160..5ab1617ad6 100644 --- a/docs/attributes-registry/android.md +++ b/docs/attributes-registry/android.md @@ -1,7 +1,7 @@ # Android ## Android Attributes - + | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| | `android.os.api_level` | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | Recommended | From 08bf638c6ccd00b1cf1e0b25269edf66af04b15e Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Fri, 8 Dec 2023 13:54:04 +0100 Subject: [PATCH 4/7] updating android registry move Signed-off-by: Miguel Luna <39376769+mlunadia@users.noreply.github.com> --- docs/attributes-registry/android.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/attributes-registry/android.md b/docs/attributes-registry/android.md index 5ab1617ad6..e8539f2b73 100644 --- a/docs/attributes-registry/android.md +++ b/docs/attributes-registry/android.md @@ -2,9 +2,7 @@ ## Android Attributes -| Attribute | Type | Description | Examples | Requirement Level | -|---|---|---|---|---| -| `android.os.api_level` | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | Recommended | +| Attribute | Type | Description | Examples | +|---|---|---|---| +| `android.os.api_level` | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | - -[DocumentStatus]: https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/document-status.md From 3c7dbe464240249ffb94236aeb6071cc002e1569 Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Tue, 5 Mar 2024 08:42:31 +0000 Subject: [PATCH 5/7] changing type to generic attribute_group --- model/registry/android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/registry/android.yaml b/model/registry/android.yaml index bb5ca6bedd..e4aec4f649 100644 --- a/model/registry/android.yaml +++ b/model/registry/android.yaml @@ -1,7 +1,7 @@ groups: - id: registry.android prefix: android - type: resource + type: attribute_group brief: > The Android platform on which the Android application is running. attributes: From 3dc232cdfe8211786a511678894a7c3179ee71d2 Mon Sep 17 00:00:00 2001 From: Miguel Luna <39376769+mlunadia@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:16:50 +0000 Subject: [PATCH 6/7] resolving conflicts in readme.md --- docs/attributes-registry/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/attributes-registry/README.md b/docs/attributes-registry/README.md index 9ad3f000fd..0edd36799e 100644 --- a/docs/attributes-registry/README.md +++ b/docs/attributes-registry/README.md @@ -28,6 +28,7 @@ All registered attributes are listed by namespace in this registry. Currently, the following namespaces exist: * [Android](android.md) +* [Browser](browser.md) * [Client](client.md) * [Cloud](cloud.md) * [Code](code.md) From b928f59757b6197147ad51198559f3a007a2997f Mon Sep 17 00:00:00 2001 From: Chris Mark Date: Wed, 6 Mar 2024 11:22:14 +0100 Subject: [PATCH 7/7] Add stability --- model/registry/android.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/model/registry/android.yaml b/model/registry/android.yaml index e4aec4f649..cfdcac8a46 100644 --- a/model/registry/android.yaml +++ b/model/registry/android.yaml @@ -7,6 +7,7 @@ groups: attributes: - id: os.api_level type: string + stability: experimental brief: > Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found