diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index a91d1394a..0abd1a6b4 100644 --- a/semantic_conventions/resource/cloud.yaml +++ b/semantic_conventions/resource/cloud.yaml @@ -20,6 +20,9 @@ groups: - id: 'gcp' value: 'gcp' brief: 'Google Cloud Platform' + - id: 'tencent_cloud' + value: 'tencent_cloud' + brief: 'Tencent Cloud' brief: > Name of the cloud provider. - id: account.id @@ -30,12 +33,14 @@ groups: - id: region type: string brief: > - The geographical region the resource is running. Refer to your - provider's docs to see the available regions, for example + The geographical region the resource is running. + note: > + Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), - or [Google Cloud regions](https://cloud.google.com/about/locations). + [Google Cloud regions](https://cloud.google.com/about/locations), + or [Tencent Cloud regions](https://intl.cloud.tencent.com/document/product/213/6091). examples: ['us-central1', 'us-east-1'] - id: availability_zone type: string @@ -101,6 +106,15 @@ groups: - id: gcp_app_engine value: 'gcp_app_engine' brief: Google Cloud App Engine (GAE) + - id: tencent_cloud_cvm + value: 'tencent_cloud_cvm' + brief: Tencent Cloud Cloud Virtual Machine (CVM) + - id: tencent_cloud_eks + value: 'tencent_cloud_eks' + brief: Tencent Cloud Elastic Kubernetes Service (EKS) + - id: tencent_cloud_scf + value: 'tencent_cloud_scf' + brief: Tencent Cloud Serverless Cloud Function (SCF) brief: > The cloud platform in use. note: > diff --git a/semantic_conventions/trace/faas.yaml b/semantic_conventions/trace/faas.yaml index 6bf4bf1ed..ddc0e259c 100644 --- a/semantic_conventions/trace/faas.yaml +++ b/semantic_conventions/trace/faas.yaml @@ -166,6 +166,9 @@ groups: - id: 'gcp' value: 'gcp' brief: 'Google Cloud Platform' + - id: 'tencent_cloud' + value: 'tencent_cloud' + brief: 'Tencent Cloud' required: always brief: > The cloud provider of the invoked function. diff --git a/specification/resource/semantic_conventions/README.md b/specification/resource/semantic_conventions/README.md index 7c76eb44c..9cc0e23ed 100644 --- a/specification/resource/semantic_conventions/README.md +++ b/specification/resource/semantic_conventions/README.md @@ -171,3 +171,4 @@ Valid cloud providers are: - [Amazon Web Services](https://aws.amazon.com/) ([`aws`](cloud_provider/aws/README.md)) - [Google Cloud Platform](https://cloud.google.com/) (`gcp`) - [Microsoft Azure](https://azure.microsoft.com/) (`azure`) +- [Tencent Cloud](https://intl.cloud.tencent.com/) (`tencent_cloud`) diff --git a/specification/resource/semantic_conventions/cloud.md b/specification/resource/semantic_conventions/cloud.md index 9fc27aa51..5a9f4eaf3 100644 --- a/specification/resource/semantic_conventions/cloud.md +++ b/specification/resource/semantic_conventions/cloud.md @@ -11,13 +11,15 @@ |---|---|---|---|---| | `cloud.provider` | string | Name of the cloud provider. | `alibaba_cloud` | No | | `cloud.account.id` | string | The cloud account ID the resource is assigned to. | `111111111111`; `opentelemetry` | No | -| `cloud.region` | string | The geographical region the resource is running. Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations). | `us-central1`; `us-east-1` | No | -| `cloud.availability_zone` | string | Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running. [1] | `us-east-1c` | No | -| `cloud.platform` | string | The cloud platform in use. [2] | `alibaba_cloud_ecs` | No | +| `cloud.region` | string | The geographical region the resource is running. [1] | `us-central1`; `us-east-1` | No | +| `cloud.availability_zone` | string | Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running. [2] | `us-east-1c` | No | +| `cloud.platform` | string | The cloud platform in use. [3] | `alibaba_cloud_ecs` | No | -**[1]:** Availability zones are called "zones" on Alibaba Cloud and Google Cloud. +**[1]:** Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), [Google Cloud regions](https://cloud.google.com/about/locations), or [Tencent Cloud regions](https://intl.cloud.tencent.com/document/product/213/6091). -**[2]:** The prefix of the service SHOULD match the one specified in `cloud.provider`. +**[2]:** Availability zones are called "zones" on Alibaba Cloud and Google Cloud. + +**[3]:** The prefix of the service SHOULD match the one specified in `cloud.provider`. `cloud.provider` MUST be one of the following or, if none of the listed values apply, a custom value: @@ -27,6 +29,7 @@ | `aws` | Amazon Web Services | | `azure` | Microsoft Azure | | `gcp` | Google Cloud Platform | +| `tencent_cloud` | Tencent Cloud | `cloud.platform` MUST be one of the following or, if none of the listed values apply, a custom value: @@ -49,4 +52,7 @@ | `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | | `gcp_cloud_functions` | Google Cloud Functions (GCF) | | `gcp_app_engine` | Google Cloud App Engine (GAE) | +| `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) | +| `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) | +| `tencent_cloud_scf` | Tencent Cloud Serverless Cloud Function (SCF) | diff --git a/specification/trace/semantic_conventions/faas.md b/specification/trace/semantic_conventions/faas.md index 93c54d3d5..f5ba8f11b 100644 --- a/specification/trace/semantic_conventions/faas.md +++ b/specification/trace/semantic_conventions/faas.md @@ -122,6 +122,7 @@ which the invoked FaaS instance reports about itself, if it's instrumented. | `aws` | Amazon Web Services | | `azure` | Microsoft Azure | | `gcp` | Google Cloud Platform | +| `tencent_cloud` | Tencent Cloud | [FaaS resource attributes]: ../../resource/semantic_conventions/faas.md