Revert "Extract common parts from test"

This reverts commit 14f2911.

Author: andrewlock

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AWS/AwsLambdaTests.cs

@@ -9,7 +9,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Datadog.Trace.Configuration;
 using Datadog.Trace.ExtensionMethods;
 using Datadog.Trace.TestHelpers;
 using FluentAssertions;
@@ -24,16 +23,6 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests.AWS
     [Trait("RequiresDockerDependency", "true")]
     public class AwsLambdaTests : TestHelper
     {
-        private const int ExpectedRequests =
-            9 // param tests
-          + 3 // param with context
-          + 5 // base instrumentation
-          + 6 // other parameter types
-          + 3 // throwing (manual only)
-          + 3 // throwing with context
-          + 8 // Generic types
-          + 1; // Toplevel Statement
-
         private static readonly Regex StackRegex = new(@"(      error.stack:)(?:\n|\r){1,2}(?:[^,]*(?:\n|\r){1,2})+.*(,(?:\r|\n){1,2})");
         private static readonly Regex ErrorMsgRegex = new(@"(      error.msg:).*(,(\r|\n){1,2})");
 
@@ -60,17 +49,39 @@ public async Task SubmitsTraces()
             agent.Output = Output;
             using (await RunSampleAndWaitForExit(agent))
             {
-                // we manually instrument each request too
-                var expectedSpans = ExpectedRequests * 2;
+                var requests = 9 // param tests
+                                  + 3 // param with context
+                                  + 5 // base instrumentation
+                                  + 6 // other parameter types
+                                  + 3 // throwing (manual only)
+                                  + 3 // throwing with context
+                                  + 8 // Generic types
+                                  + 1; // Toplevel Statement
+
+                var expectedSpans = requests * 2; // we manually instrument each request too
 
                 var spans = agent.WaitForSpans(expectedSpans, 15_000).ToArray();
 
                 // Verify all the "with context" end invocations have a corresponding start context
                 using var s = new AssertionScope();
-                var allExtensionSpans = GetExtensionSpans(extensionWithContext, extensionNoContext);
+                var startWithContext = extensionWithContext.StartInvocations.ToList();
+                var endWithContext = extensionWithContext.EndInvocations.ToList();
+                startWithContext.Should().OnlyContain(x => x.TraceId.HasValue);
+                endWithContext.Should().OnlyContain(x => x.TraceId.HasValue);
+                var contextPairs = extensionWithContext.EndInvocations
+                                                       .Select(x => (start: startWithContext.SingleOrDefault(y => y.TraceId == x.TraceId), end: x))
+                                                       .ToList();
+                contextPairs.Should().OnlyContain(x => x.start != null);
+                var withContextSpans = contextPairs.Select(x => ToMockSpan(x.end, x.start.Created));
+
+                // We can't match no-context start invocations with the end invocations, so just use the end ones
+                var noContextSpans = extensionNoContext.EndInvocations.Select(x => ToMockSpan(x, startTime: null));
 
                 // Create the complete traces
-                var allSpans = allExtensionSpans.Concat(spans).ToList();
+                var allSpans = withContextSpans
+                              .Concat(noContextSpans)
+                              .Concat(spans)
+                              .ToList();
 
                 var settings = VerifyHelper.GetSpanVerifierSettings();
 
@@ -83,25 +94,6 @@ await VerifyHelper.VerifySpans(allSpans, settings)
             }
         }
 
-        private static IEnumerable<MockSpan> GetExtensionSpans(MockLambdaExtension extensionWithContext, MockLambdaExtension extensionNoContext)
-        {
-            var startWithContext = extensionWithContext.StartInvocations.ToList();
-            var endWithContext = extensionWithContext.EndInvocations.ToList();
-            startWithContext.Should().OnlyContain(x => x.TraceId.HasValue);
-            endWithContext.Should().OnlyContain(x => x.TraceId.HasValue);
-            var contextPairs = extensionWithContext.EndInvocations
-                                                   .Select(x => (start: startWithContext.SingleOrDefault(y => y.TraceId == x.TraceId), end: x))
-                                                   .ToList();
-            contextPairs.Should().OnlyContain(x => x.start != null);
-            var withContextSpans = contextPairs.Select(x => ToMockSpan(x.end, x.start.Created));
-
-            // We can't match no-context start invocations with the end invocations, so just use the end ones
-            var noContextSpans = extensionNoContext.EndInvocations.Select(x => ToMockSpan(x, startTime: null));
-
-            var allExtensionSpans = withContextSpans.Concat(noContextSpans);
-            return allExtensionSpans;
-        }
-
         private static MockSpan ToMockSpan(MockLambdaExtension.EndExtensionRequest endInvocation, DateTimeOffset? startTime)
         {
             var start = startTime ?? endInvocation.Created.AddMilliseconds(100);