Make resource HealthStatus computed from HealthReports

src/Aspire.Dashboard/Model/KnownPropertyLookup.cs

@@ -27,7 +27,6 @@ public KnownPropertyLookup(IStringLocalizer<Resources.Resources> loc)
             new(KnownProperties.Resource.StartTime, loc[nameof(ResourcesDetailsStartTimeProperty)]),
             new(KnownProperties.Resource.StopTime, loc[nameof(ResourcesDetailsStopTimeProperty)]),
             new(KnownProperties.Resource.ExitCode, loc[nameof(ResourcesDetailsExitCodeProperty)]),
-            new(KnownProperties.Resource.HealthState, loc[nameof(ResourcesDetailsHealthStateProperty)])
         ];
 
         _projectProperties =

src/Aspire.Dashboard/Model/ResourceStateViewModel.cs

@@ -136,7 +136,7 @@ private static string GetStateText(ResourceViewModel resource, IStringLocalizer<
         return resource switch
         {
             { State: null or "" } => loc[Columns.UnknownStateLabel],
-            { KnownState: KnownResourceState.Running, HealthStatus: not HealthStatus.Healthy } => $"{resource.State.Humanize()} ({(resource.HealthStatus ?? HealthStatus.Unhealthy).Humanize()})",
+            { KnownState: KnownResourceState.Running, HealthStatus: not HealthStatus.Healthy, HealthReports: not [] } => $"{resource.State.Humanize()} ({(resource.HealthStatus ?? HealthStatus.Unhealthy).Humanize()})",
             _ => resource.State.Humanize()
         };
     }

src/Aspire.Dashboard/Model/ResourceViewModel.cs

@@ -34,8 +34,22 @@ public sealed class ResourceViewModel
     public required ImmutableArray<VolumeViewModel> Volumes { get; init; }
     public required FrozenDictionary<string, ResourcePropertyViewModel> Properties { get; init; }
     public required ImmutableArray<CommandViewModel> Commands { get; init; }
+
     /// <summary>The health status of the resource. <see langword="null"/> indicates that health status is expected but not yet available.</summary>
-    public required HealthStatus? HealthStatus { get; init; }
+    public HealthStatus? HealthStatus
+    {
+        get
+        {
+            if (HealthReports.Length == 0 && KnownState == KnownResourceState.Running)
+            {
+                // If there are no health reports and the resource is running, assume it's healthy.
+                return Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Healthy;
+            }
+
+            return HealthReports.MinBy(r => r.HealthStatus)?.HealthStatus;
+        }
+    }
+
     public required ImmutableArray<HealthReportViewModel> HealthReports { get; init; }
     public KnownResourceState? KnownState { get; init; }
 

src/Aspire.Dashboard/ResourceService/Partials.cs

@@ -49,7 +49,6 @@ public ResourceViewModel ToViewModel(BrowserTimeProvider timeProvider, IKnownPro
                 KnownState = HasState ? Enum.TryParse(State, out KnownResourceState knownState) ? knownState : null : null,
                 StateStyle = HasStateStyle ? StateStyle : null,
                 Commands = GetCommands(),
-                HealthStatus = HasHealthStatus ? MapHealthStatus(HealthStatus) : null,
                 HealthReports = HealthReports.Select(ToHealthReportViewModel).OrderBy(vm => vm.Name).ToImmutableArray(),
             };
         }

src/Aspire.Hosting/ApplicationModel/CustomResourceSnapshot.cs

@@ -52,11 +52,19 @@ public sealed record CustomResourceSnapshot
     /// </summary>
     /// <remarks>
     /// <para>
-    /// This value is derived from <see cref="HealthReports"/>. If a resource is known to have a health check
-    /// and no reports exist, or if a resource does not have a health check, then this value is <see langword="null"/>.
+    /// This value is derived from <see cref="HealthReports"/>.
     /// </para>
     /// </remarks>
