Reorganize integration tests into one project (#878)

* Move integration tests to Helpers project

* Remove empty projects

* Flatten test project structure

* Move IntegrationTests.AspNet to IntegrationTests

* Update dependabot.yml

* Update AspNetTests.cs

.github/dependabot.yml

@@ -110,43 +110,7 @@ updates:
     open-pull-requests-limit: 20
 
   - package-ecosystem: nuget
-    directory: /test/integration-tests/aspnet/IntegrationTests.AspNet
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.GraphQL
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.Helpers
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.Http
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.StartupHook
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.MongoDB
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: nuget
-    directory: /test/integration-tests/IntegrationTests.SqlClient
+    directory: /test/IntegrationTests
     schedule:
       interval: "daily"
     open-pull-requests-limit: 20

OpenTelemetry.AutoInstrumentation.proj

@@ -14,16 +14,15 @@
     <TestApplicationProject Include="test\test-applications\integrations\dependency-libs\*\*.csproj" />
     <TestApplicationProjectFX Include="test\test-applications\integrations\aspnet\*\*.csproj" Condition="'$(OS)' == 'Windows_NT'" />
     <MockProject Include="test\test-applications\mocks\*\*.csproj" />
-    <IntegrationProject Include="test\integration-tests\*\*.csproj" />
-    <IntegrationProjectFX Include="test\integration-tests\aspnet\*\*.csproj" Condition="'$(OS)' == 'Windows_NT'" />
+    <IntegrationProject Include="test\IntegrationTests\IntegrationTests.csproj" />
   </ItemGroup>
 
   <Target Name="Restore">
-    <MSBuild Targets="Restore" Projects="@(CsharpProject);@(UnitTestProject);@(TestApplicationProject);@(IntegrationProject);@(MockProject)"/>
+    <MSBuild Targets="Restore" Projects="@(CsharpProject);@(UnitTestProject);@(TestApplicationProject);@(MockProject)"/>
   </Target>
 
   <Target Name="Clean">
-    <MSBuild Targets="Clean" Projects="@(CsharpProject);@(UnitTestProject);@(TestApplicationProject);@(IntegrationProject);@(MockProject)"/>
+    <MSBuild Targets="Clean" Projects="@(CsharpProject);@(UnitTestProject);@(TestApplicationProject);@(MockProject)"/>
   </Target>
 
   <!-- default target -->
@@ -59,16 +58,6 @@
     </MSBuild>
   </Target>
 
-  <Target Name="BuildCsharpFXTest">
-    <MSBuild Targets="Restore" Projects="@(TestApplicationProjectFX);@(IntegrationProjectFX)">
-      <Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>
-    </MSBuild>
-
-    <MSBuild Targets="Build" Projects="@(TestApplicationProjectFX);@(IntegrationProjectFX)">
-      <Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>
-    </MSBuild>
-  </Target>
-
   <Target Name="BuildCpp">
     <MSBuild Targets="Build" Projects="@(CppProject)" Condition="'$(Platform)' == 'x64' OR '$(Platform)' == 'All'" Properties="Platform=x64">
       <Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>

build/nuke/Build.Steps.Linux.cs

@@ -54,6 +54,7 @@ partial class Build
         .Unlisted()
         .After(CompileNativeSrcLinux)
         .After(CompileNativeTestsLinux)
+        .After(PublishManagedProfiler)
         .OnlyWhenStatic(() => IsLinux)
         .Executes(() =>
         {

build/nuke/Build.Steps.Windows.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using Extensions;
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
@@ -8,11 +7,9 @@
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.MSBuild;
 using Serilog;
-using static DotNetMSBuildTasks;
 using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.Docker.DockerTasks;
-using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
 partial class Build
@@ -85,6 +82,7 @@ partial class Build
         .Unlisted()
         .After(CompileNativeSrcWindows)
         .After(CompileNativeTestsWindows)
+        .After(PublishManagedProfiler)
         .OnlyWhenStatic(() => IsWin)
         .Executes(() =>
         {
@@ -96,27 +94,9 @@ partial class Build
             testExe("--gtest_output=xml", workingDirectory: workingDirectory);
         });
 
-    Target CompileManagedTestsWindows => _ => _
-        .Unlisted()
-        .After(CompileManagedTests)
-        .OnlyWhenStatic(() => IsWin)
-        .Triggers(PublishIisTestApplications)
-        .Executes(() =>
-        {
-            // Compile .NET Framework projects
-
-            DotNetMSBuild(x => x
-                .SetTargetPath(MsBuildProject)
-                .SetTargetPlatform(Platform)
-                .SetConfiguration(BuildConfiguration)
-                .DisableRestore()
-                .SetTargets("BuildCsharpFXTest")
-            );
-        });
-
     Target PublishIisTestApplications => _ => _
         .Unlisted()
-        .After(CompileManagedTestsWindows)
+        .After(CompileManagedTests)
         .OnlyWhenStatic(() => IsWin)
         .OnlyWhenStatic(() => Containers == ContainersWindows)
         .Executes(() =>
@@ -144,26 +124,4 @@ partial class Build
                 );
             }
         });
-
-    Target RunManagedTestsWindows => _ => _
-        .Unlisted()
-        .After(RunManagedTests)
-        .DependsOn(CompileManagedTestsWindows)
-        .DependsOn(PublishIisTestApplications)
-        .OnlyWhenStatic(() => IsWin)
-        .Executes(() =>
-        {
-            Project[] aspNetTests = Solution.GetWindowsOnlyIntegrationTests();
-
-            DotNetTest(config => config
-                .SetConfiguration(BuildConfiguration)
-                .SetTargetPlatform(Platform)
-                .SetFramework(TargetFramework.NET462)
-                .SetFilter(ContainersTestFilter())
-                .EnableNoRestore()
-                .EnableNoBuild()
-                .CombineWith(aspNetTests, (s, project) => s
-                    .EnableTrxLogOutput(GetResultsDirectory(project))
-                    .SetProjectFile(project)), degreeOfParallelism: 4);
-        });
 }

