Merge remote-tracking branch 'origin/main' into fix/masstransit-multi-transport-queue-parsing

Author: tippmar-nr

tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/PerformanceMetrics.cs

@@ -19,6 +19,15 @@ public static void Test(int countMaxWorkerThreads, int countMaxCompletionThreads
 
         ThreadPool.SetMaxThreads(countMaxWorkerThreads, countMaxCompletionThreads);
 
+        // Induce Gen0-only collections BEFORE the agent starts. GCSamplerV2 reads
+        // cumulative GC.CollectionCount() values, so these pre-agent collections
+        // guarantee that CollectionCount(0) > CollectionCount(1) by the time the
+        // first sample runs — regardless of when the sampler fires relative to
+        // StartAgent(). V1 (EventListener-based) is unaffected since it only
+        // captures events after the listener registers inside StartAgent().
+        GC.Collect(0);
+        GC.Collect(0);
+
         StartAgent();
     }
 

tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs

@@ -57,7 +57,7 @@ protected CosmosDBTestsBase(TFixture fixture, ITestOutputHelper output) : base(f
             exerciseApplication: () =>
             {
                 _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex, TimeSpan.FromMinutes(1));
-                _fixture.AgentLog.WaitForLogLine(AgentLogBase.MetricDataLogLineRegex, TimeSpan.FromMinutes(1));
+                _fixture.AgentLog.WaitForLogLines(AgentLogBase.MetricDataLogLineRegex, TimeSpan.FromMinutes(2), 2);
                 _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex, TimeSpan.FromMinutes(1));
             }
         );