From 425ba358f0e79835feecf29e61161606ddb827cc Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 10:43:00 -0700 Subject: [PATCH 1/6] update changelog --- .../CHANGELOG.md | 2 +- .../CHANGELOG.md | 29 ++++++++++++++---- .../CHANGELOG.md | 30 +++++++++++++++---- .../CHANGELOG.md | 26 +++++++++++++--- 4 files changed, 70 insertions(+), 17 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md index e44cfb26a95..79c303306a2 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md @@ -25,7 +25,7 @@ and [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/http/http-metrics.md). ([#4537](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4537), - [#4606](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4606)), + [#4606](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4606), [#4660](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4660)) * Fixed an issue affecting NET 7.0+. If custom propagation is being used diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index 850c713aa0d..751c03f9429 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -2,12 +2,29 @@ ## Unreleased -* Updated Semantic Conventions to - [v1.21.0](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md). - This library can emit either old, new, or both attributes. Users can control -which attributes are emitted by setting the environment variable -OTEL_SEMCONV_STABILITY_OPT_IN. -[#4658](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4658) +* The new HTTP and network semantic conventions can be opted in to by setting + the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a + transition period for users to experiment with the new semantic conventions + and adapt as necessary. The environment variable supports the following + values: + * `http` - emit the new, frozen (proposed for stable) HTTP and networking + attributes, and stop emitting the old experimental HTTP and networking + attributes that the instrumentation emitted previously. + * `http/dup` - emit both the old and the frozen (proposed for stable) HTTP + and networking attributes, allowing for a more seamless transition. + * The default behavior (in the absence of one of these values) is to continue + emitting the same HTTP and network semantic conventions that were emitted in + `1.5.0-beta.1`. + * Note: this option will eventually be removed after the new HTTP and + network semantic conventions are marked stable. At which time this + instrumentation can receive a stable release, and the old HTTP and + network semantic conventions will no longer be supported. Refer to the + specification for more information regarding the new HTTP and network + semantic conventions for both + [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md) + and + [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-metrics.md). + ([#4658](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4658)) ## 1.5.0-beta.1 diff --git a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md index 04e6d0fe3d2..8791b819367 100644 --- a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md @@ -2,12 +2,30 @@ ## Unreleased -* Updated Semantic Conventions to [v1.21.0](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/http/http-spans.md). - This library can emit either old, new, or both attributes. - Users can control which attributes are emitted by setting the environment - variable `OTEL_SEMCONV_STABILITY_OPT_IN`. - ([#4538](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4538)) - ([#4639](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4639)) +* The new HTTP and network semantic conventions can be opted in to by setting + the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a + transition period for users to experiment with the new semantic conventions + and adapt as necessary. The environment variable supports the following + values: + * `http` - emit the new, frozen (proposed for stable) HTTP and networking + attributes, and stop emitting the old experimental HTTP and networking + attributes that the instrumentation emitted previously. + * `http/dup` - emit both the old and the frozen (proposed for stable) HTTP + and networking attributes, allowing for a more seamless transition. + * The default behavior (in the absence of one of these values) is to continue + emitting the same HTTP and network semantic conventions that were emitted in + `1.5.0-beta.1`. + * Note: this option will eventually be removed after the new HTTP and + network semantic conventions are marked stable. At which time this + instrumentation can receive a stable release, and the old HTTP and + network semantic conventions will no longer be supported. Refer to the + specification for more information regarding the new HTTP and network + semantic conventions for both + [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/http/http-spans.md) + and + [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/http/http-metrics.md). + ([#4538](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4538), + [#4639](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4639)) ## 1.5.0-beta.1 diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index b2aef656dde..a7c87acc3f9 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -2,10 +2,28 @@ ## Unreleased -* Updated Semantic Conventions to [v1.21.0](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md) - This library can emit either old, new, or both attributes. - Users can control which attributes are emitted by setting the environment - variable `OTEL_SEMCONV_STABILITY_OPT_IN`. +* The new HTTP and network semantic conventions can be opted in to by setting + the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a + transition period for users to experiment with the new semantic conventions + and adapt as necessary. The environment variable supports the following + values: + * `http` - emit the new, frozen (proposed for stable) HTTP and networking + attributes, and stop emitting the old experimental HTTP and networking + attributes that the instrumentation emitted previously. + * `http/dup` - emit both the old and the frozen (proposed for stable) HTTP + and networking attributes, allowing for a more seamless transition. + * The default behavior (in the absence of one of these values) is to continue + emitting the same HTTP and network semantic conventions that were emitted in + `1.5.0-beta.1`. + * Note: this option will eventually be removed after the new HTTP and + network semantic conventions are marked stable. At which time this + instrumentation can receive a stable release, and the old HTTP and + network semantic conventions will no longer be supported. Refer to the + specification for more information regarding the new HTTP and network + semantic conventions for both + [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md) + and + [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-metrics.md). ([#4644](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4644)) ## 1.5.0-beta.1 From fbf994ac33db8fc0b350de97bd0d7e5f9847e48a Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 10:59:58 -0700 Subject: [PATCH 2/6] remove database metrics statement --- src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index a7c87acc3f9..f58e3f753df 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -20,10 +20,8 @@ instrumentation can receive a stable release, and the old HTTP and network semantic conventions will no longer be supported. Refer to the specification for more information regarding the new HTTP and network - semantic conventions for both - [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md) - and - [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-metrics.md). + semantic conventions for + [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md). ([#4644](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4644)) ## 1.5.0-beta.1 From 9645619427e481ee6134f42e1ca4e0ac59863251 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 11:01:59 -0700 Subject: [PATCH 3/6] update --- .../CHANGELOG.md | 8 +++----- src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index 751c03f9429..f66854eca89 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -19,11 +19,9 @@ network semantic conventions are marked stable. At which time this instrumentation can receive a stable release, and the old HTTP and network semantic conventions will no longer be supported. Refer to the - specification for more information regarding the new HTTP and network - semantic conventions for both - [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md) - and - [metrics](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-metrics.md). + specification for more information regarding the new network + semantic conventions for + [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md). ([#4658](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4658)) ## 1.5.0-beta.1 diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index f58e3f753df..c429b894c5a 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -19,7 +19,7 @@ network semantic conventions are marked stable. At which time this instrumentation can receive a stable release, and the old HTTP and network semantic conventions will no longer be supported. Refer to the - specification for more information regarding the new HTTP and network + specification for more information regarding the new network semantic conventions for [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md). ([#4644](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4644)) From fd45b8af43352d94f82f2dfe3934b5b20a5dbfa6 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 11:12:31 -0700 Subject: [PATCH 4/6] remove references to HTTP in both grpc and sql changelogs --- .../CHANGELOG.md | 16 ++++++++-------- .../CHANGELOG.md | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index f66854eca89..b45fb936ae2 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -2,22 +2,22 @@ ## Unreleased -* The new HTTP and network semantic conventions can be opted in to by setting +* The new network semantic conventions can be opted in to by setting the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a transition period for users to experiment with the new semantic conventions and adapt as necessary. The environment variable supports the following values: - * `http` - emit the new, frozen (proposed for stable) HTTP and networking - attributes, and stop emitting the old experimental HTTP and networking + * `http` - emit the new, frozen (proposed for stable) networking + attributes, and stop emitting the old experimental networking attributes that the instrumentation emitted previously. - * `http/dup` - emit both the old and the frozen (proposed for stable) HTTP - and networking attributes, allowing for a more seamless transition. + * `http/dup` - emit both the old and the frozen (proposed for stable) + networking attributes, allowing for a more seamless transition. * The default behavior (in the absence of one of these values) is to continue - emitting the same HTTP and network semantic conventions that were emitted in + emitting the same network semantic conventions that were emitted in `1.5.0-beta.1`. - * Note: this option will eventually be removed after the new HTTP and + * Note: this option will eventually be removed after the new network semantic conventions are marked stable. At which time this - instrumentation can receive a stable release, and the old HTTP and + instrumentation can receive a stable release, and the old network semantic conventions will no longer be supported. Refer to the specification for more information regarding the new network semantic conventions for diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index c429b894c5a..d55a46f3588 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -2,22 +2,22 @@ ## Unreleased -* The new HTTP and network semantic conventions can be opted in to by setting +* The new network semantic conventions can be opted in to by setting the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a transition period for users to experiment with the new semantic conventions and adapt as necessary. The environment variable supports the following values: - * `http` - emit the new, frozen (proposed for stable) HTTP and networking - attributes, and stop emitting the old experimental HTTP and networking + * `http` - emit the new, frozen (proposed for stable) networking + attributes, and stop emitting the old experimental networking attributes that the instrumentation emitted previously. - * `http/dup` - emit both the old and the frozen (proposed for stable) HTTP - and networking attributes, allowing for a more seamless transition. + * `http/dup` - emit both the old and the frozen (proposed for stable) + networking attributes, allowing for a more seamless transition. * The default behavior (in the absence of one of these values) is to continue - emitting the same HTTP and network semantic conventions that were emitted in + emitting the same network semantic conventions that were emitted in `1.5.0-beta.1`. - * Note: this option will eventually be removed after the new HTTP and + * Note: this option will eventually be removed after the new network semantic conventions are marked stable. At which time this - instrumentation can receive a stable release, and the old HTTP and + instrumentation can receive a stable release, and the old network semantic conventions will no longer be supported. Refer to the specification for more information regarding the new network semantic conventions for From 82dfb2c39c4cc36b48377665e3db011a064c63eb Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 11:20:24 -0700 Subject: [PATCH 5/6] remove trailing whitespace --- src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md | 2 +- src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index b45fb936ae2..d0e991899f2 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -20,7 +20,7 @@ instrumentation can receive a stable release, and the old network semantic conventions will no longer be supported. Refer to the specification for more information regarding the new network - semantic conventions for + semantic conventions for [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md). ([#4658](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4658)) diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index d55a46f3588..f99f9c1fac8 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -20,7 +20,7 @@ instrumentation can receive a stable release, and the old network semantic conventions will no longer be supported. Refer to the specification for more information regarding the new network - semantic conventions for + semantic conventions for [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md). ([#4644](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4644)) From 940f9c31ca96e0898ec7424dcdbd7b2870589203 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Tue, 18 Jul 2023 13:28:32 -0700 Subject: [PATCH 6/6] remove statement about stable release --- src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md | 4 +--- src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index d0e991899f2..4f6c9d4bc9f 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -16,9 +16,7 @@ emitting the same network semantic conventions that were emitted in `1.5.0-beta.1`. * Note: this option will eventually be removed after the new - network semantic conventions are marked stable. At which time this - instrumentation can receive a stable release, and the old - network semantic conventions will no longer be supported. Refer to the + network semantic conventions are marked stable. Refer to the specification for more information regarding the new network semantic conventions for [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/rpc/rpc-spans.md). diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index f99f9c1fac8..4d8c6d9f35d 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -16,9 +16,7 @@ emitting the same network semantic conventions that were emitted in `1.5.0-beta.1`. * Note: this option will eventually be removed after the new - network semantic conventions are marked stable. At which time this - instrumentation can receive a stable release, and the old - network semantic conventions will no longer be supported. Refer to the + network semantic conventions are marked stable. Refer to the specification for more information regarding the new network semantic conventions for [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/database/database-spans.md).