-    public HealthStatus? HealthStatus { get; init; }
+    public HealthStatus? GetHealthStatus()
+    {
+        if (HealthReports.Length == 0 && State == "Running")
+        {
+            // If there are no health reports and the resource is running, assume it's healthy.
+            return HealthStatus.Healthy;
+        }
+
+        return HealthReports.MinBy(r => r.Status)?.Status;
+    }
 
     /// <summary>
     /// The health reports for this resource.

src/Aspire.Hosting/ApplicationModel/ResourceNotificationService.cs

@@ -180,7 +180,7 @@ static bool IsContinuableState(CustomResourceSnapshot snapshot) =>
     /// </remarks>
     public Task<ResourceEvent> WaitForResourceHealthyAsync(string resourceName, CancellationToken cancellationToken = default)
     {
-        return WaitForResourceAsync(resourceName, re => re.Snapshot.HealthStatus == HealthStatus.Healthy, cancellationToken: cancellationToken);
+        return WaitForResourceAsync(resourceName, re => re.Snapshot.GetHealthStatus() == HealthStatus.Healthy, cancellationToken: cancellationToken);
     }
 
     private async Task WaitUntilCompletionAsync(IResource resource, IResource dependency, int exitCode, CancellationToken cancellationToken)
@@ -352,7 +352,6 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
             var newState = stateFactory(previousState);
 
             newState = UpdateCommands(resource, newState);
-            newState = UpdateHealthStatus(resource, newState);
 
             notificationState.LastSnapshot = newState;
 
@@ -377,11 +376,10 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
             {
                 _logger.LogTrace("Resource {Resource}/{ResourceId} update published: " +
                     "ResourceType = {ResourceType}, CreationTimeStamp = {CreationTimeStamp:s}, State = {{ Text = {StateText}, Style = {StateStyle} }}, " +
-                    "HealthStatus = {HealthStatus} " +
                     "ExitCode = {ExitCode}, EnvironmentVariables = {{ {EnvironmentVariables} }}, Urls = {{ {Urls} }}, " +
                     "Properties = {{ {Properties} }}",
                     resource.Name, resourceId,
-                    newState.ResourceType, newState.CreationTimeStamp, newState.State?.Text, newState.State?.Style, newState.HealthStatus,
+                    newState.ResourceType, newState.CreationTimeStamp, newState.State?.Text, newState.State?.Style,
                     newState.ExitCode, string.Join(", ", newState.EnvironmentVariables.Select(e => $"{e.Name} = {e.Value}")), string.Join(", ", newState.Urls.Select(u => $"{u.Name} = {u.Url}")),
                     string.Join(", ", newState.Properties.Select(p => $"{p.Name} = {p.Value}")));
             }
@@ -390,20 +388,6 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    /// Update resource snapshot health status if the resource is running with no health checks.
-    /// </summary>
-    private static CustomResourceSnapshot UpdateHealthStatus(IResource resource, CustomResourceSnapshot previousState)
-    {
-        // A resource is also healthy if it has no health check annotations and is in the running state.
-        if (previousState.HealthStatus is not HealthStatus.Healthy && !resource.TryGetAnnotationsIncludingAncestorsOfType<HealthCheckAnnotation>(out _) && previousState.State?.Text == KnownResourceStates.Running)
-        {
-            return previousState with { HealthStatus = HealthStatus.Healthy };
-        }
-
-        return previousState;
-    }
-
     /// <summary>
     /// Use command annotations to update resource snapshot.
     /// </summary>

src/Aspire.Hosting/Dashboard/DashboardServiceData.cs

@@ -49,7 +49,6 @@ static GenericResourceSnapshot CreateResourceSnapshot(IResource resource, string
                     ExitCode = snapshot.ExitCode,
                     State = snapshot.State?.Text,
                     StateStyle = snapshot.State?.Style,
-                    HealthStatus = snapshot.HealthStatus,
                     HealthReports = GetOrCreateHealthReports(),
                     Commands = snapshot.Commands
                 };

