ensure we can write to console out early if e2e is not configured pro…

…perly
elastic · Feb 12, 2024 · 1b6e9db · 1b6e9db
1 parent 132b691
commit 1b6e9db
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 13 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -55,6 +55,6 @@ jobs:
       - run: ./build.sh test --test-suite=e2e
         env: 
           E2E__ENDPOINT: "${{env.ELASTIC_APM_SERVER_URL}}"
-          E2E__Authorization: "Authentication=ApiKey ${{env.ELASTIC_APM_API_KEY}}"
+          E2E__AUTHORIZATION: "Authentication=ApiKey ${{env.ELASTIC_APM_API_KEY}}"
           E2E__BROWSEREMAIL: "${{env.KIBANA_USERNAME}}"
           E2E__BROWSERPASSWORD: "${{env.KIBANA_PASSWORD}}"
diff --git a/tests/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/ApmUIBrowserContext.cs b/tests/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/ApmUIBrowserContext.cs
@@ -4,6 +4,7 @@
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Playwright;
+using Xunit;
 
 namespace Elastic.OpenTelemetry.EndToEndTests.DistributedFixture;
 

diff --git a/...s/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/DistributedApplicationFixture.cs b/...s/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/DistributedApplicationFixture.cs
@@ -50,8 +50,6 @@ public async Task InitializeAsync()
 		AspNetApplication = new AspNetCoreExampleApplication(ServiceName, configuration);
 		ApmUI = new ApmUIBrowserContext(configuration, ServiceName);
 
-		Console.WriteLine("Initializing.......?");
-
 		foreach (var trafficSimulator in _trafficSimulators)
 			await trafficSimulator.Start(this);
 

diff --git a/tests/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/ITrafficSimulator.cs b/tests/Elastic.OpenTelemetry.EndToEndTests/DistributedFixture/ITrafficSimulator.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using System.Net;
+using FluentAssertions;
 
 namespace Elastic.OpenTelemetry.EndToEndTests.DistributedFixture;
 

diff --git a/tests/Elastic.OpenTelemetry.EndToEndTests/Elastic.OpenTelemetry.EndToEndTests.csproj b/tests/Elastic.OpenTelemetry.EndToEndTests/Elastic.OpenTelemetry.EndToEndTests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Playwright" Version="1.41.1"/>
     <PackageReference Include="Nullean.Xunit.Partitions" Version="0.4.2" />
     <PackageReference Include="Proc" Version="0.8.1"/>
-    <PackageReference Include="XunitContext" Version="3.3.1"/>
+    <!--<PackageReference Include="XunitContext" Version="3.3.1"/>-->
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0"/>

diff --git a/tests/Elastic.OpenTelemetry.EndToEndTests/GlobalSetup.cs b/tests/Elastic.OpenTelemetry.EndToEndTests/GlobalSetup.cs
@@ -2,18 +2,45 @@
 // 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
 
-global using Xunit;
-global using FluentAssertions;
-using System.Runtime.CompilerServices;
+using Elastic.OpenTelemetry.EndToEndTests;
+using Elastic.OpenTelemetry.EndToEndTests.DistributedFixture;
+using FluentAssertions;
+using Microsoft.Extensions.Configuration;
 using Nullean.Xunit.Partitions;
+using Xunit;
 
 [assembly: TestFramework(Partition.TestFramework, Partition.Assembly)]
+[assembly: PartitionOptions(typeof(EndToEndOptions))]
 
 namespace Elastic.OpenTelemetry.EndToEndTests;
 
-public static class GlobalSetup
+public class EndToEndOptions : PartitionOptions
 {
-	[ModuleInitializer]
-	public static void Setup() =>
-		XunitContext.EnableExceptionCapture();
+	public EndToEndOptions() { }
+
+	public override void OnBeforeTestsRun()
+	{
+		var configuration = new ConfigurationBuilder()
+			.AddEnvironmentVariables()
+			.AddUserSecrets<DotNetRunApplication>()
+			.Build();
+		try
+		{
+			configuration["E2E:Endpoint"].Should()
+				.NotBeNullOrWhiteSpace("Missing E2E:Endpoint configuration");
+			configuration["E2E:Authorization"].Should()
+				.NotBeNullOrWhiteSpace("Missing E2E:Authorization configuration");
+			configuration["E2E:BrowserEmail"].Should()
+				.NotBeNullOrWhiteSpace("Missing E2E:BrowserEmail configuration");
+			configuration["E2E:BrowserPassword"].Should()
+				.NotBeNullOrWhiteSpace("Missing E2E:BrowserPassword configuration");
+		}
+		catch (Exception e)
+		{
+			Console.WriteLine();
+			Console.WriteLine(e.Message);
+			Console.WriteLine();
+			throw;
+		}
+	}
 }
diff --git a/tests/Elastic.OpenTelemetry.EndToEndTests/ServiceTests.cs b/tests/Elastic.OpenTelemetry.EndToEndTests/ServiceTests.cs
@@ -3,15 +3,19 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.OpenTelemetry.EndToEndTests.DistributedFixture;
+using FluentAssertions;
 using Microsoft.Playwright;
 using Nullean.Xunit.Partitions.Sdk;
+using Xunit;
+using Xunit.Abstractions;
 using static Microsoft.Playwright.Assertions;
 
 namespace Elastic.OpenTelemetry.EndToEndTests;
 
 public class EndToEndTests(ITestOutputHelper output, DistributedApplicationFixture fixture)
-	: XunitContextBase(output), IPartitionFixture<DistributedApplicationFixture>, IAsyncLifetime
+	: IPartitionFixture<DistributedApplicationFixture>, IAsyncLifetime
 {
+	public ITestOutputHelper Output { get; } = output;
 	private string _testName = string.Empty;
 	private IPage _page = null!;
 
@@ -31,5 +35,5 @@ public async Task LatencyShowsAGraph()
 
 	public async Task InitializeAsync() => _page = await fixture.ApmUI.NewProfiledPage(_testName);
 
-	public async Task DisposeAsync() => await fixture.ApmUI.StopTrace(_page, XunitContext.Context.TestException == null ? null : _testName);
+	public async Task DisposeAsync() => await fixture.ApmUI.StopTrace(_page, null == null ? null : _testName);
 }