From 08869468c23fd6a2c0eff5f0f64e615c9d32f9f9 Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Wed, 11 Jan 2023 15:56:57 +0100 Subject: [PATCH 1/2] [semantic_conventions/resource] fix google platform openshift naming Signed-off-by: Benedikt Bongartz --- CHANGELOG.md | 4 ++++ semantic_conventions/resource/cloud.yaml | 4 ++-- specification/resource/semantic_conventions/cloud.md | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fa8748835b..935701ea85a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,10 @@ release. - Add `code.lineno` source code attribute ([#3029](https://github.com/open-telemetry/opentelemetry-specification/pull/3029)) +- Rename google openshift platform attribute from `google_cloud_openshift` to `gcp_openshift` + to match the existing `cloud.provider` prefix. + [#3095](https://github.com/open-telemetry/opentelemetry-specification/pull/3095) + ### Compatibility diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index c5ec8fad6cc..a6ff2a22057 100644 --- a/semantic_conventions/resource/cloud.yaml +++ b/semantic_conventions/resource/cloud.yaml @@ -123,8 +123,8 @@ groups: - id: gcp_app_engine value: 'gcp_app_engine' brief: Google Cloud App Engine (GAE) - - id: google_cloud_openshift - value: 'google_cloud_openshift' + - id: gcp_openshift + value: 'gcp_openshift' brief: Red Hat OpenShift on Google Cloud - id: ibm_cloud_openshift value: 'ibm_cloud_openshift' diff --git a/specification/resource/semantic_conventions/cloud.md b/specification/resource/semantic_conventions/cloud.md index ecff2611052..5fad6efb005 100644 --- a/specification/resource/semantic_conventions/cloud.md +++ b/specification/resource/semantic_conventions/cloud.md @@ -57,7 +57,7 @@ | `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | | `gcp_cloud_functions` | Google Cloud Functions (GCF) | | `gcp_app_engine` | Google Cloud App Engine (GAE) | -| `google_cloud_openshift` | Red Hat OpenShift on Google Cloud | +| `gcp_openshift` | Red Hat OpenShift on Google Cloud | | `ibm_cloud_openshift` | Red Hat OpenShift on IBM Cloud | | `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) | | `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) | From 93e3fee41a0504b519af8af0ed65e9b6723094b6 Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Fri, 13 Jan 2023 08:24:42 +0100 Subject: [PATCH 2/2] changelog: fix linting Signed-off-by: Benedikt Bongartz --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 935701ea85a..3a915789b0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,6 @@ release. to match the existing `cloud.provider` prefix. [#3095](https://github.com/open-telemetry/opentelemetry-specification/pull/3095) - ### Compatibility ### OpenTelemetry Protocol