More attempts at fixing the tests

Author: bouwkast

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/ILogger/DirectSubmission/DirectSubmissionLoggerProvider.cs

@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Threading.Tasks;
 using Datadog.Trace.DuckTyping;
 using Datadog.Trace.Logging.DirectSubmission;
 using Datadog.Trace.Logging.DirectSubmission.Formatting;
@@ -74,6 +75,18 @@ private DirectSubmissionLogger CreateLoggerImplementation(string name)
         [DuckReverseMethod]
         public void Dispose()
         {
+            // Flush the shared log sink on a best-effort basis so pending batches drain when
+            // the ILoggerFactory is disposed deterministically (host shutdown, test teardown)
+            // rather than waiting for the process-exit hook. The sink is a global singleton
+            // owned by TracerManager, so this does not dispose it.
+            try
+            {
+                _sink.FlushAsync().Wait(TimeSpan.FromSeconds(10));
+            }
+            catch
+            {
+                // Never throw from Dispose. Final flush still runs via the process-exit hook.
+            }
         }
 
         /// <summary>

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/OpenTelemetrySdkTests.cs

@@ -716,9 +716,11 @@ private static async Task ClearTestAgentSession(string testAgentHost, int maxRet
         /// <summary>
         /// Polls the test-agent for data until non-empty results are returned or timeout is reached.
         /// The sample app exports data during shutdown, so there can be a brief delay
-        /// between process exit and data appearing in the test-agent.
+        /// between process exit and data appearing in the test-agent. The timeout is generous
+        /// because first-time gRPC connections (TCP+HTTP/2+TLS handshake) plus tracer shutdown
+        /// flushing can stack up on slower CI runners.
         /// </summary>
-        private static async Task<JToken> WaitForTestAgentData(string url, int timeoutSeconds = 30, int pollIntervalMs = 500)
+        private static async Task<JToken> WaitForTestAgentData(string url, int timeoutSeconds = 60, int pollIntervalMs = 500)
         {
             using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(10) };
             var deadline = DateTime.UtcNow.AddSeconds(timeoutSeconds);

tracer/test/test-applications/integrations/Samples.OpenTelemetrySdk/Program.cs

@@ -145,6 +145,11 @@ public static async Task Main(string[] args)
         }
 
 #if OTEL_1_2
+        // Flush OTLP metric batches before Dispose. MeterProviderSdk.Dispose caps its shutdown
+        // call at 5s, but the first gRPC export (TCP+HTTP/2+TLS handshake) can exceed that and
+        // the OTel SDK's metric export timeout default is 30s. Force a flush on the critical
+        // path with the full export timeout instead of racing the 5s shutdown cap.
+        meterProvider?.ForceFlush(timeoutMilliseconds: 30_000);
         meterProvider?.Dispose();
 #endif
 #if OTEL_1_9