From 6163bb7deda8e43aeda0615ec5250e9727476077 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 25 Apr 2024 15:13:21 -0700 Subject: [PATCH 1/3] Revert obsoletion of OpenTelemetryBuilder. --- src/OpenTelemetry.Extensions.Hosting/OpenTelemetryBuilder.cs | 1 - .../OpenTelemetryServicesExtensions.cs | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryBuilder.cs b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryBuilder.cs index 2ddb9b50055..042a211e76b 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryBuilder.cs +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryBuilder.cs @@ -19,7 +19,6 @@ namespace OpenTelemetry; /// Contains methods for configuring the OpenTelemetry SDK inside an . /// -[Obsolete("Use IOpenTelemetryBuilder instead this class will be removed in a future version.")] public sealed class OpenTelemetryBuilder : IOpenTelemetryBuilder { internal OpenTelemetryBuilder(IServiceCollection services) diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs index ac875dd4cc3..a91d186ccbd 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs @@ -36,12 +36,7 @@ public static class OpenTelemetryServicesExtensions /// . /// The supplied for chaining /// calls. -#pragma warning disable CS0618 // Type or member is obsolete - // Note: OpenTelemetryBuilder is obsolete because users should target - // IOpenTelemetryBuilder for extensions but this method is valid and - // expected to be called to obtain a root builder. public static OpenTelemetryBuilder AddOpenTelemetry(this IServiceCollection services) -#pragma warning restore CS0618 // Type or member is obsolete { Guard.ThrowIfNull(services); From 3d929648d70bd7ad3f91ebcee76278bc2002b05e Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 25 Apr 2024 15:14:25 -0700 Subject: [PATCH 2/3] CHANGELOG stub. --- src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index c6194552fcd..e7839a30442 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Reverted obsoletion of `OpenTelemetryBuilder`. + ([#XXXX](https://github.com/open-telemetry/opentelemetry-dotnet/pull/XXXX)) + ## 1.8.1 Released 2024-Apr-17 From 52e63e69986bab82474356c169f3b7b7537f594f Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 25 Apr 2024 15:20:34 -0700 Subject: [PATCH 3/3] CHANGELOG patch. --- src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index e7839a30442..d0f6f22868b 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased * Reverted obsoletion of `OpenTelemetryBuilder`. - ([#XXXX](https://github.com/open-telemetry/opentelemetry-dotnet/pull/XXXX)) + ([#5571](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5571)) ## 1.8.1