src/Aspire.Hosting/Dashboard/ResourceSnapshot.cs

@@ -6,7 +6,6 @@
 using Aspire.Dashboard.Model;
 using Aspire.Hosting.ApplicationModel;
 using Google.Protobuf.WellKnownTypes;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
 
 namespace Aspire.Hosting.Dashboard;
 
@@ -26,7 +25,6 @@ internal abstract class ResourceSnapshot
     public required ImmutableArray<EnvironmentVariableSnapshot> Environment { get; init; }
     public required ImmutableArray<VolumeSnapshot> Volumes { get; init; }
     public required ImmutableArray<UrlSnapshot> Urls { get; init; }
-    public required HealthStatus? HealthStatus { get; init; }
     public required ImmutableArray<HealthReportSnapshot> HealthReports { get; init; }
     public required ImmutableArray<ResourceCommandSnapshot> Commands { get; init; }
 
@@ -45,7 +43,6 @@ internal abstract class ResourceSnapshot
             yield return (KnownProperties.Resource.CreateTime, CreationTimeStamp is null ? Value.ForNull() : Value.ForString(CreationTimeStamp.Value.ToString("O")), IsSensitive: false);
             yield return (KnownProperties.Resource.StartTime, StartTimeStamp is null ? Value.ForNull() : Value.ForString(StartTimeStamp.Value.ToString("O")), IsSensitive: false);
             yield return (KnownProperties.Resource.StopTime, StopTimeStamp is null ? Value.ForNull() : Value.ForString(StopTimeStamp.Value.ToString("O")), IsSensitive: false);
-            yield return (KnownProperties.Resource.HealthState, HealthStatus is null ? Value.ForNull() : Value.ForString(HealthStatus.ToString()), IsSensitive: false);
 
             foreach (var property in GetProperties())
             {

src/Aspire.Hosting/Dashboard/proto/Partials.cs

@@ -66,11 +66,6 @@ public static Resource FromSnapshot(ResourceSnapshot snapshot)
             resource.Commands.Add(new ResourceCommand { CommandType = command.Type, DisplayName = command.DisplayName, DisplayDescription = command.DisplayDescription ?? string.Empty, Parameter = ResourceSnapshot.ConvertToValue(command.Parameter), ConfirmationMessage = command.ConfirmationMessage ?? string.Empty, IconName = command.IconName ?? string.Empty, IconVariant = MapIconVariant(command.IconVariant), IsHighlighted = command.IsHighlighted, State = MapCommandState(command.State) });
         }
 
