From 2d3261a10dacc5317cfb6f94b869ac4e1faeace5 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Fri, 23 Feb 2024 16:31:12 +0000 Subject: [PATCH] Fix up test data --- .../AdoNet/AdoNetTestData.cs | 2 +- .../AdoNet/NpgSqlCommandTests.cs | 6 +++--- .../AspNetCore/AspNetCoreTests.cs | 2 +- .../Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs | 2 +- .../RabbitMq/RabbitMqTests.cs | 2 +- test/startuphook/Elastic.Apm.StartupHook.Sample/README.md | 7 ++----- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs index b6e5fab5f6..01379b4ac2 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs @@ -19,7 +19,7 @@ public class AdoNetTestData : IEnumerable public IEnumerator GetEnumerator() { // TODO: Add x64/x86 options. macOS and Linux do not support x86 - yield return new object[] { "net7.0" }; + yield return new object[] { "net8.0" }; yield return new object[] { "net6.0" }; } diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs index 1d0e467987..e24b9ef00d 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs @@ -36,16 +36,16 @@ public static IEnumerable TestParameters var npgSqlVersion = "5.0.7"; // TODO: Add x64/x86 options. macOS and Linux do not support x86 - yield return new object[] { "net7.0", npgSqlVersion }; + yield return new object[] { "net8.0", npgSqlVersion }; if (TestEnvironment.IsWindows) yield return new object[] { "net462", npgSqlVersion }; npgSqlVersion = "6.0.2"; - yield return new object[] { "net7.0", npgSqlVersion }; + yield return new object[] { "net8.0", npgSqlVersion }; npgSqlVersion = "7.0.2"; - yield return new object[] { "net7.0", npgSqlVersion }; + yield return new object[] { "net8.0", npgSqlVersion }; } } diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs index a827f7e84b..eb744f1554 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs @@ -25,7 +25,7 @@ public class AspNetCoreTests /// /// [Theory] - [InlineData("net7.0")] + [InlineData("net8.0")] public async void AspNetCoreTest(string framework) { var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error); diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs index 3386a27e64..8ab13bc195 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs @@ -29,7 +29,7 @@ public KafkaTests(KafkaFixture fixture, ITestOutputHelper output) } [DockerTheory] - [InlineData("net7.0")] + [InlineData("net8.0")] public async Task CaptureAutoInstrumentedSpans(string targetFramework) { var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error); diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs index 2317dcd213..7ee8a34810 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs @@ -29,7 +29,7 @@ public RabbitMqTests(RabbitMqFixture fixture, ITestOutputHelper output) } [DockerTheory] - [InlineData("net7.0")] + [InlineData("net8.0")] public async Task CaptureAutoInstrumentedSpans(string targetFramework) { var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error); diff --git a/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md b/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md index 3e7dd11e36..6d97f0c464 100644 --- a/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md +++ b/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md @@ -3,11 +3,8 @@ This sample application is a default ASP.NET (Core) application configured to run with -- `netcoreapp3.0` -- `netcoreapp3.1` -- `net5.0` - `net6.0` -- `net7.0` +- `net8.0` target frameworks that can be used to try out the [Elastic APM startup hooks implementation](../../src/ElasticApmAgentStartupHook). @@ -33,6 +30,6 @@ startup hooks implementation](../../src/ElasticApmAgentStartupHook). 4. Start the sample application with the specified target framework. From the `sample/Elastic.Apm.StartupHook.Sample` directory ``` - dotnet run -f net7.0 + dotnet run -f net8.0 ``` 5. Observe APM data collected.