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

Avoid using "infrastructure" terminology for all cloud #1530

Merged
merged 6 commits into from
Mar 22, 2021
Merged

Avoid using "infrastructure" terminology for all cloud #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b4213f
Avoid using "infrastructure" terminology for all cloud
rakyll Mar 10, 2021
d0d6a3b
Add CHANGELOG
rakyll Mar 10, 2021
7254fd9
Fix wording
rakyll Mar 10, 2021
82bcc5c
Rename to platform
rakyll Mar 11, 2021
4461502
Rebase
rakyll Mar 11, 2021
aa4cefd
Merge branch 'main' into cloud-infra
carlosalberto Mar 22, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Google products under `cloud.infrastructure_service` ([#1496](https://github.com
- `http.url` MUST NOT contain credentials ([#1502](https://github.com/open-telemetry/opentelemetry-specification/pull/1502))
- Add `aws.eks.cluster.arn` to EKS specific semantic conventions ([#1484](https://github.com/open-telemetry/opentelemetry-specification/pull/1484))
- Rename `zone` to `availability_zone` in `cloud` semantic conventions ([#1495](https://github.com/open-telemetry/opentelemetry-specification/pull/1495))
- Rename `cloud.infrastructure_service` to `cloud.platform` ([#1530](https://github.com/open-telemetry/opentelemetry-specification/pull/1530))
rakyll marked this conversation as resolved.
Show resolved Hide resolved
- Add section describing that libraries and the collector should autogenerate
the semantic convention keys. ([#1515](https://github.com/open-telemetry/opentelemetry-specification/pull/1515))

Expand Down
6 changes: 3 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 @@ -2,7 +2,7 @@ groups:
- id: cloud
prefix: cloud
brief: >
A cloud infrastructure (e.g. GCP, Azure, AWS)
A cloud environment (e.g. GCP, Azure, AWS)
attributes:
- id: provider
type:
Expand Down Expand Up @@ -42,7 +42,7 @@ groups:
note: >
Availability zones are called "zones" on Google Cloud.
examples: ['us-east-1c']
- id: infrastructure_service
- id: platform
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only hits I get on google for "Cloud platform" is GCP as a whole...

type:
allow_custom_values: true
members:
Expand Down Expand Up @@ -92,7 +92,7 @@ groups:
value: 'gcp_app_engine'
brief: Google Cloud App Engine (GAE)
brief: >
The cloud infrastructure resource in use.
The cloud platform in use.
note: >
The prefix of the service SHOULD match the one specified in `cloud.provider`.
examples: ['aws_ec2', 'azure_vm', 'gcp_compute_engine']
4 changes: 2 additions & 2 deletions specification/resource/semantic_conventions/cloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
| `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.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.infrastructure_service` | string | The cloud infrastructure resource in use. [2] | `aws_ec2`; `azure_vm`; `gcp_compute_engine` | No |
| `cloud.platform` | string | The cloud platform in use. [2] | `aws_ec2`; `azure_vm`; `gcp_compute_engine` | No |

**[1]:** Availability zones are called "zones" on Google Cloud.

Expand All @@ -27,7 +27,7 @@
| `azure` | Microsoft Azure |
| `gcp` | Google Cloud Platform |

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

| Value | Description |
|---|---|
Expand Down