diff --git a/CHANGELOG.md b/CHANGELOG.md index 318b0f800fa..1a184f9578a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ release. ### Semantic Conventions +- Adding alibaba cloud as a cloud provider. + ([#1831](https://github.com/open-telemetry/opentelemetry-specification/pull/1831)) + ### Compatibility ### OpenTelemetry Protocol diff --git a/semantic_conventions/resource/cloud.yaml b/semantic_conventions/resource/cloud.yaml index 5ae303d0948..5232f60ecc3 100644 --- a/semantic_conventions/resource/cloud.yaml +++ b/semantic_conventions/resource/cloud.yaml @@ -8,6 +8,9 @@ groups: type: allow_custom_values: true members: + - id: Alibaba Cloud + value: 'alibaba_cloud' + brief: 'Alibaba Cloud' - id: AWS value: 'aws' brief: 'Amazon Web Services' @@ -29,8 +32,10 @@ groups: brief: > The geographical region the resource is running. Refer to your provider's docs to see the available regions, for example - [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). + [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). examples: ['us-central1', 'us-east-1'] - id: availability_zone type: string @@ -39,12 +44,18 @@ groups: to increase availability. Availability zone represents the zone where the resource is running. note: > - Availability zones are called "zones" on Google Cloud. + Availability zones are called "zones" on Alibaba Cloud and Google Cloud. examples: ['us-east-1c'] - id: platform type: allow_custom_values: true members: + - id: alibaba_cloud_ecs + value: 'alibaba_cloud_ecs' + brief: Alibaba Cloud Elastic Compute Service + - id: alibaba_cloud_fc + value: 'alibaba_cloud_fc' + brief: Alibaba Cloud Function Compute - id: aws_ec2 value: 'aws_ec2' brief: AWS Elastic Compute Cloud diff --git a/semantic_conventions/trace/faas.yaml b/semantic_conventions/trace/faas.yaml index d8fed5308d9..93fb14c7ec5 100644 --- a/semantic_conventions/trace/faas.yaml +++ b/semantic_conventions/trace/faas.yaml @@ -154,6 +154,9 @@ groups: type: allow_custom_values: true members: + - id: Alibaba Cloud + value: 'alibaba_cloud' + brief: 'Alibaba Cloud' - id: AWS value: 'aws' brief: 'Amazon Web Services' diff --git a/specification/resource/semantic_conventions/README.md b/specification/resource/semantic_conventions/README.md index d4a1ed9772a..7c76eb44c5a 100644 --- a/specification/resource/semantic_conventions/README.md +++ b/specification/resource/semantic_conventions/README.md @@ -167,6 +167,7 @@ resources can only be defined for providers listed as a valid `cloud.provider` i [Cloud](./cloud.md) and below. Provider-specific attributes all reside in the `cloud_provider` directory. Valid cloud providers are: +- [Alibaba Cloud](https://www.alibabacloud.com/) (`alibaba_cloud`) - [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`) diff --git a/specification/resource/semantic_conventions/cloud.md b/specification/resource/semantic_conventions/cloud.md index e2aa3286503..9fc27aa5168 100644 --- a/specification/resource/semantic_conventions/cloud.md +++ b/specification/resource/semantic_conventions/cloud.md @@ -9,13 +9,13 @@ | Attribute | Type | Description | Examples | Required | |---|---|---|---|---| -| `cloud.provider` | string | Name of the cloud provider. | `aws` | No | +| `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 [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.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] | `aws_ec2` | No | +| `cloud.platform` | string | The cloud platform in use. [2] | `alibaba_cloud_ecs` | No | -**[1]:** Availability zones are called "zones" on Google Cloud. +**[1]:** Availability zones are called "zones" on Alibaba Cloud and Google Cloud. **[2]:** The prefix of the service SHOULD match the one specified in `cloud.provider`. @@ -23,6 +23,7 @@ | Value | Description | |---|---| +| `alibaba_cloud` | Alibaba Cloud | | `aws` | Amazon Web Services | | `azure` | Microsoft Azure | | `gcp` | Google Cloud Platform | @@ -31,6 +32,8 @@ | Value | Description | |---|---| +| `alibaba_cloud_ecs` | Alibaba Cloud Elastic Compute Service | +| `alibaba_cloud_fc` | Alibaba Cloud Function Compute | | `aws_ec2` | AWS Elastic Compute Cloud | | `aws_ecs` | AWS Elastic Container Service | | `aws_eks` | AWS Elastic Kubernetes Service | diff --git a/specification/trace/semantic_conventions/faas.md b/specification/trace/semantic_conventions/faas.md index 1f93e76d9b0..93c54d3d583 100644 --- a/specification/trace/semantic_conventions/faas.md +++ b/specification/trace/semantic_conventions/faas.md @@ -103,7 +103,7 @@ which the invoked FaaS instance reports about itself, if it's instrumented. | Attribute | Type | Description | Examples | Required | |---|---|---|---|---| | `faas.invoked_name` | string | The name of the invoked function. [1] | `my-function` | Yes | -| `faas.invoked_provider` | string | The cloud provider of the invoked function. [2] | `aws` | Yes | +| `faas.invoked_provider` | string | The cloud provider of the invoked function. [2] | `alibaba_cloud` | Yes | | `faas.invoked_region` | string | The cloud region of the invoked function. [3] | `eu-central-1` | Conditional [4] | **[1]:** SHOULD be equal to the `faas.name` resource attribute of the invoked function. @@ -118,6 +118,7 @@ which the invoked FaaS instance reports about itself, if it's instrumented. | Value | Description | |---|---| +| `alibaba_cloud` | Alibaba Cloud | | `aws` | Amazon Web Services | | `azure` | Microsoft Azure | | `gcp` | Google Cloud Platform |