-        if (snapshot.HealthStatus is not null)
-        {
-            resource.HealthStatus = MapHealthStatus(snapshot.HealthStatus.Value);
-        }
-
         foreach (var report in snapshot.HealthReports)
         {
             var healthReport = new HealthReport { Key = report.Name, Description = report.Description ?? "", Exception = report.ExceptionText ?? "" };

src/Aspire.Hosting/Dashboard/proto/resource_service.proto

@@ -208,8 +208,6 @@ message Resource {
     // The set of volumes mounted to the resource. Only applies to containers.
     repeated Volume volumes = 15;
 
-    // The aggregate health state of the resource. Generally reflects data from health_reports, but may differ.
-    optional HealthStatus health_status = 16;
     // Reports from health checks, about this resource.
     repeated HealthReport health_reports = 17;
 

src/Aspire.Hosting/Health/ResourceHealthCheckService.cs

@@ -83,7 +83,7 @@ await eventing.PublishAsync(
                         cancellationToken).ConfigureAwait(false);
                 }
 
-                if (_latestEvents[resource.Name] is { } latestEvent && latestEvent.Snapshot.HealthStatus == report.Status)
+                if (_latestEvents[resource.Name] is { } latestEvent && latestEvent.Snapshot.GetHealthStatus() == report.Status)
                 {
                     await SlowDownMonitoringAsync(latestEvent, cancellationToken).ConfigureAwait(false);
                     continue;
@@ -93,12 +93,8 @@ await resourceNotificationService.PublishUpdateAsync(resource, s =>
                 {
                     var healthReports = MergeHealthReports(s.HealthReports, report);
 
-                    // Matches the logic in ASP.NET Core's private HealthReport.CalculateAggregateStatus
-                    var healthStatus = healthReports.MinBy(r => r.Status)?.Status ?? s.HealthStatus;
-
                     return s with
                     {
-                        HealthStatus = healthStatus,
                         HealthReports = healthReports
                     };
                 }).ConfigureAwait(false);
@@ -122,7 +118,7 @@ async Task SlowDownMonitoringAsync(ResourceEvent lastEvent, CancellationToken ca
 
             // If we've waited for 30 seconds, or we received an updated event, or the health status is no longer
             // healthy then we stop slowing down the monitoring loop.
-            while (DateTime.Now < releaseAfter && _latestEvents[lastEvent.Resource.Name] == lastEvent && lastEvent.Snapshot.HealthStatus == HealthStatus.Healthy)
+            while (DateTime.Now < releaseAfter && _latestEvents[lastEvent.Resource.Name] == lastEvent && lastEvent.Snapshot.GetHealthStatus() == HealthStatus.Healthy)
             {
                 await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
             }

src/Aspire.Hosting/PublicAPI.Unshipped.txt

@@ -1,5 +1,6 @@
 #nullable enable
 Aspire.Hosting.ApplicationModel.ContainerLifetime.Session = 0 -> Aspire.Hosting.ApplicationModel.ContainerLifetime
+Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.GetHealthStatus() -> Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus?
 Aspire.Hosting.ApplicationModel.EndpointNameAttribute
 Aspire.Hosting.ApplicationModel.EndpointNameAttribute.EndpointNameAttribute() -> void
 Aspire.Hosting.ApplicationModel.HealthReportSnapshot
@@ -46,8 +47,6 @@ Aspire.Hosting.ApplicationModel.ContainerNameAnnotation.Name.get -> string!
 Aspire.Hosting.ApplicationModel.ContainerNameAnnotation.Name.set -> void
 Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.Commands.get -> System.Collections.Immutable.ImmutableArray<Aspire.Hosting.ApplicationModel.ResourceCommandSnapshot!>
 Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.Commands.init -> void
-Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.HealthStatus.get -> Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus?
-Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.HealthStatus.init -> void
 Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.HealthReports.get -> System.Collections.Immutable.ImmutableArray<Aspire.Hosting.ApplicationModel.HealthReportSnapshot!>
 Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.HealthReports.init -> void
 Aspire.Hosting.ApplicationModel.CustomResourceSnapshot.StartTimeStamp.get -> System.DateTime?

src/Shared/Model/KnownProperties.cs

@@ -24,7 +24,6 @@ public static class Resource
         public const string StartTime = "resource.startTime";
         public const string StopTime = "resource.stopTime";
         public const string Source = "resource.source";
-        public const string HealthState = "resource.healthState";
         public const string ConnectionString = "resource.connectionString";
     }
 

tests/Aspire.Hosting.Tests/Dashboard/DashboardServiceTests.cs

@@ -167,7 +167,7 @@ await resourceNotificationService.PublishUpdateAsync(testResource, s =>
         });
 
         var resource = Assert.Single((await writer.ReadNextAsync()).Changes.Value).Upsert;
-        Assert.False(resource.HasHealthStatus);
+
         Assert.Collection(resource.HealthReports,
             r =>
             {

tests/Aspire.Hosting.Tests/Dashboard/ResourcePublisherTests.cs

@@ -199,7 +199,6 @@ private static GenericResourceSnapshot CreateResourceSnapshot(string name)
             Urls = [],
             Volumes = [],
             Environment = [],
-            HealthStatus = null,
             HealthReports = [],
             Commands = []
         };

tests/Aspire.Hosting.Tests/Health/ResourceHealthCheckServiceTests.cs

@@ -29,15 +29,15 @@ await rns.PublishUpdateAsync(resource.Resource, s => s with
         });
 
         var startingEvent = await rns.WaitForResourceAsync("resource", e => e.Snapshot.State?.Text == KnownResourceStates.Starting);
-        Assert.Null(startingEvent.Snapshot.HealthStatus);
+        Assert.Null(startingEvent.Snapshot.GetHealthStatus());
 
         await rns.PublishUpdateAsync(resource.Resource, s => s with
         {
             State = new ResourceStateSnapshot(KnownResourceStates.Running, null)
         });
 
         var runningEvent = await rns.WaitForResourceAsync("resource", e => e.Snapshot.State?.Text == KnownResourceStates.Running);
-        Assert.Equal(HealthStatus.Healthy, runningEvent.Snapshot.HealthStatus);
+        Assert.Equal(HealthStatus.Healthy, runningEvent.Snapshot.GetHealthStatus());
 
         await app.StopAsync();
     }
