More progress on the tests

Author: bouwkast

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

@@ -6,7 +6,6 @@
 
 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;
@@ -75,18 +74,6 @@ 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

@@ -279,6 +279,16 @@ public async Task SubmitsOtlpTraces(string packageVersion, string datadogTracesE
 
             var applicationStartTimeUnixNano = DateTimeOffset.UtcNow.ToUnixTimeNanoseconds();
             using var agent = EnvironmentHelper.GetMockAgent();
+            // When DD_AGENT_HOST=test-agent is set above, it also redirects the APM trace agent
+            // URL via the DD_TRACE_AGENT_HOSTNAME alias (the primary key wins). That points APM
+            // traces at test-agent:<mock-agent-port>, which does not exist, so AgentWriter
+            // retries fill the tracer's shutdown window and can starve the DirectLogSubmission
+            // final flush. Pin the APM URL back to the in-process MockAgent.
+            if (useAgentHostBackup && agent is MockTracerAgent.TcpUdpAgent tcpAgent)
+            {
+                SetEnvironmentVariable("DD_TRACE_AGENT_URL", $"http://127.0.0.1:{tcpAgent.Port}");
+            }
+
             using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion ?? "1.13.1"))
             {
                 using var httpClient = new System.Net.Http.HttpClient();
@@ -539,6 +549,13 @@ public async Task SubmitsOtlpMetrics(string packageVersion, string datadogMetric
             SetEnvironmentVariable("OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE", runtimeMajor >= 9 ? "delta" : "cumulative");
 
             using var agent = EnvironmentHelper.GetMockAgent();
+            // See comment in SubmitsOtlpTraces. DD_AGENT_HOST=test-agent also redirects the APM
+            // trace agent URL; pin it back to the in-process MockAgent.
+            if (useAgentHostBackup && agent is MockTracerAgent.TcpUdpAgent tcpAgent)
+            {
+                SetEnvironmentVariable("DD_TRACE_AGENT_URL", $"http://127.0.0.1:{tcpAgent.Port}");
+            }
+
             using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion ?? "1.13.1"))
             {
                 var metricsData = await WaitForTestAgentData($"http://{testAgentHost}:4318/test/session/metrics");
@@ -626,6 +643,14 @@ public async Task SubmitsOtlpLogs(string packageVersion, string datadogLogsEnabl
             var startTimeNanoseconds = DateTimeOffset.UtcNow.ToUnixTimeNanoseconds();
 
             using var agent = EnvironmentHelper.GetMockAgent();
+            // See comment in SubmitsOtlpTraces. DD_AGENT_HOST=test-agent also redirects the APM
+            // trace agent URL; pin it back to the in-process MockAgent so AgentWriter retries
+            // don't starve the DirectLogSubmission final flush during shutdown.
+            if (useAgentHostBackup && agent is MockTracerAgent.TcpUdpAgent tcpAgent)
+            {
+                SetEnvironmentVariable("DD_TRACE_AGENT_URL", $"http://127.0.0.1:{tcpAgent.Port}");
+            }
+
             using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion ?? "1.13.1"))
             {
                 var endTimeNanoseconds = DateTimeOffset.UtcNow.ToUnixTimeNanoseconds();

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

@@ -45,7 +45,10 @@ public static async Task Main(string[] args)
             .Build();
 
 #if OTEL_1_2
-        using var meterProvider = Sdk.CreateMeterProviderBuilder()
+        // Not `using var`: we call Shutdown explicitly below, and OTel SDK <= 1.3.2 re-collects
+        // on a second Shutdown/Dispose which produces a duplicate cumulative batch the test
+        // snapshot doesn't expect. Process exit handles cleanup.
+        var meterProvider = Sdk.CreateMeterProviderBuilder()
             .AddOtlpExporterIfEnvironmentVariablePresent()
             .Build();
 #endif
@@ -149,8 +152,9 @@ public static async Task Main(string[] args)
         // when the first gRPC export has to negotiate TCP+HTTP/2+TLS. We avoid ForceFlush-then-
         // Dispose because two Collects on cumulative-temporality observable instruments re-emit
         // the same cumulative values and produce duplicate resource_metrics batches. Shutdown
-        // performs exactly one Collect; the `using var` Dispose at end-of-scope no-ops via the
-        // SDK's internal shutdown-count guard.
+        // performs exactly one Collect; `meterProvider` is deliberately not `using var` so the
+        // runtime doesn't re-invoke Dispose->Shutdown after this (older OTel SDKs like 1.3.2
+        // re-collect in that second call).
         meterProvider?.Shutdown(timeoutMilliseconds: 30_000);
 #endif
 #if OTEL_1_9