Update to 8.0.4 of ASP.NET Core (#3667)

Author: eerhardt

eng/Versions.props

@@ -38,14 +38,14 @@
     <MicrosoftExtensionsLoggingAbstractionsPackageVersion>8.0.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
     <MicrosoftExtensionsOptionsPackageVersion>8.0.2</MicrosoftExtensionsOptionsPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>8.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>8.0.3</MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>8.0.3</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>8.0.4</MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>8.0.4</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
     <MicrosoftAspNetCoreOpenApiPackageVersion>8.0.4</MicrosoftAspNetCoreOpenApiPackageVersion>
-    <MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>8.0.3</MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>8.0.3</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
-    <MicrosoftExtensionsFeaturesPackageVersion>8.0.3</MicrosoftExtensionsFeaturesPackageVersion>
+    <MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>8.0.4</MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>8.0.4</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCorePackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
+    <MicrosoftExtensionsFeaturesPackageVersion>8.0.4</MicrosoftExtensionsFeaturesPackageVersion>
     <!-- EF -->
     <MicrosoftEntityFrameworkCoreCosmosPackageVersion>8.0.4</MicrosoftEntityFrameworkCoreCosmosPackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>8.0.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>

tests/Aspire.Components.Common.Tests/ActivityNotifier.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading.Channels;
 using OpenTelemetry;
 
 namespace Aspire.Components.Common.Tests;
@@ -11,19 +13,44 @@ namespace Aspire.Components.Common.Tests;
 /// </summary>
 public sealed class ActivityNotifier : BaseProcessor<Activity>
 {
-    // RunContinuationsAsynchronously because OnEnd gets invoked on the thread creating the Activity.
-    // Running more test code on this thread can cause deadlocks in the case where the Activity is created on a "drain thread" (ex. Redis)
-    // and the test method disposes the Host on that same thread. Disposing the Host will dispose the Instrumentation, which tries joining
-    // with the "drain thread".
-    private readonly TaskCompletionSource _taskSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+    private readonly Channel<Activity> _activityChannel = Channel.CreateUnbounded<Activity>();
 
-    public Task ActivityReceived => _taskSource.Task;
+    public async Task<List<Activity>> TakeAsync(int count, TimeSpan timeout)
+    {
+        var activityList = new List<Activity>();
+        using var cts = new CancellationTokenSource(timeout);
+        await foreach (var activity in WaitAsync(cts.Token))
+        {
+            activityList.Add(activity);
+            if (activityList.Count == count)
+            {
+                break;
+            }
+        }
 
-    public List<Activity> ExportedActivities { get; } = [];
+        return activityList;
+    }
 
     public override void OnEnd(Activity data)
     {
-        ExportedActivities.Add(data);
-        _taskSource.SetResult();
+        _activityChannel.Writer.TryWrite(data);
+    }
+
+    private async IAsyncEnumerable<Activity> WaitAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+    {
+        await foreach (var activity in _activityChannel.Reader.ReadAllAsync(cancellationToken).ConfigureAwait(false))
+        {
+            yield return activity;
+        }
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            _activityChannel.Writer.TryComplete();
+        }
+
+        base.Dispose(disposing);
     }
 }

tests/Aspire.NATS.Net.Tests/AspireNatsClientExtensionsTests.cs

@@ -184,7 +184,7 @@ public void NatsInstrumentationEndToEnd()
 
             builder.AddNatsClient(DefaultConnectionName);
 
-            var notifier = new ActivityNotifier();
+            using var notifier = new ActivityNotifier();
             builder.Services.AddOpenTelemetry().WithTracing(builder => builder.AddProcessor(notifier));
 
             using var host = builder.Build();
@@ -193,10 +193,10 @@ public void NatsInstrumentationEndToEnd()
             var nats = host.Services.GetRequiredService<INatsConnection>();
             await nats.PublishAsync("test");
 
-            await notifier.ActivityReceived.WaitAsync(TimeSpan.FromSeconds(10));
-            Assert.Single(notifier.ExportedActivities);
+            var activityList = await notifier.TakeAsync(1, TimeSpan.FromSeconds(10));
+            Assert.Single(activityList);
 
-            var activity = notifier.ExportedActivities[0];
+            var activity = activityList[0];
             Assert.Equal("test publish", activity.OperationName);
             Assert.Contains(activity.Tags, kvp => kvp.Key == "messaging.system" && kvp.Value == "nats");
         }, _connectionString).Dispose();

tests/Aspire.StackExchange.Redis.DistributedCaching.Tests/DistributedCacheConformanceTests.cs

@@ -48,7 +48,7 @@ public void WorksWithOpenTelemetryTracing()
 
             builder.AddRedisDistributedCache("redis");
 
