Merge pull request #24387 from abpframework/auto-merge/rel-10-0/4194

Merge branch dev with rel-10.0

framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/TelemetryService.cs

@@ -67,7 +67,7 @@ public class TelemetryService : ITelemetryService, IScopedDependency
 
     private Task AddActivityAsync(ActivityContext context)
     {
-        _ = Task.Run(async () =>
+        var telemetryTask = Task.Run(async () =>
         {
             using var scope = _serviceScopeFactory.CreateScope();
 
@@ -81,6 +81,30 @@ public class TelemetryService : ITelemetryService, IScopedDependency
                 telemetryActivitySender);
         });
 
+        AppDomain.CurrentDomain.ProcessExit += (_, _) =>
+        {
+            try
+            {
+                telemetryTask.Wait(TimeSpan.FromSeconds(10));
+            }
+            catch
+            {
+                // ignored
+            }
+        };
+        
+        Console.CancelKeyPress += (_, _) =>
+        {
+            try
+            {
+                telemetryTask.Wait(TimeSpan.FromSeconds(10));
+            }
+            catch
+            {
+                // ignored
+            }
+        };
+
         return Task.CompletedTask;
     }