Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodeBlanch
CodeBlanch committed Aug 15, 2022
1 parent 8be5f98 commit 9e02797
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 27 deletions.
2 changes: 0 additions & 2 deletions src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<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 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<OpenTelemetry.Trace.TracerProviderBuilder> configure) -> Microsoft.Extensions.Hosting.IHostBuilder
Expand Down
8 changes: 0 additions & 8 deletions src/OpenTelemetry.Extensions.Hosting/OpenTelemetryServicesExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,5 @@ private static IServiceCollection AddOpenTelemetryMetrics(this IServiceCollectio

return services;
}

private sealed class TracerProviderBuilderHosting : TracerProviderBuilderBase
{
public TracerProviderBuilderHosting(IServiceCollection services)
: base(services)
{
}
}
}
}
1 change: 0 additions & 1 deletion src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
24 changes: 12 additions & 12 deletions src/OpenTelemetry/Trace/Builder/TracerProviderBuilderBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<TracerProvider>(sp => new TracerProviderSdk(sp, ownsServiceProvider: true));
services.TryAddSingleton<TracerProvider>(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<TracerProvider>(sp => new TracerProviderSdk(sp, ownsServiceProvider: false));
services.TryAddSingleton<TracerProvider>(sp => new TracerProviderSdk(sp, ownsServiceProvider: true));

this.services = services;
this.ownsServices = false;
this.ownsServices = true;
}

/// <inheritdoc />
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public TracerProviderBuilderSdk(IServiceCollection services)
{
}

internal TracerProviderBuilderSdk(TracerProviderBuilderState state)
public TracerProviderBuilderSdk(TracerProviderBuilderState state)
: base(state)
{
}
Expand Down

0 comments on commit 9e02797

Please sign in to comment.