Code review.

open-telemetry · May 8, 2023 · a1d9712 · a1d9712
1 parent 79aedbf
commit a1d9712
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/test/OpenTelemetry.Tests/Logs/LoggerProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Tests/Logs/LoggerProviderBuilderExtensionsTests.cs
@@ -61,24 +61,27 @@ public void LoggerProviderBuilderAddInstrumentationTest()
     [InlineData(false)]
     public void LoggerProviderBuilderNestedResolutionUsingBuilderTest(bool callNestedConfigure)
     {
-        bool innerTestExecuted = false;
+        bool innerConfigureBuilderTestExecuted = false;
+        bool innerConfigureOpenTelemetryLoggerProviderTestExecuted = false;
 
         using var provider = Sdk.CreateLoggerProviderBuilder()
             .ConfigureServices(services =>
             {
                 if (callNestedConfigure)
                 {
-                    services.ConfigureOpenTelemetryLoggerProvider((sp, builder) => { });
+                    services.ConfigureOpenTelemetryLoggerProvider(
+                        (sp, builder) => innerConfigureOpenTelemetryLoggerProviderTestExecuted = true);
                 }
             })
             .ConfigureBuilder((sp, builder) =>
             {
-                innerTestExecuted = true;
+                innerConfigureBuilderTestExecuted = true;
                 Assert.Throws<NotSupportedException>(() => sp.GetService<LoggerProvider>());
             })
             .Build();
 
-        Assert.True(innerTestExecuted);
+        Assert.True(innerConfigureBuilderTestExecuted);
+        Assert.Equal(callNestedConfigure, innerConfigureOpenTelemetryLoggerProviderTestExecuted);
 
         Assert.Throws<NotSupportedException>(() => provider.GetServiceProvider()?.GetService<LoggerProvider>());
     }

diff --git a/test/OpenTelemetry.Tests/Metrics/MeterProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Tests/Metrics/MeterProviderBuilderExtensionsTests.cs
@@ -219,24 +219,27 @@ public void ConfigureBuilderIConfigurationModifiableTest()
         [InlineData(false)]
         public void MeterProviderNestedResolutionUsingBuilderTest(bool callNestedConfigure)
         {
-            bool innerTestExecuted = false;
+            bool innerConfigureBuilderTestExecuted = false;
+            bool innerConfigureOpenTelemetryLoggerProviderTestExecuted = false;
 
             using var provider = Sdk.CreateMeterProviderBuilder()
                 .ConfigureServices(services =>
                 {
                     if (callNestedConfigure)
                     {
-                        services.ConfigureOpenTelemetryMeterProvider((sp, builder) => { });
+                        services.ConfigureOpenTelemetryMeterProvider(
+                            (sp, builder) => innerConfigureOpenTelemetryLoggerProviderTestExecuted = true);
                     }
                 })
                 .ConfigureBuilder((sp, builder) =>
                 {
-                    innerTestExecuted = true;
+                    innerConfigureBuilderTestExecuted = true;
                     Assert.Throws<NotSupportedException>(() => sp.GetService<MeterProvider>());
                 })
                 .Build();
 
-            Assert.True(innerTestExecuted);
+            Assert.True(innerConfigureBuilderTestExecuted);
+            Assert.Equal(callNestedConfigure, innerConfigureOpenTelemetryLoggerProviderTestExecuted);
 
             Assert.Throws<NotSupportedException>(() => provider.GetServiceProvider()?.GetService<MeterProvider>());
         }

diff --git a/test/OpenTelemetry.Tests/Trace/TracerProviderBuilderExtensionsTest.cs b/test/OpenTelemetry.Tests/Trace/TracerProviderBuilderExtensionsTest.cs
@@ -309,24 +309,27 @@ public void ConfigureBuilderIConfigurationModifiableTest()
         [InlineData(false)]
         public void TracerProviderNestedResolutionUsingBuilderTest(bool callNestedConfigure)
         {
-            bool innerTestExecuted = false;
+            bool innerConfigureBuilderTestExecuted = false;
+            bool innerConfigureOpenTelemetryLoggerProviderTestExecuted = false;
 
             using var provider = Sdk.CreateTracerProviderBuilder()
                 .ConfigureServices(services =>
                 {
                     if (callNestedConfigure)
                     {
-                        services.ConfigureOpenTelemetryTracerProvider((sp, builder) => { });
+                        services.ConfigureOpenTelemetryTracerProvider(
+                            (sp, builder) => innerConfigureOpenTelemetryLoggerProviderTestExecuted = true);
                     }
                 })
                 .ConfigureBuilder((sp, builder) =>
                 {
-                    innerTestExecuted = true;
+                    innerConfigureBuilderTestExecuted = true;
                     Assert.Throws<NotSupportedException>(() => sp.GetService<TracerProvider>());
                 })
                 .Build();
 
-            Assert.True(innerTestExecuted);
+            Assert.True(innerConfigureBuilderTestExecuted);
+            Assert.Equal(callNestedConfigure, innerConfigureOpenTelemetryLoggerProviderTestExecuted);
 
             Assert.Throws<NotSupportedException>(() => provider.GetServiceProvider()?.GetService<TracerProvider>());
         }