[Hosting] Remove obsolete methods ahead of 1.4.0 release

src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md

@@ -6,7 +6,7 @@
 ## Installation
 
 ```shell
-dotnet add package --prerelease OpenTelemetry.Api.ProviderBuilderExtensions
+dotnet add package OpenTelemetry.Api.ProviderBuilderExtensions
 ```
 
 ## Overview

src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -1,19 +1,10 @@
 Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions
-OpenTelemetry.Metrics.MeterProviderBuilderExtensions
 OpenTelemetry.OpenTelemetryBuilder
 OpenTelemetry.OpenTelemetryBuilder.ConfigureResource(System.Action<OpenTelemetry.Resources.ResourceBuilder!>! configure) -> OpenTelemetry.OpenTelemetryBuilder!
 OpenTelemetry.OpenTelemetryBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 OpenTelemetry.OpenTelemetryBuilder.WithMetrics() -> OpenTelemetry.OpenTelemetryBuilder!
 OpenTelemetry.OpenTelemetryBuilder.WithMetrics(System.Action<OpenTelemetry.Metrics.MeterProviderBuilder!>! configure) -> OpenTelemetry.OpenTelemetryBuilder!
 OpenTelemetry.OpenTelemetryBuilder.WithTracing() -> OpenTelemetry.OpenTelemetryBuilder!
 OpenTelemetry.OpenTelemetryBuilder.WithTracing(System.Action<OpenTelemetry.Trace.TracerProviderBuilder!>! 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<OpenTelemetry.Metrics.MeterProviderBuilder!>! 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<OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.Configure(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, System.Action<System.IServiceProvider!, OpenTelemetry.Metrics.MeterProviderBuilder!>! 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<System.IServiceProvider!, OpenTelemetry.Trace.TracerProviderBuilder!>! configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
-static OpenTelemetry.Trace.TracerProviderBuilderExtensions.GetServices(this OpenTelemetry.Trace.TracerProviderBuilder! tracerProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+

src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md

@@ -11,6 +11,10 @@ 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

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<MeterProvider>();
+        var meterProvider = serviceProvider!.GetService<MeterProvider>();
         if (meterProvider == null)
         {
             HostingExtensionsEventSource.Log.MeterProviderNotRegistered();
         }
 
-        var tracerProvider = serviceProvider.GetService<TracerProvider>();
+        var tracerProvider = serviceProvider!.GetService<TracerProvider>();
         if (tracerProvider == null)
         {
             HostingExtensionsEventSource.Log.TracerProviderNotRegistered();

src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Description>Contains extensions to start OpenTelemetry in applications using Microsoft.Extensions.Hosting</Description>
     <RootNamespace>OpenTelemetry</RootNamespace>
     <MinVerTagPrefix>core-</MinVerTagPrefix>
-    <Nullable>enable</Nullable>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <!--Do not run ApiCompat for netstandard2.0 as this is newly added. Remove this property once we have released a stable version.-->
@@ -15,8 +16,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPkgVer)" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
+  </ItemGroup>
 
+  <ItemGroup>
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\Guard.cs" Link="Includes\Guard.cs" />
   </ItemGroup>

src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs

@@ -52,102 +52,4 @@ public static OpenTelemetryBuilder AddOpenTelemetry(this IServiceCollection serv
 
         return new(services);
     }
-
-    /// <summary>
-    /// Configure OpenTelemetry and register a <see cref="IHostedService"/>
-    /// to automatically start tracing services in the supplied <see
-    /// cref="IServiceCollection" />.
-    /// </summary>
-    /// <remarks>
-    /// Notes:
-    /// <list type="bullet">
-    /// <item>
-    /// This is safe to be called multiple times. Only a single <see
-    /// cref="TracerProvider"/> will be created for a given <see
-    /// cref="IServiceCollection"/>.
-    /// </item>
-    /// <item>
-    /// This method should be called by application host code. Library
-    /// authors should call <see
-    /// cref="OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.ConfigureOpenTelemetryTracerProvider(IServiceCollection, Action{IServiceProvider, TracerProviderBuilder})"/>
-    /// instead.
-    /// </item>
-    /// </list>
-    /// </remarks>
-    /// <param name="services"><see cref="IServiceCollection"/>.</param>
-    /// <returns>Supplied <see cref="IServiceCollection"/> for chaining
-    /// calls.</returns>
-    [Obsolete("Use the AddOpenTelemetry().WithTracing(configure) pattern instead. This method will be removed in a future version.")]
-    public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services)
-        => AddOpenTelemetryTracing(services, b => { });
-
-    /// <summary>
-    /// Configure OpenTelemetry and register a <see cref="IHostedService"/>
-    /// to automatically start tracing services in the supplied <see
-    /// cref="IServiceCollection" />.
-    /// </summary>
-    /// <remarks><inheritdoc
-    /// cref="AddOpenTelemetryTracing(IServiceCollection)"
-    /// path="/remarks"/></remarks>
-    /// <param name="services"><see cref="IServiceCollection"/>.</param>
-    /// <param name="configure">Callback action to configure the <see
-    /// cref="TracerProviderBuilder"/>.</param>
-    /// <returns>Supplied <see cref="IServiceCollection"/> for chaining
-    /// calls.</returns>
-    [Obsolete("Use the AddOpenTelemetry().WithTracing(configure) pattern instead. This method will be removed in a future version.")]
-    public static IServiceCollection AddOpenTelemetryTracing(this IServiceCollection services, Action<TracerProviderBuilder> configure)
-    {
-        services.AddOpenTelemetry().WithTracing(configure);
-
-        return services;
-    }
-
-    /// <summary>
-    /// Configure OpenTelemetry and register a <see cref="IHostedService"/>
-    /// to automatically start metric services in the supplied <see
-    /// cref="IServiceCollection" />.
-    /// </summary>
-    /// <remarks>
-    /// Notes:
-    /// <list type="bullet">
-    /// <item>
-    /// This is safe to be called multiple times. Only a single <see
-    /// cref="MeterProvider"/> will be created for a given <see
-    /// cref="IServiceCollection"/>.
-    /// </item>
-    /// <item>
-    /// This method should be called by application host code. Library
-    /// authors should call <see
-    /// cref="OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.ConfigureOpenTelemetryMeterProvider(IServiceCollection, Action{IServiceProvider, MeterProviderBuilder})"/>
-    /// instead.
-    /// </item>
-    /// </list>
-    /// </remarks>
-    /// <param name="services"><see cref="IServiceCollection"/>.</param>
-    /// <returns>Supplied <see cref="IServiceCollection"/> for chaining
-    /// calls.</returns>
-    [Obsolete("Use the AddOpenTelemetry().WithMetrics(configure) pattern instead. This method will be removed in a future version.")]
-    public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services)
-        => AddOpenTelemetryMetrics(services, b => { });
-
-    /// <summary>
-    /// Configure OpenTelemetry and register a <see cref="IHostedService"/>
-    /// to automatically start metric services in the supplied <see
-    /// cref="IServiceCollection" />.
-    /// </summary>
-    /// <remarks><inheritdoc
-    /// cref="AddOpenTelemetryMetrics(IServiceCollection)"
-    /// path="/remarks"/></remarks>
-    /// <param name="services"><see cref="IServiceCollection"/>.</param>
-    /// <param name="configure">Callback action to configure the <see
-    /// cref="TracerProviderBuilder"/>.</param>
-    /// <returns>Supplied <see cref="IServiceCollection"/> for chaining
-    /// calls.</returns>
-    [Obsolete("Use the AddOpenTelemetry().WithMetrics(configure) pattern instead. This method will be removed in a future version.")]
-    public static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollection services, Action<MeterProviderBuilder> configure)
-    {
-        services.AddOpenTelemetry().WithMetrics(configure);
-
-        return services;
-    }
 }

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