From 81c98b949c1a2e1a2e9f29ba8685b8bd24a9fd3f Mon Sep 17 00:00:00 2001 From: JBD Date: Tue, 2 Mar 2021 17:37:14 -0800 Subject: [PATCH 1/3] Have consistent naming for Google Cloud services `gcp_gke` is the only value that contains a shorten version of the cloud service in cloud semantic conventions. Use the long name to have consistency with others. Also update the briefs the use the fully qualified names of Google Cloud services. Fixes #1485. --- CHANGELOG.md | 2 ++ semantic_conventions/resource/cloud.yaml | 12 ++++++------ specification/resource/semantic_conventions/cloud.md | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c44e0a79e..60144f8b57b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ release. - Add [`ForceFlush`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#forceflush) to SDK's `TracerProvider` ([#1452](https://github.com/open-telemetry/opentelemetry-specification/pull/1452)) - Add `elasticsearch` to `db.system` semantic conventions ([#1463](https://github.com/open-telemetry/opentelemetry-specification/pull/1463)) - Add `runtime` to `container` semantic conventions ([#1482](https://github.com/open-telemetry/opentelemetry-specification/pull/1482)) +- Rename `gcp_gke` to `gcp_kubernetes_engine` to have consistency with other +Google products under `cloud.infrastructure_service`. ## v1.0.1 (2021-02-11) diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index 3248fac0b50..c4590e2d9d4 100644 --- a/semantic_conventions/resource/cloud.yaml +++ b/semantic_conventions/resource/cloud.yaml @@ -78,19 +78,19 @@ groups: brief: Azure App Service - id: GCP_ComputeEngine value: 'gcp_compute_engine' - brief: GCP Compute Engine + brief: Google Compute Engine - id: GCP_CloudRun value: 'gcp_cloud_run' - brief: GCP Cloud Run - - id: GCP_GKE - value: 'gcp_gke' + brief: Google Cloud Run + - id: GCP_KubernetesEngine + value: 'gcp_kubernetes_engine' brief: Google Kubernetes Engine - id: GCP_CloudFunctions value: 'gcp_cloud_functions' - brief: GCP Cloud Functions + brief: Google Cloud Functions - id: GCP_AppEngine value: 'gcp_app_engine' - brief: GCP App Engine + brief: Google Cloud App Engine brief: > The cloud infrastructure resource in use. note: > diff --git a/specification/resource/semantic_conventions/cloud.md b/specification/resource/semantic_conventions/cloud.md index 55b25d17005..2060451b725 100644 --- a/specification/resource/semantic_conventions/cloud.md +++ b/specification/resource/semantic_conventions/cloud.md @@ -41,9 +41,9 @@ | `azure_aks` | Azure Kubernetes Service | | `azure_functions` | Azure Functions | | `azure_app_service` | Azure App Service | -| `gcp_compute_engine` | GCP Compute Engine | -| `gcp_cloud_run` | GCP Cloud Run | -| `gcp_gke` | Google Kubernetes Engine | -| `gcp_cloud_functions` | GCP Cloud Functions | -| `gcp_app_engine` | GCP App Engine | +| `gcp_compute_engine` | Google Compute Engine | +| `gcp_cloud_run` | Google Cloud Run | +| `gcp_kubernetes_engine` | Google Kubernetes Engine | +| `gcp_cloud_functions` | Google Cloud Functions | +| `gcp_app_engine` | Google Cloud App Engine | From 11b53d6d88b3d47e19f80129d700b88a317cb2a1 Mon Sep 17 00:00:00 2001 From: JBD Date: Tue, 2 Mar 2021 17:40:43 -0800 Subject: [PATCH 2/3] Add link to CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60144f8b57b..1cdf0f64abe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ release. - Add `elasticsearch` to `db.system` semantic conventions ([#1463](https://github.com/open-telemetry/opentelemetry-specification/pull/1463)) - Add `runtime` to `container` semantic conventions ([#1482](https://github.com/open-telemetry/opentelemetry-specification/pull/1482)) - Rename `gcp_gke` to `gcp_kubernetes_engine` to have consistency with other -Google products under `cloud.infrastructure_service`. +Google products under `cloud.infrastructure_service` ([#1496](https://github.com/open-telemetry/opentelemetry-specification/pull/1496)) ## v1.0.1 (2021-02-11) From 6cd7e4136f480287b539b931f7d77d69df2c0638 Mon Sep 17 00:00:00 2001 From: JBD Date: Wed, 3 Mar 2021 22:17:11 -0800 Subject: [PATCH 3/3] Fix names --- semantic_conventions/resource/cloud.yaml | 8 ++++---- specification/resource/semantic_conventions/cloud.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index c4590e2d9d4..8c45dfcbe97 100644 --- a/semantic_conventions/resource/cloud.yaml +++ b/semantic_conventions/resource/cloud.yaml @@ -78,19 +78,19 @@ groups: brief: Azure App Service - id: GCP_ComputeEngine value: 'gcp_compute_engine' - brief: Google Compute Engine + brief: Google Cloud Compute Engine (GCE) - id: GCP_CloudRun value: 'gcp_cloud_run' brief: Google Cloud Run - id: GCP_KubernetesEngine value: 'gcp_kubernetes_engine' - brief: Google Kubernetes Engine + brief: Google Cloud Kubernetes Engine (GKE) - id: GCP_CloudFunctions value: 'gcp_cloud_functions' - brief: Google Cloud Functions + brief: Google Cloud Functions (GCF) - id: GCP_AppEngine value: 'gcp_app_engine' - brief: Google Cloud App Engine + brief: Google Cloud App Engine (GAE) brief: > The cloud infrastructure resource in use. note: > diff --git a/specification/resource/semantic_conventions/cloud.md b/specification/resource/semantic_conventions/cloud.md index 2060451b725..60178b42052 100644 --- a/specification/resource/semantic_conventions/cloud.md +++ b/specification/resource/semantic_conventions/cloud.md @@ -41,9 +41,9 @@ | `azure_aks` | Azure Kubernetes Service | | `azure_functions` | Azure Functions | | `azure_app_service` | Azure App Service | -| `gcp_compute_engine` | Google Compute Engine | +| `gcp_compute_engine` | Google Cloud Compute Engine (GCE) | | `gcp_cloud_run` | Google Cloud Run | -| `gcp_kubernetes_engine` | Google Kubernetes Engine | -| `gcp_cloud_functions` | Google Cloud Functions | -| `gcp_app_engine` | Google Cloud App Engine | +| `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | +| `gcp_cloud_functions` | Google Cloud Functions (GCF) | +| `gcp_app_engine` | Google Cloud App Engine (GAE) |