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

Use Deployment Environment in Resources' README instead of Environment. #851

Merged
merged 8 commits into from
Sep 8, 2020
Merged

Use Deployment Environment in Resources' README instead of Environment. #851

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84713cb
Use Environment Stage in Resources instead of Environment.
carlosalberto Aug 21, 2020
7ca2e07
Merge branch 'master' into adjust_env_stage_resources
carlosalberto Aug 22, 2020
3362756
Environment Stage -> DeploymentEnvironment.
carlosalberto Aug 23, 2020
d4935ae
Merge branch 'master' into adjust_env_stage_resources
carlosalberto Aug 24, 2020
801b29d
Merge branch 'master' into adjust_env_stage_resources
carlosalberto Aug 24, 2020
3437fe8
Merge branch 'master' into adjust_env_stage_resources
carlosalberto Sep 8, 2020
429cd00
Fix style.
carlosalberto Sep 8, 2020
41d5a7d
Merge branch 'master' into adjust_env_stage_resources
carlosalberto Sep 8, 2020
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 @@ -10,6 +10,7 @@ the release.
New:

- Add resource semantic conventions for operating systems ([#693](https://github.com/open-telemetry/opentelemetry-specification/pull/693))
- Add resource semantic convention for deployment environment [#606](https://github.com/open-telemetry/opentelemetry-specification/pull/606/)
- Clarification of the behavior of the Trace API, re: context propagation, in the absence of an installed SDK
- Add Span API and semantic conventions for recording exceptions
([#697](https://github.com/open-telemetry/opentelemetry-specification/pull/697))
Expand Down
2 changes: 1 addition & 1 deletion specification/resource/semantic_conventions/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Attributes defining a running environment (e.g. Operating System, Cloud, Data Ce
- [Operating System](./os.md)
- [Cloud](./cloud.md)
- Deployment:
- [Environment](./deployment_environment.md)
- [Environment Stage](./deployment_environment.md)
carlosalberto marked this conversation as resolved.
Show resolved Hide resolved
carlosalberto marked this conversation as resolved.
Show resolved Hide resolved
carlosalberto marked this conversation as resolved.
Show resolved Hide resolved
- [Kubernetes](./k8s.md)

## Version Attributes
Expand Down