Integration tests

Author: Kielek

test/IntegrationTests/WcfCoreServerTestHelper.cs

@@ -0,0 +1,34 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using IntegrationTests.Helpers;
+using Xunit.Abstractions;
+
+namespace IntegrationTests;
+
+internal sealed class WcfCoreServerTestHelper : WcfServerTestHelperBase
+{
+    private readonly string _packageVersion;
+
+    public WcfCoreServerTestHelper(ITestOutputHelper output, string packageVersion)
+        : base("Wcf.Core", output, "TestApplication.Wcf.Core")
+    {
+        _packageVersion = packageVersion;
+    }
+
+    internal override string ServerInstrumentationScopeName { get => "CoreWCF.Primitives"; }
+
+    internal override ProcessHelper RunWcfServer(MockSpansCollector collector)
+    {
+        var testApplicationPath = EnvironmentHelper.GetTestApplicationPath(_packageVersion, startupMode: TestAppStartupMode.Exe);
+
+        if (!File.Exists(testApplicationPath))
+        {
+            throw new Exception($"Unable to find executing assembly at {testApplicationPath}");
+        }
+
+        SetExporter(collector);
+        var process = InstrumentedProcessHelper.Start(testApplicationPath, null, EnvironmentHelper);
+        return new ProcessHelper(process);
+    }
+}

test/IntegrationTests/WcfDotNetTests.cs

@@ -14,13 +14,30 @@ public WcfDotNetTests(ITestOutputHelper output)
     {
     }
 
+    public static TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase>> GetData()
+    {
+        var theoryData = new TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase>>();
+
+        foreach (var version in LibraryVersion.WCFCoreClient)
+        {
+            theoryData.Add(version, output => new WcfServerTestHelper(output));
+
+            foreach (var wcfCoreServerVersion in LibraryVersion.WCFCoreServer)
+            {
+                theoryData.Add(version, output => new WcfCoreServerTestHelper(output, wcfCoreServerVersion));
+            }
+        }
+
+        return theoryData;
+    }
+
     [Trait("Category", "EndToEnd")]
     [Theory]
-    [MemberData(nameof(LibraryVersion.WCFCoreClient), MemberType = typeof(LibraryVersion))]
-    public async Task SubmitTraces(string clientPackageVersion)
+    [MemberData(nameof(GetData))]
+    public async Task SubmitTraces(string clientPackageVersion, Func<ITestOutputHelper, WcfServerTestHelperBase> wcfServerTestHelperFactory)
     {
         EnableBytecodeInstrumentation();
-        await SubmitsTracesInternal(clientPackageVersion);
+        await SubmitsTracesInternal(clientPackageVersion, wcfServerTestHelperFactory(Output));
     }
 }
 

test/IntegrationTests/WcfNetFrameworkTests.cs

@@ -19,7 +19,7 @@ public WcfNetFrameworkTests(ITestOutputHelper output)
     [Trait("Category", "EndToEnd")]
     public async Task SubmitsTraces()
     {
-        await SubmitsTracesInternal(string.Empty);
+        await SubmitsTracesInternal(string.Empty, new WcfServerTestHelper(Output));
     }
 
     [Fact]

test/IntegrationTests/WcfServerTestHelper.cs

@@ -6,17 +6,16 @@
 
 namespace IntegrationTests;
 
-internal class WcfServerTestHelper : TestHelper
+internal sealed class WcfServerTestHelper : WcfServerTestHelperBase
 {
-    private const string ServiceName = "TestApplication.Wcf.Server.NetFramework";
-
     public WcfServerTestHelper(ITestOutputHelper output)
-        : base("Wcf.Server.NetFramework", output)
+        : base("Wcf.Server.NetFramework", output, "TestApplication.Wcf.Server.NetFramework")
     {
-        SetEnvironmentVariable("OTEL_SERVICE_NAME", ServiceName);
     }
 
-    public ProcessHelper RunWcfServer(MockSpansCollector collector)
+    internal override string ServerInstrumentationScopeName { get => "OpenTelemetry.Instrumentation.Wcf"; }
+
+    internal override ProcessHelper RunWcfServer(MockSpansCollector collector)
     {
         var baseBinDirectory = EnvironmentHelper.GetTestApplicationBaseBinDirectory();
         var exeFileName = $"{EnvironmentHelper.FullTestApplicationName}.exe";

test/IntegrationTests/WcfServerTestHelperBase.cs

@@ -0,0 +1,20 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using IntegrationTests.Helpers;
+using Xunit.Abstractions;
+
+namespace IntegrationTests;
+
+public abstract class WcfServerTestHelperBase : TestHelper
+{
+    protected WcfServerTestHelperBase(string testApplicationName, ITestOutputHelper output, string serviceName)
+        : base(testApplicationName, output)
+    {
+        SetEnvironmentVariable("OTEL_SERVICE_NAME", serviceName);
+    }
+
+    internal abstract string ServerInstrumentationScopeName { get; }
+
+    internal abstract ProcessHelper RunWcfServer(MockSpansCollector collector);
+}

test/IntegrationTests/WcfTestsBase.cs

@@ -40,25 +40,25 @@ public void Dispose()
         Output.WriteResult(_serverProcess);
     }
 
-    protected async Task SubmitsTracesInternal(string clientPackageVersion)
+    protected async Task SubmitsTracesInternal(string clientPackageVersion, WcfServerTestHelperBase wcfServerTestHelperBase)
     {
         Assert.True(EnvironmentTools.IsWindowsAdministrator(), "This test requires Windows Administrator privileges.");
 
         var collector = new MockSpansCollector(Output);
         SetExporter(collector);
 
-        var serverHelper = new WcfServerTestHelper(Output);
-        _serverProcess = serverHelper.RunWcfServer(collector);
+        _serverProcess = wcfServerTestHelperBase.RunWcfServer(collector);
+
         await WaitForServer();
 
         RunTestApplication(new TestSettings
         {
             PackageVersion = clientPackageVersion
         });
 
-        collector.Expect("OpenTelemetry.Instrumentation.Wcf", span => span.Kind == SpanKind.Server, "Server 1");
+        collector.Expect(wcfServerTestHelperBase.ServerInstrumentationScopeName, span => span.Kind == SpanKind.Server, "Server 1");
         collector.Expect("OpenTelemetry.Instrumentation.Wcf", span => span.Kind == SpanKind.Client, "Client 1");
-        collector.Expect("OpenTelemetry.Instrumentation.Wcf", span => span.Kind == SpanKind.Server, "Server 2");
+        collector.Expect(wcfServerTestHelperBase.ServerInstrumentationScopeName, span => span.Kind == SpanKind.Server, "Server 2");
         collector.Expect("OpenTelemetry.Instrumentation.Wcf", span => span.Kind == SpanKind.Client, "Client 2");
 
         collector.Expect($"TestApplication.{_testAppName}", span => span.Kind == SpanKind.Internal, "Custom parent");