[sql] Workaround integration test failures

test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs

@@ -3,8 +3,6 @@
 
 using System.Data;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
-using DotNet.Testcontainers.Containers;
 using Microsoft.Data.SqlClient;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
@@ -14,22 +12,16 @@
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
-public sealed class SqlClientIntegrationTests : IAsyncLifetime
+[Trait("CategoryName", "SqlIntegrationTests")]
+public sealed class SqlClientIntegrationTests : IClassFixture<SqlClientIntegrationTestsFixture>
 {
-    // The Microsoft SQL Server Docker image is not compatible with ARM devices, such as Macs with Apple Silicon.
-    private readonly IContainer databaseContainer = Architecture.Arm64.Equals(RuntimeInformation.ProcessArchitecture) ? new SqlEdgeBuilder().Build() : new MsSqlBuilder().Build();
+    private readonly SqlClientIntegrationTestsFixture fixture;
 
-    public Task InitializeAsync()
+    public SqlClientIntegrationTests(SqlClientIntegrationTestsFixture fixture)
     {
-        return this.databaseContainer.StartAsync();
+        this.fixture = fixture;
     }
 
-    public Task DisposeAsync()
-    {
-        return this.databaseContainer.DisposeAsync().AsTask();
-    }
-
-    [Trait("CategoryName", "SqlIntegrationTests")]
     [EnabledOnDockerPlatformTheory(EnabledOnDockerPlatformTheoryAttribute.DockerPlatform.Linux)]
     [InlineData(CommandType.Text, "select 1/1", false)]
     [InlineData(CommandType.Text, "select 1/1", false, true)]
@@ -105,14 +97,14 @@ public void SuccessfulCommandTest(
 
     private string GetConnectionString()
     {
-        switch (this.databaseContainer)
+        switch (this.fixture.DatabaseContainer)
         {
             case SqlEdgeContainer container:
                 return container.GetConnectionString();
             case MsSqlContainer container:
                 return container.GetConnectionString();
             default:
-                throw new InvalidOperationException($"Container type ${this.databaseContainer.GetType().Name} not supported.");
+                throw new InvalidOperationException($"Container type '${this.fixture.DatabaseContainer.GetType().Name}' is not supported.");
         }
     }
 }

test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTestsFixture.cs

@@ -0,0 +1,47 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Runtime.InteropServices;
+using DotNet.Testcontainers.Containers;
+using Testcontainers.MsSql;
+using Testcontainers.SqlEdge;
+using Xunit;
+
+namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
+
+public sealed class SqlClientIntegrationTestsFixture : IAsyncLifetime
+{
+    // The Microsoft SQL Server Docker image is not compatible with ARM devices, such as Macs with Apple Silicon.
+    private readonly IContainer databaseContainer = Architecture.Arm64.Equals(RuntimeInformation.ProcessArchitecture) ? CreateSqlEdge() : CreateMsSql();
+
+    public IContainer DatabaseContainer => this.databaseContainer;
+
+    public Task InitializeAsync()
+    {
+        return this.databaseContainer.StartAsync();
+    }
+
+    public Task DisposeAsync()
+    {
+        return this.databaseContainer.DisposeAsync().AsTask();
+    }
+
+    private static SqlEdgeContainer CreateSqlEdge()
+    {
+        // Note: The Testcontainers.SqlEdge package has been deprecated. Seems
+        // it will not work with newer GItHub-hosted runners. Need to find an
+        // alternative solution. See:
+        // https://github.com/testcontainers/testcontainers-dotnet/pull/1265
+        return new SqlEdgeBuilder().Build();
+    }
+
+    private static MsSqlContainer CreateMsSql()
+    {
+        // Note: This "WithImage" line can most likely be removed when there is
+        // a new version (>3.10.0) of Testcontainers.MsSql released. See:
+        // https://github.com/testcontainers/testcontainers-dotnet/pull/1265
+        return new MsSqlBuilder()
+            .WithImage("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
+            .Build();
+    }
+}