Attempt to use CollectionFixture instead of ClassFixture

I think there may be race conditions if we reuse containers.

Author: bouwkast

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AdoNet/DapperTests.cs

@@ -14,7 +14,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests.AdoNet
     [Trait("RequiresDockerDependency", "true")]
     [Trait("DockerGroup", "1")]
     [Collection(ContainersCollection.Name)]
-    public class DapperTests : TracingIntegrationTest, IClassFixture<PostgresFixture>
+    public class DapperTests : TracingIntegrationTest
     {
         public DapperTests(ITestOutputHelper output, PostgresFixture postgresFixture)
             : base("Dapper", output)

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AdoNet/NpgsqlCommandTests.cs

@@ -23,7 +23,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests.AdoNet
     [Trait("DockerGroup", "1")]
     [Collection(ContainersCollection.Name)]
     [UsesVerify]
-    public class NpgsqlCommandTests : TracingIntegrationTest, IClassFixture<PostgresFixture>
+    public class NpgsqlCommandTests : TracingIntegrationTest
     {
         public NpgsqlCommandTests(ITestOutputHelper output, PostgresFixture postgresFixture)
             : base("Npgsql", output)

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AerospikeTests.cs

@@ -22,7 +22,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests
     [Trait("DockerGroup", "2")]
     [Collection(ContainersCollection.Name)]
     [UsesVerify]
-    public class AerospikeTests : TracingIntegrationTest, IClassFixture<AerospikeFixture>
+    public class AerospikeTests : TracingIntegrationTest
     {
         public AerospikeTests(ITestOutputHelper output, AerospikeFixture aerospikeFixture)
             : base("Aerospike", output)

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/ContainersCollection.cs

@@ -3,46 +3,21 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
-using System;
-using System.Threading.Tasks;
 using Datadog.Trace.TestHelpers.AutoInstrumentation.Containers;
 using Xunit;
 
 namespace Datadog.Trace.ClrProfiler.IntegrationTests;
 
 /// <summary>
 /// Collection definition for TestContainers.
-/// This ensures that all containers are properly disposed when all tests complete.
+/// Using ICollectionFixture ensures that ONE instance of each fixture is shared across all test classes
+/// in the collection, and disposed when all tests complete. This prevents race conditions and
+/// eliminates the need for reference counting.
 /// </summary>
 [CollectionDefinition(Name)]
-public class ContainersCollection : ICollectionFixture<ContainersCleanup>
+public class ContainersCollection :
+    ICollectionFixture<PostgresFixture>,
+    ICollectionFixture<AerospikeFixture>
 {
     public const string Name = "TestContainers";
 }
-
-/// <summary>
-/// Cleanup fixture that disposes all TestContainers when the test collection completes.
-/// This implements the optimization mentioned in PR #5031: "stop the docker images as soon as they're not needed anymore"
-/// </summary>
-#pragma warning disable SA1402 // File may only contain a single type
-public class ContainersCleanup : IAsyncLifetime
-#pragma warning restore SA1402 // File may only contain a single type
-{
-    public Task InitializeAsync()
-    {
-        // No initialization needed
-        return Task.CompletedTask;
-    }
-
-    public async Task DisposeAsync()
-    {
-        try
-        {
-            await ContainersRegistry.DisposeAll();
-        }
-        catch
-        {
-            // Don't throw - we don't want to fail tests due to cleanup errors
-        }
-    }
-}

tracer/test/Datadog.Trace.Security.IntegrationTests/ContainersCollection.cs

@@ -12,37 +12,12 @@ namespace Datadog.Trace.Security.IntegrationTests;
 
 /// <summary>
 /// Collection definition for TestContainers.
-/// This ensures that all containers are properly disposed when all tests complete.
+/// Using ICollectionFixture ensures that ONE instance of each fixture is shared across all test classes
+/// in the collection, and disposed when all tests complete. This prevents race conditions and
+/// eliminates the need for reference counting.
 /// </summary>
 [CollectionDefinition(Name)]
-public class ContainersCollection : ICollectionFixture<ContainersCleanup>
+public class ContainersCollection : ICollectionFixture<PostgresFixture>
 {
     public const string Name = "TestContainers";
 }
-
-/// <summary>
-/// Cleanup fixture that disposes all TestContainers when the test collection completes.
-/// This implements the optimization mentioned in PR #5031: "stop the docker images as soon as they're not needed anymore"
-/// </summary>
-#pragma warning disable SA1402 // File may only contain a single type
-public class ContainersCleanup : IAsyncLifetime
-#pragma warning restore SA1402 // File may only contain a single type
-{
-    public Task InitializeAsync()
-    {
-        // No initialization needed
-        return Task.CompletedTask;
-    }
-
-    public async Task DisposeAsync()
-    {
-        try
-        {
-            await ContainersRegistry.DisposeAll();
-        }
-        catch
-        {
-            // Don't throw - we don't want to fail tests due to cleanup errors
-        }
-    }
-}

tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/AspNetCore5IastDbTests.cs

@@ -17,7 +17,7 @@ namespace Datadog.Trace.Security.IntegrationTests.IAST;
 
 [Trait("RequiresDockerDependency", "true")]
 [Collection(ContainersCollection.Name)]
-public class AspNetCore5IastDbTests : AspNetCore5IastTests, IClassFixture<PostgresFixture>
+public class AspNetCore5IastDbTests : AspNetCore5IastTests
 {
     public AspNetCore5IastDbTests(AspNetCoreTestFixture fixture, PostgresFixture postgresFixture, ITestOutputHelper outputHelper)
         : base(fixture, outputHelper, enableIast: true, testName: "AspNetCore5IastDbTestsIastEnabled", samplingRate: 100, vulnerabilitiesPerRequest: 200, isIastDeduplicationEnabled: false, sampleName: "AspNetCore5")

tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/Containers/ContainerFixture.cs

@@ -15,32 +15,48 @@ namespace Datadog.Trace.TestHelpers.AutoInstrumentation.Containers;
 
 public abstract class ContainerFixture : IAsyncLifetime
 {
-    private IReadOnlyDictionary<string, object>? _resources;
+    private Dictionary<string, object>? _resources;
 
     public async Task InitializeAsync()
     {
-        _resources = await ContainersRegistry.GetOrAdd(GetType(), InitializeResources);
+        _resources = new Dictionary<string, object>();
+        await InitializeResources(_resources.Add).ConfigureAwait(false);
     }
 
     public async Task DisposeAsync()
     {
-        // Release the reference to this fixture type
-        // When the reference count reaches zero, the containers will be disposed
-        await ContainersRegistry.Release(GetType());
+        if (_resources == null)
+        {
+            return;
+        }
+
+        foreach (var resourceKvp in _resources)
+        {
+            var resource = resourceKvp.Value;
+
+            try
+            {
+                if (resource is IAsyncDisposable asyncDisposable)
+                {
+                    await asyncDisposable.DisposeAsync().ConfigureAwait(false);
+                }
+                else if (resource is IDisposable disposable)
+                {
+                    disposable.Dispose();
+                }
+            }
+            catch
+            {
+                // Continue disposing other resources even if one fails
+            }
+        }
+
+        _resources.Clear();
     }
 
     public virtual IEnumerable<KeyValuePair<string, string>> GetEnvironmentVariables() => Enumerable.Empty<KeyValuePair<string, string>>();
 
     protected abstract Task InitializeResources(Action<string, object> registerResource);
 
     protected T GetResource<T>(string key) => (T)_resources![key];
-
-    private async Task<IReadOnlyDictionary<string, object>> InitializeResources()
-    {
-        var resources = new Dictionary<string, object>();
-
-        await InitializeResources(resources.Add).ConfigureAwait(false);
-
-        return resources;
-    }
 }