Some refactoring.

src/OpenTelemetry.DependencyInjection/CHANGELOG.md

@@ -1,3 +1,5 @@
 # Changelog
 
 ## Unreleased
+
+Initial release.

src/OpenTelemetry.DependencyInjection/Metrics/DeferredMeterProviderBuilder.cs

@@ -16,13 +16,12 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using OpenTelemetry;
 using OpenTelemetry.Internal;
 using OpenTelemetry.Metrics;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
-public class DeferredMeterProviderBuilder : MeterProviderBuilder, IProviderBuilder<MeterProvider, MeterProviderBuilder>, IDeferredMeterProviderBuilder
+public class DeferredMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder
 {
     public DeferredMeterProviderBuilder(IServiceCollection services)
     {
@@ -36,7 +35,7 @@ public DeferredMeterProviderBuilder(IServiceCollection services)
     }
 
     /// <inheritdoc />
-    MeterProvider? IProviderBuilder<MeterProvider, MeterProviderBuilder>.Provider => null;
+    MeterProvider? IMeterProviderBuilder.Provider => null;
 
     protected IServiceCollection? Services { get; set; }
 
@@ -69,8 +68,8 @@ public override MeterProviderBuilder AddMeter(params string[] names)
     /// <inheritdoc />
     public MeterProviderBuilder ConfigureBuilder(Action<IServiceProvider, MeterProviderBuilder> configure)
     {
-        this.ConfigureServices(services => services.AddSingleton<IConfigureProviderBuilder<MeterProvider, MeterProviderBuilder>>(
-            new ConfigureProviderBuilderCallbackWrapper<MeterProvider, MeterProviderBuilder>(configure)));
+        this.ConfigureServices(services => services.AddSingleton<IConfigureMeterProviderBuilder>(
+            new ConfigureMeterProviderBuilderCallbackWrapper(configure)));
 
         return this;
     }
@@ -95,4 +94,21 @@ public MeterProviderBuilder ConfigureServices(Action<IServiceCollection> configu
     /// <inheritdoc />
     MeterProviderBuilder IDeferredMeterProviderBuilder.Configure(Action<IServiceProvider, MeterProviderBuilder> configure)
         => this.ConfigureBuilder(configure);
+
+    private sealed class ConfigureMeterProviderBuilderCallbackWrapper : IConfigureMeterProviderBuilder
+    {
+        private readonly Action<IServiceProvider, MeterProviderBuilder> configure;
+
+        public ConfigureMeterProviderBuilderCallbackWrapper(Action<IServiceProvider, MeterProviderBuilder> configure)
+        {
+            Guard.ThrowIfNull(configure);
+
+            this.configure = configure;
+        }
+
+        public void ConfigureBuilder(IServiceProvider serviceProvider, MeterProviderBuilder meterProviderBuilder)
+        {
+            this.configure(serviceProvider, meterProviderBuilder);
+        }
+    }
 }

src/OpenTelemetry.DependencyInjection/IConfigureProviderBuilder.cs → src/OpenTelemetry.DependencyInjection/Metrics/IConfigureMeterProviderBuilder.cs

@@ -1,4 +1,4 @@
-// <copyright file="IConfigureProviderBuilder.cs" company="OpenTelemetry Authors">
+// <copyright file="IConfigureMeterProviderBuilder.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 
 using System;
 
-namespace OpenTelemetry;
+namespace OpenTelemetry.Metrics;
 
-public interface IConfigureProviderBuilder<TProvider, TProviderBuilder>
+public interface IConfigureMeterProviderBuilder
 {
-    void ConfigureBuilder(IServiceProvider serviceProvider, TProviderBuilder providerBuilder);
+    void ConfigureBuilder(IServiceProvider serviceProvider, MeterProviderBuilder meterProviderBuilder);
 }

src/OpenTelemetry.DependencyInjection/IProviderBuilder.cs → src/OpenTelemetry.DependencyInjection/Metrics/IMeterProviderBuilder.cs

@@ -1,4 +1,4 @@
-// <copyright file="IProviderBuilder.cs" company="OpenTelemetry Authors">
+// <copyright file="IMeterProviderBuilder.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,14 +17,13 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OpenTelemetry;
+namespace OpenTelemetry.Metrics;
 
-public interface IProviderBuilder<TProvider, TProviderBuilder>
-    where TProvider : BaseProvider
+public interface IMeterProviderBuilder : IDeferredMeterProviderBuilder
 {
-    TProvider? Provider { get; }
+    MeterProvider? Provider { get; }
 
-    TProviderBuilder ConfigureServices(Action<IServiceCollection> configure);
+    MeterProviderBuilder ConfigureServices(Action<IServiceCollection> configure);
 
-    TProviderBuilder ConfigureBuilder(Action<IServiceProvider, TProviderBuilder> configure);
+    MeterProviderBuilder ConfigureBuilder(Action<IServiceProvider, MeterProviderBuilder> configure);
 }

src/OpenTelemetry.DependencyInjection/Metrics/MeterProviderBuilderDependencyInjectionExtensions.cs

@@ -86,10 +86,10 @@ public static MeterProviderBuilder AddInstrumentation<T>(
 
         meterProviderBuilder.ConfigureBuilder((sp, builder) =>
         {
-            if (builder is IProviderBuilder<MeterProvider, MeterProviderBuilder> providerBuilder
-                && providerBuilder.Provider != null)
+            if (builder is IMeterProviderBuilder iMeterProviderBuilder
+                && iMeterProviderBuilder.Provider != null)
             {
-                builder.AddInstrumentation(() => instrumentationFactory(sp, providerBuilder.Provider));
+                builder.AddInstrumentation(() => instrumentationFactory(sp, iMeterProviderBuilder.Provider));
             }
         });
 
@@ -111,9 +111,9 @@ public static MeterProviderBuilder ConfigureServices(
         this MeterProviderBuilder meterProviderBuilder,
         Action<IServiceCollection> configure)
     {
-        if (meterProviderBuilder is IProviderBuilder<MeterProvider, MeterProviderBuilder> providerBuilder)
+        if (meterProviderBuilder is IMeterProviderBuilder iMeterProviderBuilder)
         {
-            providerBuilder.ConfigureServices(configure);
+            iMeterProviderBuilder.ConfigureServices(configure);
         }
 
         return meterProviderBuilder;
@@ -131,11 +131,7 @@ public static MeterProviderBuilder ConfigureBuilder(
         this MeterProviderBuilder meterProviderBuilder,
         Action<IServiceProvider, MeterProviderBuilder> configure)
     {
-        if (meterProviderBuilder is IProviderBuilder<MeterProvider, MeterProviderBuilder> providerBuilder)
-        {
-            providerBuilder.ConfigureBuilder(configure);
-        }
-        else if (meterProviderBuilder is IDeferredMeterProviderBuilder deferredMeterProviderBuilder)
+        if (meterProviderBuilder is IDeferredMeterProviderBuilder deferredMeterProviderBuilder)
         {
             deferredMeterProviderBuilder.Configure(configure);
         }

src/OpenTelemetry.DependencyInjection/Trace/DeferredTracerProviderBuilder.cs

@@ -16,13 +16,12 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using OpenTelemetry;
 using OpenTelemetry.Internal;
 using OpenTelemetry.Trace;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
-public class DeferredTracerProviderBuilder : TracerProviderBuilder, IProviderBuilder<TracerProvider, TracerProviderBuilder>, IDeferredTracerProviderBuilder
+public class DeferredTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder
 {
     public DeferredTracerProviderBuilder(IServiceCollection services)
     {
@@ -36,7 +35,7 @@ public DeferredTracerProviderBuilder(IServiceCollection services)
     }
 
     /// <inheritdoc />
-    TracerProvider? IProviderBuilder<TracerProvider, TracerProviderBuilder>.Provider => null;
+    TracerProvider? ITracerProviderBuilder.Provider => null;
 
     protected IServiceCollection? Services { get; set; }
 
@@ -82,8 +81,8 @@ public override TracerProviderBuilder AddLegacySource(string operationName)
     /// <inheritdoc />
     public TracerProviderBuilder ConfigureBuilder(Action<IServiceProvider, TracerProviderBuilder> configure)
     {
-        this.ConfigureServices(services => services.AddSingleton<IConfigureProviderBuilder<TracerProvider, TracerProviderBuilder>>(
-            new ConfigureProviderBuilderCallbackWrapper<TracerProvider, TracerProviderBuilder>(configure)));
+        this.ConfigureServices(services => services.AddSingleton<IConfigureTracerProviderBuilder>(
+            new ConfigureTracerProviderBuilderCallbackWrapper(configure)));
 
         return this;
     }
@@ -108,4 +107,21 @@ public TracerProviderBuilder ConfigureServices(Action<IServiceCollection> config
     /// <inheritdoc />
     TracerProviderBuilder IDeferredTracerProviderBuilder.Configure(Action<IServiceProvider, TracerProviderBuilder> configure)
         => this.ConfigureBuilder(configure);
+
+    private sealed class ConfigureTracerProviderBuilderCallbackWrapper : IConfigureTracerProviderBuilder
+    {
+        private readonly Action<IServiceProvider, TracerProviderBuilder> configure;
+
+        public ConfigureTracerProviderBuilderCallbackWrapper(Action<IServiceProvider, TracerProviderBuilder> configure)
+        {
+            Guard.ThrowIfNull(configure);
+
+            this.configure = configure;
+        }
+
+        public void ConfigureBuilder(IServiceProvider serviceProvider, TracerProviderBuilder tracerProviderBuilder)
+        {
+            this.configure(serviceProvider, tracerProviderBuilder);
+        }
+    }
 }

src/OpenTelemetry.DependencyInjection/Trace/IConfigureTracerProviderBuilder.cs

@@ -0,0 +1,24 @@
+// <copyright file="IConfigureTracerProviderBuilder.cs" company="OpenTelemetry Authors">
+// 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.
+// </copyright>
+
+using System;
+
+namespace OpenTelemetry.Trace;
+
+public interface IConfigureTracerProviderBuilder
+{
+    void ConfigureBuilder(IServiceProvider serviceProvider, TracerProviderBuilder tracerProviderBuilder);
+}

src/OpenTelemetry.DependencyInjection/Trace/ITracerProviderBuilder.cs

@@ -0,0 +1,29 @@
+// <copyright file="ITracerProviderBuilder.cs" company="OpenTelemetry Authors">
+// 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.
+// </copyright>
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OpenTelemetry.Trace;
+
+public interface ITracerProviderBuilder : IDeferredTracerProviderBuilder
+{
+    TracerProvider? Provider { get; }
+
+    TracerProviderBuilder ConfigureServices(Action<IServiceCollection> configure);
+
+    TracerProviderBuilder ConfigureBuilder(Action<IServiceProvider, TracerProviderBuilder> configure);
+}

src/OpenTelemetry.DependencyInjection/Trace/TracerProviderBuilderDependencyInjectionExtensions.cs

@@ -86,10 +86,10 @@ public static TracerProviderBuilder AddInstrumentation<T>(
 
         tracerProviderBuilder.ConfigureBuilder((sp, builder) =>
         {
-            if (builder is IProviderBuilder<TracerProvider, TracerProviderBuilder> providerBuilder
-                && providerBuilder.Provider != null)
+            if (tracerProviderBuilder is ITracerProviderBuilder iTracerProviderBuilder
+                && iTracerProviderBuilder.Provider != null)
             {
-                builder.AddInstrumentation(() => instrumentationFactory(sp, providerBuilder.Provider));
+                builder.AddInstrumentation(() => instrumentationFactory(sp, iTracerProviderBuilder.Provider));
             }
         });
 
@@ -111,9 +111,9 @@ public static TracerProviderBuilder ConfigureServices(
         this TracerProviderBuilder tracerProviderBuilder,
         Action<IServiceCollection> configure)
     {
-        if (tracerProviderBuilder is IProviderBuilder<TracerProvider, TracerProviderBuilder> providerBuilder)
+        if (tracerProviderBuilder is ITracerProviderBuilder iTracerProviderBuilder)
         {
-            providerBuilder.ConfigureServices(configure);
+            iTracerProviderBuilder.ConfigureServices(configure);
         }
 
         return tracerProviderBuilder;
@@ -131,11 +131,7 @@ public static TracerProviderBuilder ConfigureBuilder(
         this TracerProviderBuilder tracerProviderBuilder,
         Action<IServiceProvider, TracerProviderBuilder> configure)
     {
-        if (tracerProviderBuilder is IProviderBuilder<TracerProvider, TracerProviderBuilder> providerBuilder)
-        {
-            providerBuilder.ConfigureBuilder(configure);
-        }
-        else if (tracerProviderBuilder is IDeferredTracerProviderBuilder deferredTracerProviderBuilder)
+        if (tracerProviderBuilder is IDeferredTracerProviderBuilder deferredTracerProviderBuilder)
         {
             deferredTracerProviderBuilder.Configure(configure);
         }

src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderSdk.cs

@@ -30,7 +30,7 @@ namespace OpenTelemetry.Metrics
     /// <summary>
     /// Stores state used to build a <see cref="MeterProvider"/>.
     /// </summary>
-    internal sealed class MeterProviderBuilderSdk : MeterProviderBuilder, IProviderBuilder<MeterProvider, MeterProviderBuilder>, IDeferredMeterProviderBuilder
+    internal sealed class MeterProviderBuilderSdk : MeterProviderBuilder, IMeterProviderBuilder
     {
         public const int MaxMetricsDefault = 1000;
         public const int MaxMetricPointsPerMetricDefault = 2000;

src/OpenTelemetry/Metrics/MeterProviderSdk.cs

@@ -61,7 +61,7 @@ internal MeterProviderSdk(
 
             OpenTelemetrySdkEventSource.Log.MeterProviderSdkEvent("Building MeterProvider.");
 
-            var configureProviderBuilders = serviceProvider.GetServices<IConfigureProviderBuilder<MeterProvider, MeterProviderBuilder>>();
+            var configureProviderBuilders = serviceProvider.GetServices<IConfigureMeterProviderBuilder>();
             foreach (var configureProviderBuilder in configureProviderBuilders)
             {
                 configureProviderBuilder.ConfigureBuilder(serviceProvider, state);

src/OpenTelemetry/Trace/Builder/TracerProviderBuilderSdk.cs

@@ -28,7 +28,7 @@ namespace OpenTelemetry.Trace
     /// <summary>
     /// Stores state used to build a <see cref="TracerProvider"/>.
     /// </summary>
-    internal sealed class TracerProviderBuilderSdk : TracerProviderBuilder, IProviderBuilder<TracerProvider, TracerProviderBuilder>, IDeferredTracerProviderBuilder
+    internal sealed class TracerProviderBuilderSdk : TracerProviderBuilder, ITracerProviderBuilder
     {
         private const string DefaultInstrumentationVersion = "1.0.0.0";
 

src/OpenTelemetry/Trace/TracerProviderSdk.cs

@@ -61,7 +61,7 @@ internal TracerProviderSdk(
 
             OpenTelemetrySdkEventSource.Log.TracerProviderSdkEvent("Building TracerProvider.");
 
-            var configureProviderBuilders = serviceProvider.GetServices<IConfigureProviderBuilder<TracerProvider, TracerProviderBuilder>>();
+            var configureProviderBuilders = serviceProvider.GetServices<IConfigureTracerProviderBuilder>();
             foreach (var configureProviderBuilder in configureProviderBuilders)
             {
                 configureProviderBuilder.ConfigureBuilder(serviceProvider, state);