chore: Update Testcontainers for .NET to version 2.3.0 (#1953)

* chore: Update Testcontainers for .NET to version 2.3.0 * fix(Elastic.Clients.Elasticsearch.Tests): TC for .NET does not always resolve the Hostname property to localhost (it varies accordingly to the Docker environment) * fix(Elastic.Apm.Profiler.Managed.Tests): Set mandatory Passwort property * fix: Remove private Docker registry * fix(Elastic.Apm.Profiler.Managed.Tests): Remove OracleProviderExpectedSpans span count Co-authored-by: Wolfgang Ziegler <[email protected]> Co-authored-by: Gergely Kalapos <[email protected]>
elastic · Dec 28, 2022 · d7d185b · d7d185b
1 parent 7d29a5e
commit d7d185b
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 40 deletions.
diff --git a/sample/StackExchangeRedisSample/Program.cs b/sample/StackExchangeRedisSample/Program.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using DotNet.Testcontainers.Containers.Builders;
-using DotNet.Testcontainers.Containers.Configurations.Databases;
-using DotNet.Testcontainers.Containers.Modules.Databases;
+using System.Threading.Tasks;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Containers;
 using Elastic.Apm;
 using Elastic.Apm.Api;
 using Elastic.Apm.StackExchange.Redis;

diff --git a/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj b/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj
@@ -9,7 +9,7 @@
       <PackageReference Include="StackExchange.Redis" Version="2.0.495" />
       <!-- Strong name any assemblies that aren't i.e. DotNet.Testcontainers -->
       <PackageReference Include="StrongNamer" Version="0.2.5" />
-      <PackageReference Include="DotNet.Testcontainers" Version="1.4.0" />
+      <PackageReference Include="Testcontainers" Version="2.3.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj b/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj
@@ -17,7 +17,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.0" />
     <PackageReference Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
-    <PackageReference Include="Testcontainers" Version="2.1.0" />
+    <PackageReference Include="Testcontainers" Version="2.3.0" />
     <!-- Strong name any assemblies that aren't i.e. DotNet.Testcontainers -->
     <PackageReference Include="StrongNamer" Version="0.2.5" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

diff --git a/test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs b/test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs
@@ -33,7 +33,7 @@ public async Task InitializeAsync()
 
 		public async Task DisposeAsync()
 		{
-			if (_container.State == TestcontainersState.Running)
+			if (_container.State == TestcontainersStates.Running)
 			{
 				await _container.StopAsync();
 				await _container.DisposeAsync();

diff --git a/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj b/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
-    <PackageReference Include="DotNet.Testcontainers" Version="1.4.0" />
+    <PackageReference Include="Testcontainers" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoDbTestcontainer.cs b/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoDbTestcontainer.cs
@@ -3,15 +3,16 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using DotNet.Testcontainers.Containers.Configurations;
-using DotNet.Testcontainers.Containers.Modules.Abstractions;
+using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Containers;
+using Microsoft.Extensions.Logging;
 
 namespace Elastic.Apm.MongoDb.Tests.Fixture
 {
 	public sealed class MongoDbTestcontainer : TestcontainerDatabase
 	{
-		internal MongoDbTestcontainer(ITestcontainersConfiguration configuration)
-			: base(configuration)
+		internal MongoDbTestcontainer(ITestcontainersConfiguration configuration, ILogger logger)
+			: base(configuration, logger)
 		{
 		}
 

diff --git a/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoDbTestcontainerConfiguration.cs b/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoDbTestcontainerConfiguration.cs
@@ -4,9 +4,8 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO;
-using DotNet.Testcontainers.Containers.Configurations.Abstractions;
-using DotNet.Testcontainers.Containers.OutputConsumers;
-using DotNet.Testcontainers.Containers.WaitStrategies;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
 
 namespace Elastic.Apm.MongoDb.Tests.Fixture
 {

diff --git a/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs b/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs
@@ -5,7 +5,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
-using DotNet.Testcontainers.Containers.Builders;
+using DotNet.Testcontainers.Builders;
 using MongoDB.Driver;
 using Xunit;
 

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs b/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs
@@ -16,8 +16,6 @@ public class AdoNetTestData : IEnumerable<object[]>
 		public const int DbRunnerExpectedRunAllAsyncSpans = 111;
 		public const int DbRunnerExpectedRunBaseTypesAsyncSpans = 68;
 
-		// frequent commands are executed to retrieve session parameters. we should ignore these
-		public const int OracleProviderExpectedSpans = 63;
 		public const string OracleProviderSpanNameStart = "DECLARE";
 
 		public IEnumerator<object[]> GetEnumerator()

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs b/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs
@@ -65,7 +65,7 @@ public async Task CaptureAutoInstrumentedSpans(string targetFramework)
 			}
 
 			apmServer.ReceivedData.Transactions.Should().HaveCount(2);
-			apmServer.ReceivedData.Spans.Should().HaveCount(AdoNetTestData.DbRunnerExpectedTotalSpans + AdoNetTestData.OracleProviderExpectedSpans);
+			apmServer.ReceivedData.Spans.Should().HaveCount(AdoNetTestData.DbRunnerExpectedTotalSpans);
 
 			var testSpans = apmServer.ReceivedData.Spans
 				.Where(s => !s.Name.StartsWith(AdoNetTestData.OracleProviderSpanNameStart))

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs b/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs
@@ -63,7 +63,7 @@ public async Task CaptureAutoInstrumentedSpans(string targetFramework)
 
 			apmServer.ReceivedData.Transactions.Should().HaveCount(2);
 
-			apmServer.ReceivedData.Spans.Should().HaveCount(AdoNetTestData.DbRunnerExpectedTotalSpans + AdoNetTestData.OracleProviderExpectedSpans);
+			apmServer.ReceivedData.Spans.Should().HaveCount(AdoNetTestData.DbRunnerExpectedTotalSpans);
 
 			var testSpans = apmServer.ReceivedData.Spans
 				.Where(s => !s.Name.StartsWith(AdoNetTestData.OracleProviderSpanNameStart))

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs b/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs
@@ -23,7 +23,7 @@ public class OracleSqlFixture : IAsyncLifetime
 		public OracleSqlFixture()
 		{
 			var builder = new TestcontainersBuilder<OracleTestcontainer>()
-				.WithDatabase(new OracleTestcontainerConfiguration());
+				.WithDatabase(new OracleTestcontainerConfiguration { Password = "oracle" });
 
 			_container = builder.Build();
 		}

diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
       <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
       <PackageReference Include="Proc" Version="0.6.2" />
-      <PackageReference Include="DotNet.Testcontainers" Version="1.6.0-beta.2020" />
+      <PackageReference Include="Testcontainers" Version="2.3.0" />
       <PackageReference Include="StrongNamer" Version="0.2.5" />
       <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />

diff --git a/test/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj b/test/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="Testcontainers" Version="2.1.0" />
+    <PackageReference Include="Testcontainers" Version="2.3.0" />
     <!-- Strong name any assemblies that aren't i.e. DotNet.Testcontainers -->
     <PackageReference Include="StrongNamer" Version="0.2.5" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/test/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj b/test/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj
@@ -17,7 +17,7 @@
     </PackageReference>
     <PackageReference Include="StackExchange.Redis" Version="2.0.495" />
     <PackageReference Include="Proc" Version="0.6.2" />
-    <PackageReference Include="DotNet.Testcontainers" Version="1.4.0" />
+    <PackageReference Include="Testcontainers" Version="2.3.0" />
     <!-- Strong name any assemblies that aren't i.e. DotNet.Testcontainers -->
     <PackageReference Include="StrongNamer" Version="0.2.5" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

diff --git a/test/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs b/test/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs
@@ -6,9 +6,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using DotNet.Testcontainers.Containers.Builders;
-using DotNet.Testcontainers.Containers.Configurations.Databases;
-using DotNet.Testcontainers.Containers.Modules.Databases;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Containers;
 using Elastic.Apm.Api;
 using Elastic.Apm.Tests.Utilities;
 using Elastic.Apm.Tests.Utilities.Docker;

diff --git a/test/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj b/test/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.1" />
-    <PackageReference Include="Testcontainers" Version="2.2.0" />
+    <PackageReference Include="Testcontainers" Version="2.3.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
   </ItemGroup>

diff --git a/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs b/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs
@@ -20,7 +20,6 @@ public class ElasticsearchTestFixture : IAsyncDisposable, IAsyncLifetime
 
 	public ElasticsearchTestFixture() =>
 		Container = new TestcontainersBuilder<ElasticsearchTestcontainer>()
-			.WithImage("docker.elastic.co/elasticsearch/elasticsearch:8.5")
 			.WithDatabase(_configuration)
 			.Build();
 

diff --git a/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs b/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs
@@ -43,8 +43,8 @@ await apmAgent.Tracer.CaptureTransaction("Test", "Foo", async () =>
 		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("db.system", "elasticsearch"));
 		payloadSender.FirstSpan.Otel.Attributes.Should()
 			.Contain(new KeyValuePair<string, string>("http.url",
-				$"https://localhost:{_esClientListenerFixture.Container.Port}/my-tweet-index/_doc/1"));
-		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", "localhost"));
+				$"{_esClientListenerFixture.Container.ConnectionString}/my-tweet-index/_doc/1"));
+		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", _esClientListenerFixture.Container.Hostname));
 	}
 
 
@@ -71,8 +71,8 @@ await apmAgent.Tracer.CaptureTransaction("Test", "Foo", async () =>
 		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("db.system", "elasticsearch"));
 		payloadSender.FirstSpan.Otel.Attributes.Should()
 			.Contain(new KeyValuePair<string, string>("http.url",
-				$"https://localhost:{_esClientListenerFixture.Container.Port}/my-tweet-index/_doc/1"));
-		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", "localhost"));
+				$"{_esClientListenerFixture.Container.ConnectionString}/my-tweet-index/_doc/1"));
+		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", _esClientListenerFixture.Container.Hostname));
 	}
 
 	[DockerFact]
