From df8c544c18e10f5e736c7acdaaa6a8e091b93159 Mon Sep 17 00:00:00 2001 From: Jaana Dogan Date: Thu, 4 Mar 2021 08:48:22 -0800 Subject: [PATCH] Have consistent naming for Google Cloud services (#1496) --- CHANGELOG.md | 2 ++ semantic_conventions/resource/cloud.yaml | 14 +++++++------- .../resource/semantic_conventions/cloud.md | 10 +++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c44e0a79e..1cdf0f64abe 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` ([#1496](https://github.com/open-telemetry/opentelemetry-specification/pull/1496)) ## v1.0.1 (2021-02-11) diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index 3248fac0b50..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: GCP Compute Engine + brief: Google Cloud Compute Engine (GCE) - id: GCP_CloudRun value: 'gcp_cloud_run' - brief: GCP Cloud Run - - id: GCP_GKE - value: 'gcp_gke' - brief: Google Kubernetes Engine + brief: Google Cloud Run + - id: GCP_KubernetesEngine + value: 'gcp_kubernetes_engine' + brief: Google Cloud Kubernetes Engine (GKE) - id: GCP_CloudFunctions value: 'gcp_cloud_functions' - brief: GCP Cloud Functions + brief: Google Cloud Functions (GCF) - id: GCP_AppEngine value: 'gcp_app_engine' - brief: GCP 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 55b25d17005..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` | 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 Cloud Compute Engine (GCE) | +| `gcp_cloud_run` | Google Cloud Run | +| `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | +| `gcp_cloud_functions` | Google Cloud Functions (GCF) | +| `gcp_app_engine` | Google Cloud App Engine (GAE) |