Merge 'release/8.0' into release/8.0-preview7

dotnet · May 1, 2024 · 4952a6e · 4952a6e
2 parents 6bd2991 + dbcbdb7
commit 4952a6e
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/Microsoft.Extensions.ServiceDiscovery/ServiceEndpointWatcher.cs b/src/Microsoft.Extensions.ServiceDiscovery/ServiceEndpointWatcher.cs
@@ -77,8 +77,10 @@ public ValueTask<ServiceEndpointSource> GetEndpointsAsync(CancellationToken canc
         async ValueTask<ServiceEndpointSource> GetEndpointsInternal(CancellationToken cancellationToken)
         {
             ServiceEndpointSource? result;
+            var disposalToken = _disposalCancellation.Token;
             do
             {
+                disposalToken.ThrowIfCancellationRequested();
                 cancellationToken.ThrowIfCancellationRequested();
                 await RefreshAsync(force: false).WaitAsync(cancellationToken).ConfigureAwait(false);
                 result = _cachedEndpoints;
@@ -194,7 +196,14 @@ private async Task RefreshAsyncInternal()
 
         if (OnEndpointsUpdated is { } callback)
         {
-            callback(new(newEndpoints, error));
+            try
+            {
+                callback(new(newEndpoints, error));
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error notifying observers of updated endpoints.");
+            }
         }
 
         lock (_lock)
@@ -244,10 +253,17 @@ private void SchedulePollingTimer()
     /// <inheritdoc/>
     public async ValueTask DisposeAsync()
     {
-        lock (_lock)
+        try
         {
             _disposalCancellation.Cancel();
+        }
+        catch (Exception exception)
+        {
+            _logger.LogError(exception, "Error cancelling disposal cancellation token.");
+        }
 
+        lock (_lock)
+        {
             _changeTokenRegistration?.Dispose();
             _changeTokenRegistration = null;