Use ICollectionFixture for each one

Author: bouwkast

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

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

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

@@ -21,7 +21,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests.AdoNet
 {
     [Trait("RequiresDockerDependency", "true")]
     [Trait("DockerGroup", "1")]
-    [Collection(ContainersCollection.Name)]
+    [Collection(PostgresCollection.Name)]
     [UsesVerify]
     public class NpgsqlCommandTests : TracingIntegrationTest
     {

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

@@ -20,7 +20,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests
 {
     [Trait("RequiresDockerDependency", "true")]
     [Trait("DockerGroup", "2")]
-    [Collection(ContainersCollection.Name)]
+    [Collection(AerospikeCollection.Name)]
     [UsesVerify]
     public class AerospikeTests : TracingIntegrationTest
     {

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

@@ -9,15 +9,25 @@
 namespace Datadog.Trace.ClrProfiler.IntegrationTests;
 
 /// <summary>
-/// Collection definition for TestContainers.
-/// 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.
+/// Collection definition for Postgres tests.
+/// Using ICollectionFixture ensures that ONE PostgresFixture instance is shared across all test classes
+/// in this collection. The container starts when the first test runs and stops when the last test finishes.
 /// </summary>
 [CollectionDefinition(Name)]
-public class ContainersCollection :
-    ICollectionFixture<PostgresFixture>,
-    ICollectionFixture<AerospikeFixture>
+public class PostgresCollection : ICollectionFixture<PostgresFixture>
 {
-    public const string Name = "TestContainers";
+    public const string Name = "Postgres";
 }
+
+/// <summary>
+/// Collection definition for Aerospike tests.
+/// Using ICollectionFixture ensures that ONE AerospikeFixture instance is shared across all test classes
+/// in this collection. The container starts when the first test runs and stops when the last test finishes.
+/// </summary>
+#pragma warning disable SA1402 // File may only contain a single type
+[CollectionDefinition(Name)]
+public class AerospikeCollection : ICollectionFixture<AerospikeFixture>
+{
+    public const string Name = "Aerospike";
+}
+#pragma warning restore SA1402 // File may only contain a single type

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

@@ -3,21 +3,18 @@
 // 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.Security.IntegrationTests;
 
 /// <summary>
-/// Collection definition for TestContainers.
-/// 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.
+/// Collection definition for Postgres tests.
+/// Using ICollectionFixture ensures that ONE PostgresFixture instance is shared across all test classes
+/// in this collection. The container starts when the first test runs and stops when the last test finishes.
 /// </summary>
 [CollectionDefinition(Name)]
-public class ContainersCollection : ICollectionFixture<PostgresFixture>
+public class PostgresCollection : ICollectionFixture<PostgresFixture>
 {
-    public const string Name = "TestContainers";
+    public const string Name = "Postgres";
 }

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

@@ -652,8 +652,7 @@ protected override async Task TryStartApp()
     }
 }
 
-[Collection(ContainersCollection.Name)]
-public abstract class AspNetCore2IastTests : AspNetBase, IClassFixture<AspNetCoreTestFixture>, IClassFixture<PostgresFixture>
+public abstract class AspNetCore2IastTests : AspNetBase, IClassFixture<AspNetCoreTestFixture>
 {
     public AspNetCore2IastTests(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper, bool enableIast, string testName, bool? isIastDeduplicationEnabled = null, int? samplingRate = null, int? vulnerabilitiesPerRequest = null, bool? redactionEnabled = false, int iastTelemetryLevel = (int)IastMetricsVerbosityLevel.Off)
         : this(fixture, null, outputHelper, enableIast, testName, isIastDeduplicationEnabled, samplingRate, vulnerabilitiesPerRequest, redactionEnabled, iastTelemetryLevel)

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

@@ -16,7 +16,7 @@
 namespace Datadog.Trace.Security.IntegrationTests.IAST;
 
 [Trait("RequiresDockerDependency", "true")]
-[Collection(ContainersCollection.Name)]
+[Collection(PostgresCollection.Name)]
 public class AspNetCore5IastDbTests : AspNetCore5IastTests
 {
     public AspNetCore5IastDbTests(AspNetCoreTestFixture fixture, PostgresFixture postgresFixture, ITestOutputHelper outputHelper)