-            var notifier = new ActivityNotifier();
+            using var notifier = new ActivityNotifier();
             builder.Services.AddOpenTelemetry().WithTracing(builder => builder.AddProcessor(notifier));
             // set the FlushInterval to to zero so the Activity gets created immediately
             builder.Services.Configure<StackExchangeRedisInstrumentationOptions>(options => options.FlushInterval = TimeSpan.Zero);
@@ -61,14 +61,26 @@ public void WorksWithOpenTelemetryTracing()
             var cache = host.Services.GetRequiredService<IDistributedCache>();
             await cache.GetAsync("myFakeKey", CancellationToken.None);
 
-            // wait for the Activity to be processed
-            await notifier.ActivityReceived.WaitAsync(TimeSpan.FromSeconds(10));
-
-            Assert.Single(notifier.ExportedActivities);
-
-            var activity = notifier.ExportedActivities[0];
-            Assert.Equal("HMGET", activity.OperationName);
-            Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+            // read the first 3 activities
+            var activityList = await notifier.TakeAsync(3, TimeSpan.FromSeconds(10));
+            Assert.Equal(3, activityList.Count);
+            Assert.Collection(activityList,
+                // https://github.com/dotnet/aspnetcore/pull/54239 added 2 CLIENT activities on the first call
+                activity =>
+                {
+                    Assert.Equal("CLIENT", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                },
+                activity =>
+                {
+                    Assert.Equal("CLIENT", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                },
+                activity =>
+                {
+                    Assert.Equal("HMGET", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                });
         }, ConnectionString).Dispose();
     }
 }

tests/Aspire.StackExchange.Redis.OutputCaching.Tests/OutputCacheConformanceTests.cs

@@ -48,7 +48,7 @@ public void WorksWithOpenTelemetryTracing()
 
             builder.AddRedisOutputCache("redis");
 
-            var notifier = new ActivityNotifier();
+            using var notifier = new ActivityNotifier();
             builder.Services.AddOpenTelemetry().WithTracing(builder => builder.AddProcessor(notifier));
             // set the FlushInterval to to zero so the Activity gets created immediately
             builder.Services.Configure<StackExchangeRedisInstrumentationOptions>(options => options.FlushInterval = TimeSpan.Zero);
@@ -61,14 +61,26 @@ public void WorksWithOpenTelemetryTracing()
             var cacheStore = host.Services.GetRequiredService<IOutputCacheStore>();
             await cacheStore.GetAsync("myFakeKey", CancellationToken.None);
 
-            // wait for the Activity to be processed
-            await notifier.ActivityReceived.WaitAsync(TimeSpan.FromSeconds(10));
-
-            Assert.Single(notifier.ExportedActivities);
-
-            var activity = notifier.ExportedActivities[0];
-            Assert.Equal("GET", activity.OperationName);
-            Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+            // read the first 3 activities
+            var activityList = await notifier.TakeAsync(3, TimeSpan.FromSeconds(10));
+            Assert.Equal(3, activityList.Count);
+            Assert.Collection(activityList,
+                // https://github.com/dotnet/aspnetcore/pull/54239 added 2 CLIENT activities on the first call
+                activity =>
+                {
+                    Assert.Equal("CLIENT", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                },
+                activity =>
+                {
+                    Assert.Equal("CLIENT", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                },
+                activity =>
+                {
+                    Assert.Equal("GET", activity.OperationName);
+                    Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
+                });
         }, ConnectionString).Dispose();
     }
 }

tests/Aspire.StackExchange.Redis.Tests/AspireRedisExtensionsTests.cs

@@ -265,7 +265,7 @@ public void KeyedServiceRedisInstrumentationEndToEnd()
                 new KeyValuePair<string, string?>("ConnectionStrings:redis", connectionString)
             ]);
 
-            var notifier = new ActivityNotifier();
+            using var notifier = new ActivityNotifier();
             builder.Services.AddOpenTelemetry().WithTracing(builder => builder.AddProcessor(notifier));
             // set the FlushInterval to to zero so the Activity gets created immediately
             builder.Services.Configure<StackExchangeRedisInstrumentationOptions>(options => options.FlushInterval = TimeSpan.Zero);
@@ -281,11 +281,11 @@ public void KeyedServiceRedisInstrumentationEndToEnd()
             var database = connectionMultiplexer.GetDatabase();
             database.StringGet("key");
 
-            await notifier.ActivityReceived.WaitAsync(TimeSpan.FromSeconds(10));
+            // read the first activity
+            var activityList = await notifier.TakeAsync(1, TimeSpan.FromSeconds(10));
+            Assert.Single(activityList);
 
-            Assert.Single(notifier.ExportedActivities);
-
-            var activity = notifier.ExportedActivities[0];
+            var activity = activityList[0];
             Assert.Equal("GET", activity.OperationName);
             Assert.Contains(activity.Tags, kvp => kvp.Key == "db.system" && kvp.Value == "redis");
         }, ConnectionString).Dispose();