Fix include scopes, service disposal, remove flush from irrelevant ex…

…amples

docs/logs/complex-objects/Program.cs

@@ -21,9 +21,6 @@
 
 logger.FoodRecallNotice(foodRecallNotice);
 
-// This will flush the remaining logs.
-sdk.LoggerProvider.ForceFlush();
-
 // Dispose SDK before the application ends.
 sdk.Dispose();
 

docs/logs/correlation/Program.cs

@@ -29,12 +29,6 @@ public static void Main()
             logger.FoodPriceChanged("artichoke", 9.99);
         }
 
-        // This will flush the remaining logs.
-        sdk.LoggerProvider.ForceFlush();
-
-        // This will flush the remaining traces.
-        sdk.TracerProvider.ForceFlush();
-
         // Dispose SDK before the application ends.
         sdk.Dispose();
     }

docs/logs/customizing-the-sdk/Program.cs

@@ -7,14 +7,15 @@
 using OpenTelemetry.Resources;
 
 var sdk = OpenTelemetrySdk.Create(builder => builder
-    .WithLogging(logging =>
-    {
-        // logging.IncludeScopes = true;
-        logging.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(
-            serviceName: "MyService",
-            serviceVersion: "1.0.0"));
-        logging.AddConsoleExporter();
-    }));
+    .WithLogging(
+        logging =>
+        {
+            logging.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(
+                serviceName: "MyService",
+                serviceVersion: "1.0.0"));
+            logging.AddConsoleExporter();
+        },
+        options => options.IncludeScopes = true));
 
 var logger = sdk.GetLoggerFactory().CreateLogger<Program>();
 
@@ -35,9 +36,6 @@
     recallReasonDescription: "due to a possible health risk from Listeria monocytogenes",
     companyName: "Contoso Fresh Vegetables, Inc.");
 
-// This will flush the remaining logs.
-sdk.LoggerProvider.ForceFlush();
-
 // Dispose SDK before the application ends.
 sdk.Dispose();
 

docs/logs/extending-the-sdk/Program.cs

@@ -12,14 +12,15 @@ public class Program
     public static void Main()
     {
         var sdk = OpenTelemetrySdk.Create(builder => builder
-            .WithLogging(logging =>
-            {
-                // logging.IncludeScopes = true;
-                logging.AddProcessor(new MyProcessor("ProcessorA"));
-                logging.AddProcessor(new MyProcessor("ProcessorB"));
-                logging.AddProcessor(new SimpleLogRecordExportProcessor(new MyExporter("ExporterX")));
-                logging.AddMyExporter();
-            }));
+            .WithLogging(
+                logging =>
+                {
+                    logging.AddProcessor(new MyProcessor("ProcessorA"));
+                    logging.AddProcessor(new MyProcessor("ProcessorB"));
+                    logging.AddProcessor(new SimpleLogRecordExportProcessor(new MyExporter("ExporterX")));
+                    logging.AddMyExporter();
+                },
+                options => options.IncludeScopes = true));
 
         var logger = sdk.GetLoggerFactory().CreateLogger<Program>();
 
@@ -55,8 +56,9 @@ public static void Main()
         // message will be redacted by MyRedactionProcessor
         logger.LogInformation("OpenTelemetry {sensitiveString}.", "<secret>");
 
-        // This will flush the remaining logs.
-        sdk.LoggerProvider.ForceFlush();
+        // Attempt to flush the remaining logs when using an exporter that may require it, such as the custom one defined here.
+        // Ignoring success or failure for flush after 5 seconds, but a richer application should choose to handle this in some manner.
+        sdk.LoggerProvider.ForceFlush(5000);
 
         // Dispose SDK before the application ends.
         sdk.Dispose();

docs/logs/getting-started-console-di/Program.cs

@@ -3,25 +3,21 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using OpenTelemetry;
 using OpenTelemetry.Logs;
 
 // Add services to the container, including OpenTelemetry with logging
 var services = new ServiceCollection();
 services.AddOpenTelemetry().WithLogging(logging => logging.AddConsoleExporter());
 services.AddSingleton<ExampleService>();
-IServiceProvider serviceProvider = services.BuildServiceProvider();
+ServiceProvider serviceProvider = services.BuildServiceProvider();
 
 // Get the ExampleService object from the container
 ExampleService service = serviceProvider.GetRequiredService<ExampleService>();
 
 service.DoSomeWork();
 
-// This will flush the remaining logs.
-serviceProvider.GetRequiredService<LoggerProvider>().ForceFlush();
-
-// Dispose SDK before the application ends.
-serviceProvider.GetRequiredService<OpenTelemetrySdk>().Dispose();
+// Dispose before the application ends.
+serviceProvider.Dispose();
 
 internal static partial class LoggerExtensions
 {

docs/logs/getting-started-console/Program.cs

@@ -19,9 +19,6 @@
     recallReasonDescription: "due to a possible health risk from Listeria monocytogenes",
     companyName: "Contoso Fresh Vegetables, Inc.");
 
-// This will flush the remaining logs.
-sdk.LoggerProvider.ForceFlush();
-
 // Dispose SDK before the application ends.
 sdk.Dispose();
 

docs/logs/redaction/Program.cs

@@ -13,9 +13,6 @@
 // Message will be redacted by MyRedactionProcessor
 logger.FoodPriceChanged("<secret>", 9.99);
 
-// This will flush the remaining logs.
-sdk.LoggerProvider.ForceFlush();
-
 // Dispose SDK before the application ends.
 sdk.Dispose();