build/nuke/Build.Steps.cs

@@ -113,7 +113,6 @@ partial class Build
         .Unlisted()
         .Description("Compiles the managed code in the test directory")
         .After(CompileManagedSrc)
-        .Triggers(CompileManagedTestsWindows)
         .Executes(() =>
         {
             // Always AnyCPU
@@ -240,7 +239,6 @@ partial class Build
         .After(PublishMocks)
         .Triggers(RunManagedUnitTests)
         .Triggers(RunManagedIntegrationTests)
-        .Triggers(RunManagedTestsWindows)
         .Executes(() => { });
 
     Target PublishMocks => _ => _
@@ -302,22 +300,21 @@ partial class Build
         .Unlisted()
         .Executes(() =>
         {
-            Project[] integrationTests = Solution.GetCrossPlatformIntegrationTests();
+            var project = Solution.GetProject("IntegrationTests");
 
             IEnumerable<TargetFramework> frameworks = IsWin ? TestFrameworks : TestFrameworks.ExceptNetFramework();
 
             DotNetTest(config => config
                 .SetConfiguration(BuildConfiguration)
                 .SetTargetPlatform(Platform)
                 .SetFilter(ContainersTestFilter())
+                .EnableTrxLogOutput(GetResultsDirectory(project))
+                .SetProjectFile(project)
                 .EnableNoRestore()
                 .EnableNoBuild()
                 .CombineWith(frameworks, (s, fx) => s
                     .SetFramework(fx)
-                )
-                .CombineWith(integrationTests, (s, project) => s
-                    .EnableTrxLogOutput(GetResultsDirectory(project))
-                    .SetProjectFile(project)), degreeOfParallelism: 4);
+                ));
         });
 
     Target CopyAdditionalDeps => _ => _

build/nuke/Build.cs

@@ -99,6 +99,7 @@ void DeleteReparsePoints(string path)
         .DependsOn(CompileManagedTests)
         .DependsOn(CompileMocks)
         .DependsOn(PublishMocks)
+        .DependsOn(PublishIisTestApplications)
         .DependsOn(RunManagedTests);
 
     Target BuildExamples => _ => _

build/nuke/Projects.cs

@@ -13,8 +13,6 @@ public static class Tests
         public const string AutoInstrumentationLoaderTests = "OpenTelemetry.AutoInstrumentation.Loader.Tests";
         public const string AutoInstrumentationBootstrappingTests = "OpenTelemetry.AutoInstrumentation.Bootstrapping.Tests";
         public const string AutoInstrumentationTests = "OpenTelemetry.AutoInstrumentation.Tests";
-
-        public const string IntegrationTestsHelpers = "IntegrationTests.Helpers";
     }
 
     public static class Mocks

test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs → test/IntegrationTests/AspNetTests.cs

@@ -1,3 +1,20 @@
+// <copyright file="AspNetTests.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+#if NETFRAMEWORK
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -44,3 +61,4 @@ public async Task SubmitsTraces()
         }
     }
 }
+#endif

test/integration-tests/IntegrationTests.Http/HttpTests.cs → test/IntegrationTests/HttpTests.cs

@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETFRAMEWORK
 using System;
 using System.Linq;
 using FluentAssertions;
@@ -145,3 +146,4 @@ public void SubmitMetrics()
         }
     }
 }
+#endif

test/integration-tests/IntegrationTests.Helpers/IntegrationTests.Helpers.csproj → test/IntegrationTests/IntegrationTests.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\OpenTelemetry.AutoInstrumentation\OpenTelemetry.AutoInstrumentation.csproj" />
+    <ProjectReference Include="..\..\src\OpenTelemetry.AutoInstrumentation\OpenTelemetry.AutoInstrumentation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs → test/IntegrationTests/MongoDbTests.cs

@@ -69,9 +69,9 @@ public void SubmitsTraces()
 
                     if (Regex.IsMatch(span.Name, "employees\\.*"))
                     {
-                        Assert.Equal("mongodb", span.Tags?.GetValueOrDefault("db.system"));
-                        Assert.Equal("test-db", span.Tags?.GetValueOrDefault("db.name"));
-                        Assert.True("1.0.0.0" == span.Tags?.GetValueOrDefault("otel.library.version"), span.ToString());
+                        Assert.Equal("mongodb", span.Tags["db.system"]);
+                        Assert.Equal("test-db", span.Tags["db.name"]);
+                        Assert.True("1.0.0.0" == span.Tags["otel.library.version"], span.ToString());
 
                         if (span.Tags?.ContainsKey("db.statement") ?? false)
                         {
@@ -82,7 +82,7 @@ public void SubmitsTraces()
                     else
                     {
                         // These are manual (DiagnosticSource) traces
-                        Assert.True("1.0.0" == span.Tags?.GetValueOrDefault("otel.library.version"), span.ToString());
+                        Assert.True("1.0.0" == span.Tags["otel.library.version"], span.ToString());
                     }
                 }
 

test/integration-tests/IntegrationTests.Helpers/README.md → test/IntegrationTests/README.md

@@ -1,7 +1,4 @@
-# IntegrationTests.Helpers
-
-This project contains code that can be used other integration test
-projects to support writing integration tests.
+# Integration Tests
 
 ## OTLP protos
 

test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs → test/IntegrationTests/StartupHookTests.cs

@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -131,3 +132,4 @@ private void AssertExpectationsMet(List<WebServerSpanExpectation> expectations,
         Assert.True(!failures.Any(), finalMessage);
     }
 }
+#endif