Skip to content

Commit

Permalink
[semantic conventions] add alibaba cloud as a cloud provider (open-te…
Browse files Browse the repository at this point in the history
…lemetry#1831)

Co-authored-by: Armin Ruech <armin.ruech@dynatrace.com>
Co-authored-by: Carlos Alberto Cortez <calberto.cortez@gmail.com>
  • Loading branch information
3 people authored Aug 3, 2021
1 parent b76e16f commit c35c212
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 14 additions & 3 deletions semantic_conventions/resource/cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions semantic_conventions/trace/faas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions specification/resource/semantic_conventions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
11 changes: 7 additions & 4 deletions specification/resource/semantic_conventions/cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@
<!-- semconv cloud -->
| 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`.

`cloud.provider` MUST be one of the following or, if none of the listed values apply, a custom value:

| Value | Description |
|---|---|
| `alibaba_cloud` | Alibaba Cloud |
| `aws` | Amazon Web Services |
| `azure` | Microsoft Azure |
| `gcp` | Google Cloud Platform |
Expand All @@ -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 |
Expand Down
3 changes: 2 additions & 1 deletion specification/trace/semantic_conventions/faas.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 |
Expand Down

0 comments on commit c35c212

Please sign in to comment.