Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[semantic conventions] add tencent cloud as a cloud provider #2006

Merged
merged 8 commits into from
Oct 12, 2021
Merged

[semantic conventions] add tencent cloud as a cloud provider #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55b14e9
feat: add tencent cloud as a cloud provider
meteorlxy Oct 11, 2021
1a7c58f
chore: tweaks
meteorlxy Oct 11, 2021
360d913
chore: tweaks
meteorlxy Oct 11, 2021
99c2f1c
chore: lint
meteorlxy Oct 11, 2021
cd185a6
chore: changelog
meteorlxy Oct 11, 2021
2ea1158
chore: tweaks
meteorlxy Oct 11, 2021
ef2e459
chore: tweaks
meteorlxy Oct 11, 2021
24d2c1e
Merge branch 'main' into tencent_cloud
SergeyKanzhelev Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ release.

- BREAKING: Remove db.cassandra.keyspace and db.hbase.namespace, and clarify db.name
([#1973](https://github.com/open-telemetry/opentelemetry-specification/pull/1973))
- Add Tencent Cloud as a cloud provider.
([#2006](https://github.com/open-telemetry/opentelemetry-specification/pull/2006))

- Don't set Span.Status for 4xx http status codes for SERVER spans.
([#1998](https://github.com/open-telemetry/opentelemetry-specification/pull/1998))
Expand Down
20 changes: 17 additions & 3 deletions semantic_conventions/resource/cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).
meteorlxy marked this conversation as resolved.
Show resolved Hide resolved
examples: ['us-central1', 'us-east-1']
- id: availability_zone
type: string
Expand Down Expand Up @@ -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)
meteorlxy marked this conversation as resolved.
Show resolved Hide resolved
- 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: >
Expand Down
3 changes: 3 additions & 0 deletions semantic_conventions/trace/faas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions specification/resource/semantic_conventions/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
meteorlxy marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 11 additions & 5 deletions specification/resource/semantic_conventions/cloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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:

Expand All @@ -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) |
<!-- endsemconv -->
1 change: 1 addition & 0 deletions specification/trace/semantic_conventions/faas.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
<!-- endsemconv -->

[FaaS resource attributes]: ../../resource/semantic_conventions/faas.md
Expand Down