From 84713cbb6fd34f1cacc12788afb636f6826816c9 Mon Sep 17 00:00:00 2001 From: Carlos Alberto Cortez Date: Fri, 21 Aug 2020 16:26:57 +0200 Subject: [PATCH 1/3] Use Environment Stage in Resources instead of Environment. --- CHANGELOG.md | 1 + specification/resource/semantic_conventions/README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0014957af6f..94bcfcc978e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/specification/resource/semantic_conventions/README.md b/specification/resource/semantic_conventions/README.md index dcea4807872..5a0b85a71cf 100644 --- a/specification/resource/semantic_conventions/README.md +++ b/specification/resource/semantic_conventions/README.md @@ -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) - [Kubernetes](./k8s.md) ## Version Attributes From 33627564f36d2934c4b8f6d0aefa176df94ec6b2 Mon Sep 17 00:00:00 2001 From: Carlos Alberto Cortez Date: Sun, 23 Aug 2020 17:32:35 +0200 Subject: [PATCH 2/3] Environment Stage -> DeploymentEnvironment. --- specification/resource/semantic_conventions/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resource/semantic_conventions/README.md b/specification/resource/semantic_conventions/README.md index 5a0b85a71cf..6149549e52e 100644 --- a/specification/resource/semantic_conventions/README.md +++ b/specification/resource/semantic_conventions/README.md @@ -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 Stage](./deployment_environment.md) + - [Deployment Environment](./deployment_environment.md) - [Kubernetes](./k8s.md) ## Version Attributes From 429cd0093fc53a0e4500d80d0df95cae448c291e Mon Sep 17 00:00:00 2001 From: Carlos Alberto Cortez Date: Tue, 8 Sep 2020 16:10:23 +0200 Subject: [PATCH 3/3] Fix style. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 639b5ee2094..3bbbd2086ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ New: ([#693](https://github.com/open-telemetry/opentelemetry-specification/pull/693)) - Add semantic conventions for outgoing Function as a Service (FaaS) invocations ([#862](https://github.com/open-telemetry/opentelemetry-specification/pull/862)) -- Add resource semantic convention for deployment environment +- 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