From 9e027974fb7db00264aa4f2069e0d422184c2f15 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Mon, 15 Aug 2022 12:55:48 -0700 Subject: [PATCH] Cleanup. --- .../netstandard2.0/PublicAPI.Unshipped.txt | 2 -- .../OpenTelemetryServicesExtensions.cs | 8 ------- .../.publicApi/net462/PublicAPI.Unshipped.txt | 1 - .../.publicApi/net6.0/PublicAPI.Unshipped.txt | 1 - .../netstandard2.0/PublicAPI.Unshipped.txt | 1 - .../netstandard2.1/PublicAPI.Unshipped.txt | 1 - .../Builder/TracerProviderBuilderBase.cs | 24 +++++++++---------- .../Trace/Builder/TracerProviderBuilderSdk.cs | 2 +- 8 files changed, 13 insertions(+), 27 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 57582a92613..5f10fb1ec61 100644 --- a/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -3,8 +3,6 @@ Microsoft.Extensions.Hosting.OpenTelemetryHostExtensions OpenTelemetry.Metrics.MeterProviderBuilderExtensions 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 Microsoft.Extensions.Hosting.OpenTelemetryHostExtensions.UseOpenTelemetry(this Microsoft.Extensions.Hosting.IHost host) -> Microsoft.Extensions.Hosting.IHost static Microsoft.Extensions.Hosting.OpenTelemetryHostExtensions.UseOpenTelemetryTracing(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder) -> Microsoft.Extensions.Hosting.IHostBuilder static Microsoft.Extensions.Hosting.OpenTelemetryHostExtensions.UseOpenTelemetryTracing(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, System.Action configure) -> Microsoft.Extensions.Hosting.IHostBuilder diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs index 4878e8d5576..7deba0c696c 100644 --- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs +++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs @@ -83,13 +83,5 @@ private static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollectio return services; } - - private sealed class TracerProviderBuilderHosting : TracerProviderBuilderBase - { - public TracerProviderBuilderHosting(IServiceCollection services) - : base(services) - { - } - } } } diff --git a/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt index f260d409049..002d698814c 100644 --- a/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt @@ -26,7 +26,6 @@ OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.s OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportActivityProcessorOptions() -> void OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.set -> void -OpenTelemetry.Trace.TracerProviderBuilderBase.TracerProviderBuilderBase(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, bool disposeProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! diff --git a/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt index f260d409049..002d698814c 100644 --- a/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt @@ -26,7 +26,6 @@ OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.s OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportActivityProcessorOptions() -> void OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.set -> void -OpenTelemetry.Trace.TracerProviderBuilderBase.TracerProviderBuilderBase(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, bool disposeProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! diff --git a/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index ae7e75bcc95..2b1857a9496 100644 --- a/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -26,7 +26,6 @@ OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.s OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportActivityProcessorOptions() -> void OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.set -> void -OpenTelemetry.Trace.TracerProviderBuilderBase.TracerProviderBuilderBase(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, bool disposeProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! diff --git a/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt index f260d409049..002d698814c 100644 --- a/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt @@ -26,7 +26,6 @@ OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.s OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportActivityProcessorOptions() -> void OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType OpenTelemetry.Trace.ExportActivityProcessorOptions.ExportProcessorType.set -> void -OpenTelemetry.Trace.TracerProviderBuilderBase.TracerProviderBuilderBase(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, OpenTelemetry.Logs.OpenTelemetryLoggerProvider! openTelemetryLoggerProvider, bool disposeProvider) -> Microsoft.Extensions.Logging.ILoggingBuilder! diff --git a/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs b/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs index 598fffc8015..8e4dd27f62d 100644 --- a/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs +++ b/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs @@ -44,30 +44,30 @@ internal TracerProviderBuilderBase(TracerProviderBuilderState state) this.state = state; } - // This ctor is for Sdk.CreateTracerProviderBuilder where the builder - // owns its services and service provider. - protected TracerProviderBuilderBase() + // This ctor is for AddOpenTelemetryTracing scenario where the builder + // is bound to an external service collection. + internal TracerProviderBuilderBase(IServiceCollection services) { - var services = new ServiceCollection(); + Guard.ThrowIfNull(services); services.AddOptions(); - services.TryAddSingleton(sp => new TracerProviderSdk(sp, ownsServiceProvider: true)); + services.TryAddSingleton(sp => new TracerProviderSdk(sp, ownsServiceProvider: false)); this.services = services; - this.ownsServices = true; + this.ownsServices = false; } - // This ctor is for hosting scenarios where the builder is bound to an - // external service collection. - protected TracerProviderBuilderBase(IServiceCollection services) + // This ctor is for Sdk.CreateTracerProviderBuilder where the builder + // owns its services and service provider. + protected TracerProviderBuilderBase() { - Guard.ThrowIfNull(services); + var services = new ServiceCollection(); services.AddOptions(); - services.TryAddSingleton(sp => new TracerProviderSdk(sp, ownsServiceProvider: false)); + services.TryAddSingleton(sp => new TracerProviderSdk(sp, ownsServiceProvider: true)); this.services = services; - this.ownsServices = false; + this.ownsServices = true; } /// diff --git a/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs b/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs index dc7fb2804f9..a13d105e8db 100644 --- a/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs +++ b/src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs @@ -31,7 +31,7 @@ public TracerProviderBuilderSdk(IServiceCollection services) { } - internal TracerProviderBuilderSdk(TracerProviderBuilderState state) + public TracerProviderBuilderSdk(TracerProviderBuilderState state) : base(state) { }