Take in account code review

\n\nCommit migrated from ecea8c802e

src/HealthChecks/HealthChecks/src/DefaultHealthCheckService.cs

@@ -39,8 +39,44 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
             Func<HealthCheckRegistration, bool> predicate,
             CancellationToken cancellationToken = default)
         {
-            async Task<(string registrationName, HealthReportEntry result)> RunCheckAsync(IServiceScope scope, HealthCheckRegistration registration)
+            var registrations = _options.Value.Registrations;
+            if (predicate != null)
             {
+                registrations = registrations.Where(predicate).ToArray();
+            }
+
+            var totalTime = ValueStopwatch.StartNew();
+            Log.HealthCheckProcessingBegin(_logger);
+
+            var tasks = new Task<HealthReportEntry>[registrations.Count];
+            var index = 0;
+            using (var scope = _scopeFactory.CreateScope())
+            {
+                foreach (var registration in registrations)
+                {
+                    tasks[index++] = RunCheckAsync(scope, registration, cancellationToken);
+                }
+
+                await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
+
+            index = 0;
+            var entries = new Dictionary<string, HealthReportEntry>(StringComparer.OrdinalIgnoreCase);
+            foreach (var registration in registrations)
+            {
+                entries[registration.Name] = tasks[index++].Result;
+            }
+
+            var totalElapsedTime = totalTime.GetElapsedTime();
+            var report = new HealthReport(entries, totalElapsedTime);
+            Log.HealthCheckProcessingEnd(_logger, report.Status, totalElapsedTime);
+            return report;
+        }
+
+        private async Task<HealthReportEntry> RunCheckAsync(IServiceScope scope, HealthCheckRegistration registration, CancellationToken cancellationToken)
+        {
+            await Task.Yield();
+
             cancellationToken.ThrowIfCancellationRequested();
 
             var healthCheck = registration.Factory(scope.ServiceProvider);
@@ -85,37 +121,10 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
                     Log.HealthCheckError(_logger, registration, ex, duration);
                 }
 
-                    return (registration.Name, entry);
+                return entry;
             }
         }
 
-            IEnumerable<HealthCheckRegistration> registrations = _options.Value.Registrations;
-            if (predicate != null)
-            {
-                registrations = registrations.Where(predicate);
-            }
-
-            var totalTime = ValueStopwatch.StartNew();
-            Log.HealthCheckProcessingBegin(_logger);
-
-            (string registrationName, HealthReportEntry result)[] results;
-            using (var scope = _scopeFactory.CreateScope())
-            {
-                results = await Task.WhenAll(registrations.Select(r => RunCheckAsync(scope, r)));
-            }
-
-            var entries = new Dictionary<string, HealthReportEntry>(StringComparer.OrdinalIgnoreCase);
-            foreach (var (registrationName, result) in results)
-            {
-                entries[registrationName] = result;
-            }
-
-            var totalElapsedTime = totalTime.GetElapsedTime();
-            var report = new HealthReport(entries, totalElapsedTime);
-            Log.HealthCheckProcessingEnd(_logger, report.Status, totalElapsedTime);
-            return report;
-        }
-
         private static void ValidateRegistrations(IEnumerable<HealthCheckRegistration> registrations)
         {
             // Scan the list for duplicate names to provide a better error if there are duplicates.

src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs

@@ -375,12 +375,50 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
                 });
         }
 
-        private static DefaultHealthCheckService CreateHealthChecksService(Action<IHealthChecksBuilder> configure)
+        [Fact]
+        public async Task CheckHealthAsync_ChecksAreRunInParallel()
+        {
+            // Arrange
+            var sink = new TestSink();
+            async Task<HealthCheckResult> CheckMethod()
+            {
+                await Task.Delay(100);
+                return HealthCheckResult.Healthy();
+            }
+            var service = CreateHealthChecksService(b =>
+            {
+                b.AddAsyncCheck("test1", CheckMethod);
+                b.AddAsyncCheck("test2", CheckMethod);
+                b.AddAsyncCheck("test3", CheckMethod);
+            }, sink);
+
+            // Act
+            _ = await service.CheckHealthAsync();
+
+            // Assert
+            Assert.Collection(
+                sink.Writes,
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingBegin, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingEnd, entry.EventId); });
+        }
+
+        private static DefaultHealthCheckService CreateHealthChecksService(Action<IHealthChecksBuilder> configure, ITestSink sink = null)
         {
             var services = new ServiceCollection();
             services.AddLogging();
             services.AddOptions();
 
+            if (sink != null)
+            {
+                services.AddSingleton<ILoggerFactory>(new TestLoggerFactory(sink, enabled: true));
+            }
+
             var builder = services.AddHealthChecks();
             if (configure != null)
             {

src/HealthChecks/HealthChecks/test/HealthCheckPublisherHostedServiceTest.cs

@@ -211,8 +211,8 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingEnd, entry.EventId); }, 
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherBegin, entry.EventId); },
@@ -321,8 +321,8 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingEnd, entry.EventId); },
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherBegin, entry.EventId); },
@@ -399,8 +399,8 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingBegin, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
-                entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckBegin, entry.EventId); },
+                entry => { Assert.Contains(entry.EventId, new[] { DefaultHealthCheckService.EventIds.HealthCheckBegin, DefaultHealthCheckService.EventIds.HealthCheckEnd }); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckEnd, entry.EventId); },
                 entry => { Assert.Equal(DefaultHealthCheckService.EventIds.HealthCheckProcessingEnd, entry.EventId); },
                 entry => { Assert.Equal(HealthCheckPublisherHostedService.EventIds.HealthCheckPublisherBegin, entry.EventId); },