Merge remote-tracking branch 'origin/feature/data-collection' into feature/data-collection

# Conflicts:
#	framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs
#	framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs
#	framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity.Contracts;
+using Volo.Abp.Telemetry.Constants;
+using Volo.Abp.Telemetry.Constants.Enums;
 
 namespace Volo.Abp.Telemetry.Activity.Providers;
 
@@ -21,7 +24,7 @@ public class TelemetryActivityDataBuilder : ITelemetryActivityDataBuilder, ISing
        
         var sessionProvider = _serviceProvider.GetRequiredService<ITelemetrySessionProvider>();
         
-        await sessionProvider.AddSessionInfoAsync(activity);
+        sessionProvider.AddSessionInfo(activity);
         
         var activityDataEnrichers = _serviceProvider.GetRequiredService<IEnumerable<ITelemetryActivityDataEnricher>>();
 

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs

@@ -1,9 +1,8 @@
-using System.Threading.Tasks;
-using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Activity;
 
 namespace Volo.Abp.Telemetry;
 
 public interface ITelemetrySessionProvider
 {
-    Task AddSessionInfoAsync(ActivityData activity);
+    void AddSessionInfo(ActivityData activity);
 }

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity;
 using Volo.Abp.Telemetry.Constants;
@@ -11,13 +10,11 @@ namespace Volo.Abp.Telemetry;
 [ExposeServices(typeof(ITelemetrySessionProvider))]
 public class TelemetryRuntimeSessionProvider : ITelemetrySessionProvider, ISingletonDependency
 {
-    public Task AddSessionInfoAsync(ActivityData activity)
+    public void AddSessionInfo(ActivityData activity)
     {
         activity[ActivityPropertyNames.SessionType] = SessionType.ApplicationRuntime;
         activity[ActivityPropertyNames.SessionId] = Guid.NewGuid();
         activity[ActivityPropertyNames.IsFirstSession] = !File.Exists(TelemetryPaths.ActivityStorage);
-    
-        return Task.CompletedTask;
     }