Skip to content

Commit 4ea63cd

Browse files
[semantic conventions] add tencent cloud as a cloud provider (open-telemetry#2006)
* feat: add tencent cloud as a cloud provider * chore: tweaks * chore: tweaks * chore: lint * chore: changelog * chore: tweaks * chore: tweaks Co-authored-by: Sergey Kanzhelev <[email protected]>
1 parent 0dcc3fb commit 4ea63cd

File tree

6 files changed

+35
-8
lines changed

6 files changed

+35
-8
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ release.
2626

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

3032
- Don't set Span.Status for 4xx http status codes for SERVER spans.
3133
([#1998](https://github.com/open-telemetry/opentelemetry-specification/pull/1998))

semantic_conventions/resource/cloud.yaml

+17-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ groups:
2020
- id: 'gcp'
2121
value: 'gcp'
2222
brief: 'Google Cloud Platform'
23+
- id: 'tencent_cloud'
24+
value: 'tencent_cloud'
25+
brief: 'Tencent Cloud'
2326
brief: >
2427
Name of the cloud provider.
2528
- id: account.id
@@ -30,12 +33,14 @@ groups:
3033
- id: region
3134
type: string
3235
brief: >
33-
The geographical region the resource is running. Refer to your
34-
provider's docs to see the available regions, for example
36+
The geographical region the resource is running.
37+
note: >
38+
Refer to your provider's docs to see the available regions, for example
3539
[Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm),
3640
[AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/),
3741
[Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/),
38-
or [Google Cloud regions](https://cloud.google.com/about/locations).
42+
[Google Cloud regions](https://cloud.google.com/about/locations),
43+
or [Tencent Cloud regions](https://intl.cloud.tencent.com/document/product/213/6091).
3944
examples: ['us-central1', 'us-east-1']
4045
- id: availability_zone
4146
type: string
@@ -101,6 +106,15 @@ groups:
101106
- id: gcp_app_engine
102107
value: 'gcp_app_engine'
103108
brief: Google Cloud App Engine (GAE)
109+
- id: tencent_cloud_cvm
110+
value: 'tencent_cloud_cvm'
111+
brief: Tencent Cloud Cloud Virtual Machine (CVM)
112+
- id: tencent_cloud_eks
113+
value: 'tencent_cloud_eks'
114+
brief: Tencent Cloud Elastic Kubernetes Service (EKS)
115+
- id: tencent_cloud_scf
116+
value: 'tencent_cloud_scf'
117+
brief: Tencent Cloud Serverless Cloud Function (SCF)
104118
brief: >
105119
The cloud platform in use.
106120
note: >

semantic_conventions/trace/faas.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ groups:
166166
- id: 'gcp'
167167
value: 'gcp'
168168
brief: 'Google Cloud Platform'
169+
- id: 'tencent_cloud'
170+
value: 'tencent_cloud'
171+
brief: 'Tencent Cloud'
169172
required: always
170173
brief: >
171174
The cloud provider of the invoked function.

specification/resource/semantic_conventions/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,4 @@ Valid cloud providers are:
171171
- [Amazon Web Services](https://aws.amazon.com/) ([`aws`](cloud_provider/aws/README.md))
172172
- [Google Cloud Platform](https://cloud.google.com/) (`gcp`)
173173
- [Microsoft Azure](https://azure.microsoft.com/) (`azure`)
174+
- [Tencent Cloud](https://intl.cloud.tencent.com/) (`tencent_cloud`)

specification/resource/semantic_conventions/cloud.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
|---|---|---|---|---|
1212
| `cloud.provider` | string | Name of the cloud provider. | `alibaba_cloud` | No |
1313
| `cloud.account.id` | string | The cloud account ID the resource is assigned to. | `111111111111`; `opentelemetry` | No |
14-
| `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 |
15-
| `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 |
16-
| `cloud.platform` | string | The cloud platform in use. [2] | `alibaba_cloud_ecs` | No |
14+
| `cloud.region` | string | The geographical region the resource is running. [1] | `us-central1`; `us-east-1` | No |
15+
| `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 |
16+
| `cloud.platform` | string | The cloud platform in use. [3] | `alibaba_cloud_ecs` | No |
1717

18-
**[1]:** Availability zones are called "zones" on Alibaba Cloud and Google Cloud.
18+
**[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).
1919

20-
**[2]:** The prefix of the service SHOULD match the one specified in `cloud.provider`.
20+
**[2]:** Availability zones are called "zones" on Alibaba Cloud and Google Cloud.
21+
22+
**[3]:** The prefix of the service SHOULD match the one specified in `cloud.provider`.
2123

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

@@ -27,6 +29,7 @@
2729
| `aws` | Amazon Web Services |
2830
| `azure` | Microsoft Azure |
2931
| `gcp` | Google Cloud Platform |
32+
| `tencent_cloud` | Tencent Cloud |
3033

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

@@ -49,4 +52,7 @@
4952
| `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) |
5053
| `gcp_cloud_functions` | Google Cloud Functions (GCF) |
5154
| `gcp_app_engine` | Google Cloud App Engine (GAE) |
55+
| `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) |
56+
| `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) |
57+
| `tencent_cloud_scf` | Tencent Cloud Serverless Cloud Function (SCF) |
5258
<!-- endsemconv -->

specification/trace/semantic_conventions/faas.md

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ which the invoked FaaS instance reports about itself, if it's instrumented.
122122
| `aws` | Amazon Web Services |
123123
| `azure` | Microsoft Azure |
124124
| `gcp` | Google Cloud Platform |
125+
| `tencent_cloud` | Tencent Cloud |
125126
<!-- endsemconv -->
126127

127128
[FaaS resource attributes]: ../../resource/semantic_conventions/faas.md

0 commit comments

Comments
 (0)