From 2390c86ec69286615da937e7b22fde252b6a8445 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:47:44 +0200 Subject: [PATCH 1/4] Add `azure_container_apps` to `cloud.platform` semantic conventions --- CHANGELOG.md | 1 + docs/attributes-registry/cloud.md | 1 + docs/resource/cloud.md | 1 + model/registry/cloud.yaml | 3 +++ 4 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 060ad26619..c23cbaa2e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ release. ([#354](https://github.com/open-telemetry/semantic-conventions/pull/354)) - Move Exceptions to attribute registry ([#574](https://github.com/open-telemetry/semantic-conventions/pull/574)) +- Add `azure_container_apps` to `cloud.platform` semantic conventions ### Breaking diff --git a/docs/attributes-registry/cloud.md b/docs/attributes-registry/cloud.md index a51ac490aa..1931f5a878 100644 --- a/docs/attributes-registry/cloud.md +++ b/docs/attributes-registry/cloud.md @@ -54,6 +54,7 @@ The following well-known definitions MUST be used if you set this attribute and | `aws_app_runner` | AWS App Runner | | `aws_openshift` | Red Hat OpenShift on AWS (ROSA) | | `azure_vm` | Azure Virtual Machines | +| `azure_container_apps` | Azure Container Apps | | `azure_container_instances` | Azure Container Instances | | `azure_aks` | Azure Kubernetes Service | | `azure_functions` | Azure Functions | diff --git a/docs/resource/cloud.md b/docs/resource/cloud.md index c8ced8c2c3..8d047494b4 100644 --- a/docs/resource/cloud.md +++ b/docs/resource/cloud.md @@ -55,6 +55,7 @@ The following well-known definitions MUST be used if you set this attribute and | `aws_app_runner` | AWS App Runner | | `aws_openshift` | Red Hat OpenShift on AWS (ROSA) | | `azure_vm` | Azure Virtual Machines | +| `azure_container_apps` | Azure Container Apps | | `azure_container_instances` | Azure Container Instances | | `azure_aks` | Azure Kubernetes Service | | `azure_functions` | Azure Functions | diff --git a/model/registry/cloud.yaml b/model/registry/cloud.yaml index 2c669052e8..9835e09b62 100644 --- a/model/registry/cloud.yaml +++ b/model/registry/cloud.yaml @@ -125,6 +125,9 @@ groups: - id: azure_vm value: 'azure_vm' brief: Azure Virtual Machines + - id: azure_container_apps + value: 'azure_container_apps' + brief: Azure Container Apps - id: azure_container_instances value: 'azure_container_instances' brief: Azure Container Instances From 90bbe28c430ef27ea3cb22fb641b947b495cf716 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:52:57 +0200 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23cbaa2e8..af92c46c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ release. ([#354](https://github.com/open-telemetry/semantic-conventions/pull/354)) - Move Exceptions to attribute registry ([#574](https://github.com/open-telemetry/semantic-conventions/pull/574)) -- Add `azure_container_apps` to `cloud.platform` semantic conventions +- Add `azure_container_apps` to `cloud.platform` semantic conventions ([#615](https://github.com/open-telemetry/semantic-conventions/pull/615)) ### Breaking From 30810f28970bd8a933ee9388fef0d881ab9304e0 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Tue, 9 Jan 2024 17:02:37 +0100 Subject: [PATCH 3/4] Fix yaml lint after merge conflict --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac1e230ccc..354bf5ce8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ release. - Rename `system.processes.*` namespace to `system.process.*` ([#484](https://github.com/open-telemetry/semantic-conventions/pull/484)) -- Add `azure_container_apps` to `cloud.platform` semantic conventions +- Add `azure_container_apps` to `cloud.platform` semantic conventions ([#615](https://github.com/open-telemetry/semantic-conventions/pull/615)) ### Features From 06e0360396528ad902a204219fbf3a7b0b76be4f Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Wed, 10 Jan 2024 10:28:30 +0100 Subject: [PATCH 4/4] Move to right changelog section --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c6397e519..59db03d7ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,12 @@ release. ([#484](https://github.com/open-telemetry/semantic-conventions/pull/484)) - Depluralize labels for pod (`k8s.pod.labels.*`) and container (`container.labels.*`) resources ([#625](https://github.com/open-telemetry/semantic-conventions/pull/625)) -- Add `azure_container_apps` to `cloud.platform` semantic conventions - ([#615](https://github.com/open-telemetry/semantic-conventions/pull/615)) ### Features +- Add `azure_container_apps` to `cloud.platform` semantic conventions + ([#615](https://github.com/open-telemetry/semantic-conventions/pull/615)) + ### Fixes - Clarify that `service.*` attributes apply to all telemetry sources.