Refactor Telemetry code structure and cleanup unused class.

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionInfoContributor.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Authorization.Permissions;
 

framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs

@@ -6,8 +6,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Telemetry;
-using Volo.Abp.Telemetry.Activity;
 using Volo.Abp.Telemetry.Helpers;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp;
 

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/IActivityStorage.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/IActivityStorage.cs

@@ -1,18 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
-using Volo.Abp.Telemetry.Shared;
-using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Contracts;
 
 public interface IActivityStorage
 {

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataProvider.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/ActivityDataProvider.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Providers;
 
 public class ActivityDataProvider : IActivityDataProvider, IScopedDependency
 {
@@ -53,6 +55,7 @@ public class ActivityDataProvider : IActivityDataProvider, IScopedDependency
         if (activity.ContainsKey(ActivityPropertyName.Assembly) && sessionType == SessionType.ApplicationRuntime)
         {
             await AddApplicationInformationAsync(activity);
+            activity.Remove(ActivityPropertyName.Assembly);
         }
 
         if (await ShouldAddSolutionInformation(activity))

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/SolutionInfoProvider.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/SolutionInfoProvider.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Shared;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Providers;
 
 public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
 {
@@ -22,7 +22,8 @@ public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
             using var doc = JsonDocument.Parse(jsonContent);
             var root = doc.RootElement;
 
-            AddCreatingStudioConfiguration(result, root.GetProperty("creatingStudioConfiguration"));
+            AddSolutionInformation(result, root.GetProperty("creatingStudioConfiguration"));
+            
             result[ActivityPropertyName.LicenseType] = await GetLicenseTypeAsync();
 
             if (root.TryGetProperty("modules", out var modulesElement) && modulesElement.ValueKind == JsonValueKind.Object)
@@ -51,7 +52,7 @@ public class SolutionInfoProvider : ISolutionInfoProvider, ISingletonDependency
         return root.TryGetProperty(propertyName, out var prop) && Guid.TryParse(prop.GetString(), out var id) ? id : null;
     }
 
-    private void AddCreatingStudioConfiguration(Dictionary<string, object> dict, JsonElement config)
+    private void AddSolutionInformation(Dictionary<string, object> dict, JsonElement config)
     {
         var map = new (string Key, Action<JsonElement> Apply)[]
         {

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorage.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorage.cs

@@ -4,12 +4,12 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.Shared;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Storage;
 
 public class ActivityStorage : IActivityStorage, ISingletonDependency
 {

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityStorageState.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/ActivityStorageState.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Activity.Storage;
 
 public class ActivityStorageState
 {

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

@@ -1,11 +0,0 @@
-namespace Volo.Abp.Telemetry;
-
-public class ApplicationInfo
-{
-    public int EntityCount { get; set; }
-    public int AppServiceCount { get; set; }
-    public int ControllerCount { get; set; }
-    public int PermissionCount { get; set; }
-    public int AbpModuleCount { get; set; }
-    public int ProjectCount { get; set; } 
-}

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareDetector.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Core/SoftwareDetector.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Core;
 
 [ExposeServices(typeof(ISoftwareDetector))]
 public abstract class SoftwareDetector: ISoftwareDetector , ISingletonDependency

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/AbpStudioDetector.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/ChromeDetector.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/DotnetSdkDetector.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/FireFoxDetector.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/MsEdgeDetector.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/NodeJsDetector.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/OperatingSystemDetector.cs

@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/RiderDetector.cs

@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioCodeDetector.cs

@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Detectors/VisualStudioDetector.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
+using Volo.Abp.Telemetry.EnvironmentInspection.Core;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry.EnvironmentInspection.Detectors;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/DeviceInfoProvider.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/DeviceInfoProvider.cs

@@ -5,13 +5,12 @@ using System.IO;
 using System.Linq;
 using System.Management;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Providers;
 
 public class DeviceInfoProvider : IDeviceInfoProvider, ISingletonDependency
 {

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/SoftwareInfoProvider.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/EnvironmentInspection/Providers/SoftwareInfoProvider.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.EnvironmentInspection.Contracts;
 
-namespace Volo.Abp.Telemetry.EnvironmentInspection;
+namespace Volo.Abp.Telemetry.EnvironmentInspection.Providers;
 
 internal class SoftwareInfoProvider : ISoftwareInfoProvider , ISingletonDependency
 {

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

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 using Volo.Abp.Telemetry.Shared.Enums;
 
 namespace Volo.Abp.Telemetry;

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ActivityNameConsts.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityNameConsts.cs

@@ -1,4 +1,4 @@
-namespace Volo.Abp.Telemetry;
+namespace Volo.Abp.Telemetry.Shared;
 
 public static class ActivityNameConsts
 {

framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityPropertyName.cs → framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Shared/ActivityPropertyName.cs

@@ -1,4 +1,4 @@
-namespace Volo.Abp.Telemetry.Activity;
+namespace Volo.Abp.Telemetry.Shared;
 
 public static class ActivityPropertyName
 {

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

@@ -8,6 +8,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Activity.Contracts;
 using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Telemetry;

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

@@ -4,6 +4,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Activity.Contracts;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Telemetry;
 

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/DomainInfoContributor.cs

@@ -5,6 +5,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Telemetry;
 using Volo.Abp.Telemetry.Activity;
+using Volo.Abp.Telemetry.Shared;
 
 namespace Volo.Abp.Domain.Telemetry;