@@ -98,8 +98,8 @@ await apmAgent.Tracer.CaptureTransaction("Test", "Foo", async () =>
 		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("db.system", "elasticsearch"));
 		payloadSender.FirstSpan.Otel.Attributes.Should()
 			.Contain(new KeyValuePair<string, string>("http.url",
-				$"https://localhost:{_esClientListenerFixture.Container.Port}/my-tweet-index/_search"));
-		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", "localhost"));
+				$"{_esClientListenerFixture.Container.ConnectionString}/my-tweet-index/_search"));
+		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", _esClientListenerFixture.Container.Hostname));
 	}
 
 	[DockerFact]
@@ -133,8 +133,8 @@ await apmAgent.Tracer.CaptureTransaction("Test", "Foo", async () =>
 		updateSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("db.system", "elasticsearch"));
 		updateSpan.Otel.Attributes.Should()
 			.Contain(new KeyValuePair<string, string>("http.url",
-				$"https://localhost:{_esClientListenerFixture.Container.Port}/my-tweet-index/_update/1"));
-		updateSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", "localhost"));
+				$"{_esClientListenerFixture.Container.ConnectionString}/my-tweet-index/_update/1"));
+		updateSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", _esClientListenerFixture.Container.Hostname));
 	}
 
 	[DockerFact]
@@ -161,8 +161,8 @@ await apmAgent.Tracer.CaptureTransaction("Test", "Foo", async () =>
 		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("db.system", "elasticsearch"));
 		payloadSender.FirstSpan.Otel.Attributes.Should()
 			.Contain(new KeyValuePair<string, string>("http.url",
-				$"https://localhost:{_esClientListenerFixture.Container.Port}/my-tweet-index/_doc/1"));
-		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", "localhost"));
+				$"{_esClientListenerFixture.Container.ConnectionString}/my-tweet-index/_doc/1"));
+		payloadSender.FirstSpan.Otel.Attributes.Should().Contain(new KeyValuePair<string, string>("net.peer.name", _esClientListenerFixture.Container.Hostname));
 	}
 
 	private (MockPayloadSender, ApmAgent) SetUpAgent()