@@ -62,18 +62,18 @@ await rns.PublishUpdateAsync(resource.Resource, s => s with
         });
 
         var startingEvent = await rns.WaitForResourceAsync("resource", e => e.Snapshot.State?.Text == KnownResourceStates.Starting);
-        Assert.Null(startingEvent.Snapshot.HealthStatus);
+        Assert.Null(startingEvent.Snapshot.GetHealthStatus());
 
         await rns.PublishUpdateAsync(resource.Resource, s => s with
         {
             State = new ResourceStateSnapshot(KnownResourceStates.Running, null)
         });
 
         var runningEvent = await rns.WaitForResourceAsync("resource", e => e.Snapshot.State?.Text == KnownResourceStates.Running);
-        Assert.Null(runningEvent.Snapshot.HealthStatus);
+        Assert.Null(runningEvent.Snapshot.GetHealthStatus());
 
         var hasHealthReportsEvent = await rns.WaitForResourceAsync("resource", e => e.Snapshot.HealthReports.Length > 0);
-        Assert.Equal(HealthStatus.Healthy, hasHealthReportsEvent.Snapshot.HealthStatus);
+        Assert.Equal(HealthStatus.Healthy, hasHealthReportsEvent.Snapshot.GetHealthStatus());
 
         await app.StopAsync();
     }

tests/Aspire.Hosting.Tests/ResourceNotificationTests.cs

@@ -80,15 +80,15 @@ async Task<List<ResourceEvent>> GetValuesAsync(CancellationToken cancellationTok
                 Assert.Equal("myResource", c.ResourceId);
                 Assert.Equal("CustomResource", c.Snapshot.ResourceType);
                 Assert.Equal("value", c.Snapshot.Properties.Single(p => p.Name == "A").Value);
-                Assert.Null(c.Snapshot.HealthStatus);
+                Assert.Null(c.Snapshot.GetHealthStatus());
             },
             c =>
             {
                 Assert.Equal(resource, c.Resource);
                 Assert.Equal("myResource", c.ResourceId);
                 Assert.Equal("CustomResource", c.Snapshot.ResourceType);
                 Assert.Equal("value", c.Snapshot.Properties.Single(p => p.Name == "B").Value);
-                Assert.Null(c.Snapshot.HealthStatus);
+                Assert.Null(c.Snapshot.GetHealthStatus());
             });
     }
 

tests/Shared/DashboardModel/ModelTestHelpers.cs

@@ -36,7 +36,6 @@ public static ResourceViewModel CreateResource(
             State = state?.ToString(),
             KnownState = state,
             StateStyle = stateStyle,
-            HealthStatus = healthStatus,
             HealthReports = [],
             Commands = []
         };