Attempt to give more time for flushing logs

Author: bouwkast

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

@@ -5,6 +5,7 @@
 using OpenTelemetry.Metrics;
 #endif
 #if OTEL_1_9
+using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Logs;
 #endif
 using Microsoft.Extensions.Logging;
@@ -61,33 +62,30 @@ public static MeterProviderBuilder AddOtlpExporterIfEnvironmentVariablePresent(t
 #if OTEL_1_9
 public static class CustomLoggerFactoryBuilderExtensions
 {
-    public static ILoggerFactory AddOtlpExporterIfEnvironmentVariablePresent()
+    // Returns an IServiceProvider rather than an ILoggerFactory so callers can resolve
+    // the underlying OpenTelemetry.Logs.LoggerProvider and call ForceFlush before disposal.
+    // LoggerProviderSdk.Dispose() caps its shutdown flush at 5s; with gRPC, the first export
+    // can exceed that due to TCP/HTTP/2/TLS handshake, causing batched logs to be dropped.
+    public static ServiceProvider CreateLoggerServices()
     {
-        // Check if OpenTelemetry Logs Exporter is enabled (similar to metrics)
-        if (Environment.GetEnvironmentVariable("OTEL_LOGS_EXPORTER_ENABLED") is string value
-        && value == "true")
+        var services = new ServiceCollection();
+        services.AddLogging(builder =>
         {
-            return LoggerFactory.Create(builder =>
+            builder.SetMinimumLevel(LogLevel.Trace);
+
+            if (Environment.GetEnvironmentVariable("OTEL_LOGS_EXPORTER_ENABLED") is string value
+                && value == "true")
             {
-                builder.SetMinimumLevel(LogLevel.Trace);
 #if NET6_0_OR_GREATER
-                builder.AddOpenTelemetry(
-                    options =>
-                    {
-                        options.AddOtlpExporter();
-                    }
-                );
+                builder.AddOpenTelemetry(options =>
+                {
+                    options.AddOtlpExporter();
+                });
 #endif
-            });
-        }
-        else
-        {
-            // Create logger factory without OTel - Datadog instrumentation will hook this
-            return LoggerFactory.Create(builder =>
-            {
-                builder.SetMinimumLevel(LogLevel.Trace);
-            });
-        }
+            }
+        });
+
+        return services.BuildServiceProvider();
     }
 }
 #endif

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

@@ -7,6 +7,7 @@
 using OpenTelemetry.Metrics;
 #endif
 #if OTEL_1_9
+using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Logs;
 #endif
 using System.Collections.Generic;
@@ -50,8 +51,8 @@ public static async Task Main(string[] args)
 #endif
 
 #if OTEL_1_9
-        using var loggerFactory = CustomLoggerFactoryBuilderExtensions
-            .AddOtlpExporterIfEnvironmentVariablePresent();
+        using var loggerServices = CustomLoggerFactoryBuilderExtensions.CreateLoggerServices();
+        var loggerFactory = loggerServices.GetRequiredService<ILoggerFactory>();
 #endif
 
         _tracer = tracerProvider.GetTracer(serviceName); // The version is omitted so the ActivitySource.Version / otel.library.version is not set
@@ -147,8 +148,11 @@ public static async Task Main(string[] args)
         meterProvider?.Dispose();
 #endif
 #if OTEL_1_9
-
-        loggerFactory?.Dispose();
+        // Flush OTLP log batches before the ServiceProvider's `using` disposes them.
+        // LoggerProviderSdk.Dispose caps shutdown flush at 5s, which is often insufficient
+        // for the first gRPC export (TCP+HTTP/2+TLS handshake). A generous ForceFlush here
+        // drains pending batches on the critical path instead of racing a hard-coded timeout.
+        loggerServices.GetService<LoggerProvider>()?.ForceFlush(timeoutMilliseconds: 10_000);
 #endif
     }