From 5e3bce69a3576daa94ce8fa0807248b0d2607a2c Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Tue, 10 Jan 2023 11:50:20 -0800 Subject: [PATCH 1/8] Remove obsolete methods from hosting library ahead of 1.4.0 release. --- .../README.md | 2 +- .../netstandard2.0/PublicAPI.Shipped.txt | 1 + .../netstandard2.0/PublicAPI.Unshipped.txt | 13 +- .../CHANGELOG.md | 4 + .../Metrics/MeterProviderBuilderExtensions.cs | 55 -------- .../OpenTelemetry.Extensions.Hosting.csproj | 12 +- .../OpenTelemetryServicesExtensions.cs | 127 ------------------ .../README.md | 54 ++++---- .../Trace/TracerProviderBuilderExtensions.cs | 55 -------- 9 files changed, 43 insertions(+), 280 deletions(-) delete mode 100644 src/OpenTelemetry.Extensions.Hosting/Metrics/MeterProviderBuilderExtensions.cs delete mode 100644 src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs delete mode 100644 src/OpenTelemetry.Extensions.Hosting/Trace/TracerProviderBuilderExtensions.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/README.md b/src/OpenTelemetry.Extensions.DependencyInjection/README.md index 3e783d502ee..40777db1d41 100644 --- a/src/OpenTelemetry.Extensions.DependencyInjection/README.md +++ b/src/OpenTelemetry.Extensions.DependencyInjection/README.md @@ -6,7 +6,7 @@ ## Installation ```shell -dotnet add package --prerelease OpenTelemetry.Extensions.DependencyInjection +dotnet add package OpenTelemetry.Extensions.DependencyInjection ``` ## Overview diff --git a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Shipped.txt index e69de29bb2d..7dc5c58110b 100644 --- a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Shipped.txt +++ b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Shipped.txt @@ -0,0 +1 @@ +#nullable enable diff --git a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index dbee0f5b37d..ba753a8fc57 100644 --- a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,13 +1,2 @@ -Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions -OpenTelemetry.Metrics.MeterProviderBuilderExtensions OpenTelemetry.OpenTelemetryBuilderHostingExtensions -OpenTelemetry.Trace.TracerProviderBuilderExtensions -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection -static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.Configure(this OpenTelemetry.Metrics.MeterProviderBuilder meterProviderBuilder, System.Action configure) -> OpenTelemetry.Metrics.MeterProviderBuilder -static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.GetServices(this OpenTelemetry.Metrics.MeterProviderBuilder meterProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection -static OpenTelemetry.OpenTelemetryBuilderHostingExtensions.StartWithHost(this OpenTelemetry.OpenTelemetryBuilder builder) -> OpenTelemetry.OpenTelemetryBuilder -static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Configure(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, System.Action configure) -> OpenTelemetry.Trace.TracerProviderBuilder -static OpenTelemetry.Trace.TracerProviderBuilderExtensions.GetServices(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection +static OpenTelemetry.OpenTelemetryBuilderHostingExtensions.StartWithHost(this OpenTelemetry.OpenTelemetryBuilder! builder) -> OpenTelemetry.OpenTelemetryBuilder! diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index dd48159fed1..a90e7a2a061 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +* Removed deprecated extensions: `AddOpenTelemetryTracing`, + `AddOpenTelemetryMetrics`, `Configure`, & `GetServices`. + ([#XXXX](https://github.com/open-telemetry/opentelemetry-dotnet/pull/XXXX)) + ## 1.4.0-rc.2 Released 2023-Jan-09 diff --git a/src/OpenTelemetry.Extensions.Hosting/Metrics/MeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Extensions.Hosting/Metrics/MeterProviderBuilderExtensions.cs deleted file mode 100644 index 520c40bf2fe..00000000000 --- a/src/OpenTelemetry.Extensions.Hosting/Metrics/MeterProviderBuilderExtensions.cs +++ /dev/null @@ -1,55 +0,0 @@ -// -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -using Microsoft.Extensions.DependencyInjection; - -namespace OpenTelemetry.Metrics -{ - /// - /// Contains extension methods for the class. - /// - public static class MeterProviderBuilderExtensions - { - /// - /// Register a callback action to configure the once the application is available. - /// - /// . - /// Configuration callback. - /// The supplied for chaining. - [Obsolete("Call ConfigureBuilder instead this method will be removed in a future version.")] - public static MeterProviderBuilder Configure(this MeterProviderBuilder meterProviderBuilder, Action configure) - { - return meterProviderBuilder.ConfigureBuilder(configure); - } - - /// - /// Gets the application attached to - /// the . - /// - /// . - /// or - /// if services are unavailable. - [Obsolete("Call ConfigureServices instead this method will be removed in a future version.")] - public static IServiceCollection GetServices(this MeterProviderBuilder meterProviderBuilder) - { - IServiceCollection services = null; - meterProviderBuilder.ConfigureServices(s => services = s); - return services; - } - } -} diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj index ee9f1287241..cc1b956abf8 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj @@ -1,13 +1,12 @@ - + + netstandard2.0 Contains extensions to start OpenTelemetry in applications using Microsoft.Extensions.Hosting OpenTelemetry core- - - - disable + latest-all @@ -17,8 +16,13 @@ + + + + + diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs deleted file mode 100644 index 64e837fbf16..00000000000 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs +++ /dev/null @@ -1,127 +0,0 @@ -// -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -using Microsoft.Extensions.Hosting; -using OpenTelemetry; -using OpenTelemetry.Metrics; -using OpenTelemetry.Trace; - -namespace Microsoft.Extensions.DependencyInjection; - -/// -/// Extension methods for setting up OpenTelemetry services in an . -/// -public static class OpenTelemetryServicesExtensions -{ - /// - /// Configure OpenTelemetry and register a - /// to automatically start tracing services in the supplied . - /// - /// - /// Notes: - /// - /// - /// This is safe to be called multiple times. Only a single will be created for a given . - /// - /// - /// This method should be called by application host code. Library - /// authors should call - /// instead. - /// - /// - /// - /// . - /// Supplied for chaining - /// calls. - [Obsolete("Use the AddOpenTelemetry().WithTracing(configure).StartWithHost() pattern instead. This method will be removed in a future version.")] - public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services) - => AddOpenTelemetryTracing(services, b => { }); - - /// - /// Configure OpenTelemetry and register a - /// to automatically start tracing services in the supplied . - /// - /// - /// . - /// Callback action to configure the . - /// Supplied for chaining - /// calls. - [Obsolete("Use the AddOpenTelemetry().WithTracing(configure).StartWithHost() pattern instead. This method will be removed in a future version.")] - public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services, Action configure) - { - services.AddOpenTelemetry().WithTracing(configure).StartWithHost(); - - return services; - } - - /// - /// Configure OpenTelemetry and register a - /// to automatically start metric services in the supplied . - /// - /// - /// Notes: - /// - /// - /// This is safe to be called multiple times. Only a single will be created for a given . - /// - /// - /// This method should be called by application host code. Library - /// authors should call - /// instead. - /// - /// - /// - /// . - /// Supplied for chaining - /// calls. - [Obsolete("Use the AddOpenTelemetry().WithMetrics(configure).StartWithHost() pattern instead. This method will be removed in a future version.")] - public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services) - => AddOpenTelemetryMetrics(services, b => { }); - - /// - /// Configure OpenTelemetry and register a - /// to automatically start metric services in the supplied . - /// - /// - /// . - /// Callback action to configure the . - /// Supplied for chaining - /// calls. - [Obsolete("Use the AddOpenTelemetry().WithMetrics(configure).StartWithHost() pattern instead. This method will be removed in a future version.")] - public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services, Action configure) - { - services.AddOpenTelemetry().WithMetrics(configure).StartWithHost(); - - return services; - } -} diff --git a/src/OpenTelemetry.Extensions.Hosting/README.md b/src/OpenTelemetry.Extensions.Hosting/README.md index b76f082bb5b..e6a2393fc39 100644 --- a/src/OpenTelemetry.Extensions.Hosting/README.md +++ b/src/OpenTelemetry.Extensions.Hosting/README.md @@ -6,7 +6,7 @@ ## Installation ```shell -dotnet add package --prerelease OpenTelemetry.Extensions.Hosting +dotnet add package OpenTelemetry.Extensions.Hosting ``` ## Overview @@ -21,7 +21,7 @@ and metrics (`MeterProvider`) in [ASP.NET ## Extension method reference -### Current OpenTelemetry SDK v1.4.0 and newer extensions +### OpenTelemetry SDK v1.4.0 and newer extensions Targeting `OpenTelemetry.OpenTelemetryBuilder`: @@ -30,7 +30,32 @@ Targeting `OpenTelemetry.OpenTelemetryBuilder`: to automatically start tracing and/or metric services in the supplied [IServiceCollection](https://learn.microsoft.com/dotnet/api/microsoft.extensions.dependencyinjection.iservicecollection). -### Obsolete OpenTelemetry SDK pre-1.4.0 extensions +#### Usage + +The following example shows how to register OpenTelemetry tracing & metrics in +an ASP.NET Core host using the OpenTelemetry.Extensions.Hosting extensions. + +```csharp +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +var appBuilder = WebApplication.CreateBuilder(args); + +appBuilder.Services.AddOpenTelemetry() + .WithTracing(builder => builder.AddConsoleExporter()) + .WithMetrics(builder => builder.AddConsoleExporter()) + .StartWithHost(); + +var app = appBuilder.Build(); + +app.Run(); +``` + +### OpenTelemetry SDK v1.3.0 and older extensions + +**Note:** The below extension methods were removed in v1.4.0. **Note:** The below extension methods should be called by application host code only. Library authors see: [Registration extension method guidance for library @@ -57,29 +82,6 @@ Targeting `Microsoft.Extensions.DependencyInjection.IServiceCollection`: to automatically start metric services in the supplied [IServiceCollection](https://learn.microsoft.com/dotnet/api/microsoft.extensions.dependencyinjection.iservicecollection). -## Usage - -The following example shows how to register OpenTelemetry tracing & metrics in -an ASP.NET Core host using the OpenTelemetry.Extensions.Hosting extensions. - -```csharp -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using OpenTelemetry.Metrics; -using OpenTelemetry.Trace; - -var appBuilder = WebApplication.CreateBuilder(args); - -appBuilder.Services.AddOpenTelemetry() - .WithTracing(builder => builder.AddConsoleExporter()) - .WithMetrics(builder => builder.AddConsoleExporter()) - .StartWithHost(); - -var app = appBuilder.Build(); - -app.Run(); -``` - ## References * [OpenTelemetry Project](https://opentelemetry.io/) diff --git a/src/OpenTelemetry.Extensions.Hosting/Trace/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Extensions.Hosting/Trace/TracerProviderBuilderExtensions.cs deleted file mode 100644 index f22cabab2cd..00000000000 --- a/src/OpenTelemetry.Extensions.Hosting/Trace/TracerProviderBuilderExtensions.cs +++ /dev/null @@ -1,55 +0,0 @@ -// -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -using Microsoft.Extensions.DependencyInjection; - -namespace OpenTelemetry.Trace -{ - /// - /// Contains extension methods for the class. - /// - public static class TracerProviderBuilderExtensions - { - /// - /// Register a callback action to configure the once the application is available. - /// - /// . - /// Configuration callback. - /// The supplied for chaining. - [Obsolete("Call ConfigureBuilder instead this method will be removed in a future version.")] - public static TracerProviderBuilder Configure(this TracerProviderBuilder tracerProviderBuilder, Action configure) - { - return tracerProviderBuilder.ConfigureBuilder(configure); - } - - /// - /// Gets the application attached to - /// the . - /// - /// . - /// or - /// if services are unavailable. - [Obsolete("Call ConfigureServices instead this method will be removed in a future version.")] - public static IServiceCollection GetServices(this TracerProviderBuilder tracerProviderBuilder) - { - IServiceCollection services = null; - tracerProviderBuilder.ConfigureServices(s => services = s); - return services; - } - } -} From edb8b81cbdd3957804c67139455ad741f6bb96f1 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Tue, 10 Jan 2023 12:04:54 -0800 Subject: [PATCH 2/8] Warning cleanup. --- .../Implementation/TelemetryHostedService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs b/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs index 78e50395b59..69b58fbff90 100644 --- a/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs +++ b/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs @@ -49,13 +49,13 @@ internal static void Initialize(IServiceProvider serviceProvider) { Debug.Assert(serviceProvider != null, "serviceProvider was null"); - var meterProvider = serviceProvider.GetService(); + var meterProvider = serviceProvider!.GetService(); if (meterProvider == null) { HostingExtensionsEventSource.Log.MeterProviderNotRegistered(); } - var tracerProvider = serviceProvider.GetService(); + var tracerProvider = serviceProvider!.GetService(); if (tracerProvider == null) { HostingExtensionsEventSource.Log.TracerProviderNotRegistered(); From 5cfe63d5d8b8dd5e7db8446b1168310d168761e1 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Tue, 10 Jan 2023 12:05:34 -0800 Subject: [PATCH 3/8] 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 a90e7a2a061..44afb6d815e 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -4,7 +4,7 @@ * Removed deprecated extensions: `AddOpenTelemetryTracing`, `AddOpenTelemetryMetrics`, `Configure`, & `GetServices`. - ([#XXXX](https://github.com/open-telemetry/opentelemetry-dotnet/pull/XXXX)) + ([#4071](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4071)) ## 1.4.0-rc.2 From 64fdd76bbf7e4b4f69a41913d25ffc27e18e2267 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Fri, 10 Feb 2023 12:38:59 -0800 Subject: [PATCH 4/8] Merge fixes. --- .../.publicApi/netstandard2.0/PublicAPI.Unshipped.txt | 11 +---------- .../OpenTelemetry.Extensions.Hosting.csproj | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index 5e8365829f9..3812863f17c 100644 --- a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,5 +1,4 @@ Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions -OpenTelemetry.Metrics.MeterProviderBuilderExtensions OpenTelemetry.OpenTelemetryBuilder OpenTelemetry.OpenTelemetryBuilder.ConfigureResource(System.Action! configure) -> OpenTelemetry.OpenTelemetryBuilder! OpenTelemetry.OpenTelemetryBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection! @@ -7,13 +6,5 @@ OpenTelemetry.OpenTelemetryBuilder.WithMetrics() -> OpenTelemetry.OpenTelemetryB OpenTelemetry.OpenTelemetryBuilder.WithMetrics(System.Action! configure) -> OpenTelemetry.OpenTelemetryBuilder! OpenTelemetry.OpenTelemetryBuilder.WithTracing() -> OpenTelemetry.OpenTelemetryBuilder! OpenTelemetry.OpenTelemetryBuilder.WithTracing(System.Action! configure) -> OpenTelemetry.OpenTelemetryBuilder! -OpenTelemetry.Trace.TracerProviderBuilderExtensions static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> OpenTelemetry.OpenTelemetryBuilder! -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetryTracing(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.Configure(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Action! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder! -static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.GetServices(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Configure(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder, System.Action! configure) -> OpenTelemetry.Trace.TracerProviderBuilder! -static OpenTelemetry.Trace.TracerProviderBuilderExtensions.GetServices(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! + diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj index dafd7892046..cc1b956abf8 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj @@ -6,7 +6,6 @@ Contains extensions to start OpenTelemetry in applications using Microsoft.Extensions.Hosting OpenTelemetry core- - enable latest-all From d4b62c1b81b4f93cd7b673baae156bc07b632377 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Fri, 10 Feb 2023 12:42:53 -0800 Subject: [PATCH 5/8] MD lint fix. --- src/OpenTelemetry.Extensions.Hosting/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/README.md b/src/OpenTelemetry.Extensions.Hosting/README.md index 4a6dad6077e..33043b6b86e 100644 --- a/src/OpenTelemetry.Extensions.Hosting/README.md +++ b/src/OpenTelemetry.Extensions.Hosting/README.md @@ -86,7 +86,7 @@ app.Run(); > **Note** > The below extension methods were removed in v1.4.0. - + > **Note** > The below extension methods should be called by application host code only. Library authors see: [Registration extension method guidance for library From f6ea2761ec669692651c92c2ed60028bf460fac8 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 23 Feb 2023 11:42:17 -0800 Subject: [PATCH 6/8] Slim down the changes shown on the diff. --- src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md | 2 +- .../Implementation/TelemetryHostedService.cs | 4 ++-- .../OpenTelemetry.Extensions.Hosting.csproj | 7 +------ src/OpenTelemetry.Extensions.Hosting/README.md | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md index fcd754126b1..5954755a9af 100644 --- a/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md @@ -6,7 +6,7 @@ ## Installation ```shell -dotnet add package OpenTelemetry.Api.ProviderBuilderExtensions +dotnet add package --prerelease OpenTelemetry.Api.ProviderBuilderExtensions ``` ## Overview diff --git a/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs b/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs index 3e260c6e41a..e0057979b10 100644 --- a/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs +++ b/src/OpenTelemetry.Extensions.Hosting/Implementation/TelemetryHostedService.cs @@ -53,13 +53,13 @@ internal static void Initialize(IServiceProvider serviceProvider) { Debug.Assert(serviceProvider != null, "serviceProvider was null"); - var meterProvider = serviceProvider!.GetService(); + var meterProvider = serviceProvider.GetService(); if (meterProvider == null) { HostingExtensionsEventSource.Log.MeterProviderNotRegistered(); } - var tracerProvider = serviceProvider!.GetService(); + var tracerProvider = serviceProvider.GetService(); if (tracerProvider == null) { HostingExtensionsEventSource.Log.TracerProviderNotRegistered(); diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj index cc1b956abf8..ebc2fa819a4 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj @@ -6,7 +6,7 @@ Contains extensions to start OpenTelemetry in applications using Microsoft.Extensions.Hosting OpenTelemetry core- - latest-all + enable @@ -16,13 +16,8 @@ - - - - - diff --git a/src/OpenTelemetry.Extensions.Hosting/README.md b/src/OpenTelemetry.Extensions.Hosting/README.md index d7e9cedce72..7be08606c52 100644 --- a/src/OpenTelemetry.Extensions.Hosting/README.md +++ b/src/OpenTelemetry.Extensions.Hosting/README.md @@ -6,7 +6,7 @@ ## Installation ```shell -dotnet add package OpenTelemetry.Extensions.Hosting +dotnet add package --prerelease OpenTelemetry.Extensions.Hosting ``` ## Overview From 3ddb3c195175619bff16a2c725c917496f67b38f Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 23 Feb 2023 11:43:07 -0800 Subject: [PATCH 7/8] More diff slimming. --- .../OpenTelemetry.Extensions.Hosting.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj index ebc2fa819a4..21f9aa4b039 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj @@ -1,5 +1,4 @@ - netstandard2.0 From 4ea7d473d4a9fb12e2e6062bf9459a98b937212b Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 23 Feb 2023 11:58:05 -0800 Subject: [PATCH 8/8] CHANGELOG fix. --- src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md index 1def9999921..480d06e5918 100644 --- a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +* Removed deprecated extensions: `AddOpenTelemetryTracing`, + `AddOpenTelemetryMetrics`, `Configure`, & `GetServices`. + ([#4071](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4071)) + ## 1.4.0-rc.4 Released 2023-Feb-10 @@ -11,10 +15,6 @@ Released 2023-Feb-10 traces and/or metrics. ([#4174](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4174)) -* Removed deprecated extensions: `AddOpenTelemetryTracing`, - `AddOpenTelemetryMetrics`, `Configure`, & `GetServices`. - ([#4071](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4071)) - ## 1.4.0-rc.3 Released 2023-Feb-01