diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TelemetryApplicationMetricsContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TelemetryApplicationMetricsContributor.cs index deda2040b3..234f746316 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TelemetryApplicationMetricsContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TelemetryApplicationMetricsContributor.cs @@ -12,9 +12,9 @@ namespace Volo.Abp.AspNetCore.Mvc; [ExposeServices(typeof(ITelemetryApplicationInfoContributor))] public class TelemetryApplicationMetricsContributor : ITelemetryApplicationInfoContributor, ISingletonDependency { - public Task ContributeAsync(ActivityData activityData) + public Task ContributeAsync(ActivityEvent activityEvent) { - if (activityData.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) + if (activityEvent.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) { var assembly = Assembly.LoadFrom((string)assemblyPath); var types = assembly.GetTypes(); @@ -27,8 +27,8 @@ public class TelemetryApplicationMetricsContributor : ITelemetryApplicationInfoC typeof(AbpController).IsAssignableFrom(t) && !t.IsAbstract); - activityData[ActivityPropertyNames.AppServiceCount] = appServiceCount; - activityData[ActivityPropertyNames.ControllerCount] = controllerCount; + activityEvent[ActivityPropertyNames.AppServiceCount] = appServiceCount; + activityEvent[ActivityPropertyNames.ControllerCount] = controllerCount; } return Task.CompletedTask; } diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/TelemetryPermissionInfoContributor.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/TelemetryPermissionInfoContributor.cs index 62e62131ff..c86ebadbb4 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/TelemetryPermissionInfoContributor.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/TelemetryPermissionInfoContributor.cs @@ -16,9 +16,9 @@ public class TelemetryPermissionInfoContributor : ITelemetryApplicationInfoContr _permissionDefinitionManager = permissionDefinitionManager; } - public async Task ContributeAsync(ActivityData activityData) + public async Task ContributeAsync(ActivityEvent activityEvent) { var permissions = await _permissionDefinitionManager.GetPermissionsAsync(); - activityData[ActivityPropertyNames.PermissionCount] = permissions.Count; + activityEvent[ActivityPropertyNames.PermissionCount] = permissions.Count; } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataExtensions.cs index 8df756566e..dedf9de386 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataExtensions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityDataExtensions.cs @@ -4,46 +4,46 @@ namespace Volo.Abp.Telemetry.Activity; public static class ActivityDataExtensions { - public static ActivityData WithAdditionalProperty(this ActivityData activityData, string key, object value) + public static ActivityEvent WithAdditionalProperty(this ActivityEvent activityEvent, string key, object value) { - activityData.AdditionalProperties ??= new Dictionary(); - activityData.AdditionalProperties[key] = value; - return activityData; + activityEvent.AdditionalProperties ??= new Dictionary(); + activityEvent.AdditionalProperties[key] = value; + return activityEvent; } - public static ActivityData WithAdditionalProperties(this ActivityData activityData, Dictionary properties) + public static ActivityEvent WithAdditionalProperties(this ActivityEvent activityEvent, Dictionary properties) { - activityData.AdditionalProperties ??= new Dictionary(); + activityEvent.AdditionalProperties ??= new Dictionary(); foreach (var property in properties) { - activityData.AdditionalProperties[property.Key] = property.Value; + activityEvent.AdditionalProperties[property.Key] = property.Value; } - return activityData; + return activityEvent; } - public static ActivityData WithAdditionalProperties(this ActivityData activityData, params (string key, object value)[] properties) + public static ActivityEvent WithAdditionalProperties(this ActivityEvent activityEvent, params (string key, object value)[] properties) { - activityData.AdditionalProperties ??= new Dictionary(); + activityEvent.AdditionalProperties ??= new Dictionary(); foreach (var (key, value) in properties) { - activityData.AdditionalProperties[key] = value; + activityEvent.AdditionalProperties[key] = value; } - return activityData; + return activityEvent; } - public static ActivityData WithAdditionalProperties(this ActivityData activityData, object properties) + public static ActivityEvent WithAdditionalProperties(this ActivityEvent activityEvent, object properties) { - activityData.AdditionalProperties ??= new Dictionary(); + activityEvent.AdditionalProperties ??= new Dictionary(); foreach (var property in properties.GetType().GetProperties()) { var value = property.GetValue(properties); if (value != null) { - activityData.AdditionalProperties[property.Name] = value; + activityEvent.AdditionalProperties[property.Name] = value; } } - return activityData; + return activityEvent; } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityData.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityEvent.cs similarity index 91% rename from framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityData.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityEvent.cs index 643809161f..a74fceae0b 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityData.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/ActivityEvent.cs @@ -3,9 +3,13 @@ using System.Collections.Generic; namespace Volo.Abp.Telemetry.Activity; -public class ActivityData : Dictionary +public class ActivityEvent : Dictionary { - public ActivityData(string activityName, string? details = null) + private ActivityEvent() + { + } + + public ActivityEvent(string activityName, string? details = null) { if (activityName.IsNullOrWhiteSpace()) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataBuilder.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataBuilder.cs index 84117ab971..b58e920c61 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataBuilder.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataBuilder.cs @@ -4,5 +4,5 @@ namespace Volo.Abp.Telemetry.Activity.Contracts; public interface ITelemetryActivityDataBuilder { - Task BuildAsync(ActivityData activity); + Task BuildAsync(ActivityEvent activity); } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataEnricher.cs index bf2a3c54d2..c59bae7673 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityDataEnricher.cs @@ -4,5 +4,5 @@ namespace Volo.Abp.Telemetry.Activity.Contracts; public interface ITelemetryActivityDataEnricher { - Task EnrichAsync(ActivityData activity); + Task EnrichAsync(ActivityEvent activity); } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityStorage.cs index fb96f63d23..8dc97dc0ac 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityStorage.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Contracts/ITelemetryActivityStorage.cs @@ -11,8 +11,8 @@ public interface ITelemetryActivityStorage Task MarkDeviceInfoAsAddedAsync(); Task MarkSolutionInfoAsAddedAsync(Guid solutionId); Task MarkApplicationInfoAsAddedAsync(Guid applicationInfo); - Task BufferActivityAsync(ActivityData activityData); - Task> GetBufferedActivitiesAsync(); + Task BufferActivityAsync(ActivityEvent activityEvent); + Task> GetBufferedActivitiesAsync(); Task EndSessionAsync(); Task ShouldAddDeviceInfoAsync(); Task ShouldAddSolutionInformation(Guid solutionId); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs index 0b6c2ac61d..efd003df10 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryActivityDataBuilder.cs @@ -16,7 +16,7 @@ public class TelemetryActivityDataBuilder : ITelemetryActivityDataBuilder, ISing _serviceProvider = serviceProvider; } - public virtual async Task BuildAsync(ActivityData activity) + public virtual async Task BuildAsync(ActivityEvent activity) { var sessionProvider = _serviceProvider.GetRequiredService(); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryApplicationInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryApplicationInfoEnricher.cs index 79590099a4..f49d9ddbb9 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryApplicationInfoEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryApplicationInfoEnricher.cs @@ -22,7 +22,7 @@ public class TelemetryApplicationInfoEnricher : ITelemetryActivityDataEnricher, _telemetryActivityStorage = telemetryActivityStorage; } - public async Task EnrichAsync(ActivityData activity) + public async Task EnrichAsync(ActivityEvent activity) { if (!ShouldEnrichActivity(activity)) { @@ -57,7 +57,7 @@ public class TelemetryApplicationInfoEnricher : ITelemetryActivityDataEnricher, } } - private bool ShouldEnrichActivity(ActivityData activity) + private bool ShouldEnrichActivity(ActivityEvent activity) { return activity.ContainsKey(ActivityPropertyNames.Assembly) && activity.TryGetValue(ActivityPropertyNames.SessionType, out var sessionTypeObj) @@ -65,7 +65,7 @@ public class TelemetryApplicationInfoEnricher : ITelemetryActivityDataEnricher, && parsed == SessionType.ApplicationRuntime; } - private static Guid? ExtractProjectId(ActivityData activity) + private static Guid? ExtractProjectId(ActivityEvent activity) { if (!activity.TryGetValue(ActivityPropertyNames.ProjectId, out var projectIdObj) || projectIdObj is not string projectIdStr || diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryDeviceInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryDeviceInfoEnricher.cs index 9c723fdde6..0481e64a20 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryDeviceInfoEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetryDeviceInfoEnricher.cs @@ -30,7 +30,7 @@ public class TelemetryDeviceInfoEnricher : ITelemetryActivityDataEnricher, ISing _deviceId = new Lazy(GetDeviceId); } - public async Task EnrichAsync(ActivityData activity) + public async Task EnrichAsync(ActivityEvent activity) { if (_deviceId.Value.HasValue) { @@ -48,7 +48,7 @@ public class TelemetryDeviceInfoEnricher : ITelemetryActivityDataEnricher, ISing await _telemetryActivityStorage.MarkDeviceInfoAsAddedAsync(); } - private void EnrichWithDeviceInfo(ActivityData activity) + private void EnrichWithDeviceInfo(ActivityEvent activity) { activity[ActivityPropertyNames.DeviceType] = GetDeviceType(); activity[ActivityPropertyNames.DeviceLanguage] = GetLanguage(); @@ -56,7 +56,7 @@ public class TelemetryDeviceInfoEnricher : ITelemetryActivityDataEnricher, ISing activity[ActivityPropertyNames.CountryIsoCode] = GetCountry(); } - private async Task EnrichWithSoftwareInfoAsync(ActivityData activity) + private async Task EnrichWithSoftwareInfoAsync(ActivityEvent activity) { var softwareList = await _softwareInfoProvider.GetSoftwareInfoAsync(); activity[ActivityPropertyNames.InstalledSoftwares] = softwareList; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs index 62bcb695ef..512d9622f6 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs @@ -24,7 +24,7 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi - public async Task EnrichAsync(ActivityData activity) + public async Task EnrichAsync(ActivityEvent activity) { var solutionId = GetSolutionId(activity); if (solutionId.HasValue) @@ -40,7 +40,7 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi } } - private Guid? GetSolutionId(ActivityData activity) + private Guid? GetSolutionId(ActivityEvent activity) { if (TryGetSolutionIdFromActivity(activity, out var solutionId)) { @@ -55,11 +55,11 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi return null; } - private async Task FillSolutionInfoAsync(ActivityData activityData) + private async Task FillSolutionInfoAsync(ActivityEvent activityEvent) { try { - if (!activityData.TryGetValue(ActivityPropertyNames.SolutionPath, out var rawSolutionPath) + if (!activityEvent.TryGetValue(ActivityPropertyNames.SolutionPath, out var rawSolutionPath) || string.IsNullOrWhiteSpace(rawSolutionPath?.ToString()) || !File.Exists(rawSolutionPath?.ToString())) { @@ -77,13 +77,13 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi using var doc = JsonDocument.Parse(jsonContent); var root = doc.RootElement; - AddSolutionInformation(activityData, root.GetProperty("creatingStudioConfiguration")); + AddSolutionInformation(activityEvent, root.GetProperty("creatingStudioConfiguration")); if (root.TryGetProperty("modules", out var modulesElement) && modulesElement.ValueKind == JsonValueKind.Object) { var directoryPath = Path.GetDirectoryName(solutionPath)!; - activityData[ActivityPropertyNames.InstalledModules] = ExtractModules(directoryPath, modulesElement); + activityEvent[ActivityPropertyNames.InstalledModules] = ExtractModules(directoryPath, modulesElement); } } catch @@ -92,7 +92,7 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi } } - private bool TryGetSolutionIdFromActivity(ActivityData activity, out Guid solutionId) + private bool TryGetSolutionIdFromActivity(ActivityEvent activity, out Guid solutionId) { solutionId = Guid.Empty; @@ -106,7 +106,7 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi return false; } - private bool TryGetSolutionIdFromFile(ActivityData activity, out Guid solutionId) + private bool TryGetSolutionIdFromFile(ActivityEvent activity, out Guid solutionId) { solutionId = Guid.Empty; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorage.cs index e6d604cf12..4d15d5842c 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorage.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorage.cs @@ -28,15 +28,15 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep _activitySendPeriod = isTestMode ? TimeSpan.FromSeconds(5) : TimeSpan.FromDays(1); } - public async Task BufferActivityAsync(ActivityData activityData) + public async Task BufferActivityAsync(ActivityEvent activityEvent) { await ModifyStateAsync(state => { - state.Activities.Insert(0, activityData); + state.Activities.Insert(0, activityEvent); }); } - public async Task> GetBufferedActivitiesAsync() + public async Task> GetBufferedActivitiesAsync() { var state = await GetStateAsync(); return state.Activities; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorageState.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorageState.cs index ae324672a2..9fce0fc8eb 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorageState.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/Activity/Storage/TelemetryActivityStorageState.cs @@ -8,7 +8,7 @@ public class TelemetryActivityStorageState public DateTimeOffset? ActivitySendTime { get; set; } public DateTimeOffset? LastDeviceInfoAddTime { get; set; } public Guid? SessionId { get; set; } - public List Activities { get; set; } = new(); + public List Activities { get; set; } = new(); public Dictionary Solutions { get; set; } = new(); public Dictionary Applications { get; set; } = new(); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryApplicationInfoContributor.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryApplicationInfoContributor.cs index 7df709b1e7..a4b326b096 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryApplicationInfoContributor.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryApplicationInfoContributor.cs @@ -5,5 +5,5 @@ namespace Volo.Abp.Telemetry; public interface ITelemetryApplicationInfoContributor { - Task ContributeAsync(ActivityData activityData); + Task ContributeAsync(ActivityEvent activityEvent); } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryService.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryService.cs index 1abc58ec96..63718bbc62 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryService.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetryService.cs @@ -8,11 +8,11 @@ namespace Volo.Abp.Telemetry; public interface ITelemetryService { - IAsyncDisposable TrackActivity(string activityName, Action? configure = null); - IAsyncDisposable TrackActivity(ActivityData activityData); - Task AddActivityAsync(ActivityData data); + IAsyncDisposable TrackActivity(string activityName, Action? configure = null); + IAsyncDisposable TrackActivity(ActivityEvent activityEvent); + Task AddActivityAsync(ActivityEvent @event); Task AddActivityAsync(string activityName, string? details = null); - Task AddActivityAsync(string activityName, Action configure); + Task AddActivityAsync(string activityName, Action configure); Task AddErrorActivityAsync(Action> configure); Task AddErrorActivityAsync(string errorMessage); Task AddErrorForActivityAsync(string failingActivity, string errorMessage); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs index 7cf9e639ce..7055b6bc6b 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/ITelemetrySessionProvider.cs @@ -5,5 +5,5 @@ namespace Volo.Abp.Telemetry; public interface ITelemetrySessionProvider { - Task AddSessionInfoAsync(ActivityData activity); + Task AddSessionInfoAsync(ActivityEvent activity); } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryModuleInfoContributor.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryModuleInfoContributor.cs index f6bf693b87..7dc1175365 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryModuleInfoContributor.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryModuleInfoContributor.cs @@ -11,17 +11,17 @@ namespace Volo.Abp.Telemetry; [ExposeServices(typeof(ITelemetryApplicationInfoContributor))] public class TelemetryModuleInfoContributor : ITelemetryApplicationInfoContributor, ISingletonDependency { - public Task ContributeAsync(ActivityData activityData) + public Task ContributeAsync(ActivityEvent activityEvent) { - if (activityData.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) + if (activityEvent.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) { var assembly = Assembly.LoadFrom((string)assemblyPath); var types = assembly.GetTypes(); var moduleCount = types.Count(t => typeof(AbpModule).IsAssignableFrom(t) && !t.IsAbstract); var projectCount = types.Select(t => t.Assembly.GetName().Name).Distinct().Count(); - activityData[ActivityPropertyNames.ModuleCount] = moduleCount; - activityData[ActivityPropertyNames.ProjectCount] = projectCount; + activityEvent[ActivityPropertyNames.ModuleCount] = moduleCount; + activityEvent[ActivityPropertyNames.ProjectCount] = projectCount; } return Task.CompletedTask; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs index 9301346dfa..78c644789e 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryRuntimeSessionProvider.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.Telemetry; [ExposeServices(typeof(ITelemetrySessionProvider))] public class TelemetryRuntimeSessionProvider : ITelemetrySessionProvider, ISingletonDependency { - public Task AddSessionInfoAsync(ActivityData activity) + public Task AddSessionInfoAsync(ActivityEvent activity) { activity[ActivityPropertyNames.SessionType] = SessionType.ApplicationRuntime; activity[ActivityPropertyNames.SessionId] = Guid.NewGuid(); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs index 62df9afb99..52debc51a1 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs @@ -6,6 +6,7 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Telemetry.Activity; using Volo.Abp.Telemetry.Activity.Contracts; using Volo.Abp.Telemetry.Constants; +using ActivityEvent = Volo.Abp.Telemetry.Activity.ActivityEvent; namespace Volo.Abp.Telemetry; @@ -23,11 +24,11 @@ public class TelemetryService : ITelemetryService, ISingletonDependency _telemetryActivityDataBuilder = telemetryActivityDataBuilder; } - public IAsyncDisposable TrackActivity(string activityName, Action? configure = null) + public IAsyncDisposable TrackActivity(string activityName, Action? configure = null) { Check.NotNullOrEmpty(activityName, nameof(activityName)); var stopwatch = Stopwatch.StartNew(); - var activityData = new ActivityData(activityName); + var activityData = new ActivityEvent(activityName); configure?.Invoke(activityData); @@ -40,30 +41,30 @@ public class TelemetryService : ITelemetryService, ISingletonDependency }); } - public IAsyncDisposable TrackActivity(ActivityData activityData) + public IAsyncDisposable TrackActivity(ActivityEvent activityEvent) { var stopwatch = Stopwatch.StartNew(); return new AsyncDisposeFunc(async () => { stopwatch.Stop(); - activityData.ActivityDuration = stopwatch.ElapsedMilliseconds; - await AddActivityAsync(activityData); + activityEvent.ActivityDuration = stopwatch.ElapsedMilliseconds; + await AddActivityAsync(activityEvent); }); } - public Task AddActivityAsync(ActivityData data) + public Task AddActivityAsync(ActivityEvent @event) { _ = Task.Run(async () => { try { - await _telemetryActivityDataBuilder.BuildAsync(data); - await _telemetryActivityStorage.BufferActivityAsync(data); + await _telemetryActivityDataBuilder.BuildAsync(@event); + await _telemetryActivityStorage.BufferActivityAsync(@event); - if (data.ActivityName == ActivityNameConsts.AbpStudioClose) + if (@event.ActivityName == ActivityNameConsts.AbpStudioClose) { await _telemetryActivityStorage.EndSessionAsync(); } @@ -84,13 +85,13 @@ public class TelemetryService : ITelemetryService, ISingletonDependency public async Task AddActivityAsync(string activityName, string? details = null) { - await AddActivityAsync(new ActivityData(activityName, details)); + await AddActivityAsync(new ActivityEvent(activityName, details)); } - public async Task AddActivityAsync(string activityName, Action configure) + public async Task AddActivityAsync(string activityName, Action configure) { Check.NotNullOrEmpty(activityName, nameof(activityName)); - var activityData = new ActivityData(activityName); + var activityData = new ActivityEvent(activityName); configure?.Invoke(activityData); @@ -99,7 +100,7 @@ public class TelemetryService : ITelemetryService, ISingletonDependency public async Task AddErrorActivityAsync(Action> configure) { - var activityData = new ActivityData(ActivityNameConsts.Error) + var activityData = new ActivityEvent(ActivityNameConsts.Error) { AdditionalProperties = new Dictionary() }; @@ -111,7 +112,7 @@ public class TelemetryService : ITelemetryService, ISingletonDependency public async Task AddErrorActivityAsync(string errorMessage) { - var activityData = new ActivityData(ActivityNameConsts.Error) + var activityData = new ActivityEvent(ActivityNameConsts.Error) { AdditionalProperties = new Dictionary { @@ -124,7 +125,7 @@ public class TelemetryService : ITelemetryService, ISingletonDependency public async Task AddErrorForActivityAsync(string failingActivity, string errorMessage) { - var activityData = new ActivityData(ActivityNameConsts.Error) + var activityData = new ActivityEvent(ActivityNameConsts.Error) { AdditionalProperties = new Dictionary { diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/TelemetryDomainInfoContributor.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/TelemetryDomainInfoContributor.cs index fb32066c5b..c863458cdf 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/TelemetryDomainInfoContributor.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Telemetry/TelemetryDomainInfoContributor.cs @@ -12,15 +12,15 @@ namespace Volo.Abp.Domain.Telemetry; [ExposeServices(typeof(ITelemetryApplicationInfoContributor))] public class TelemetryDomainInfoContributor : ITelemetryApplicationInfoContributor , ISingletonDependency { - public Task ContributeAsync(ActivityData activityData) + public Task ContributeAsync(ActivityEvent activityEvent) { - if (activityData.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) + if (activityEvent.TryGetValue(ActivityPropertyNames.Assembly, out var assemblyPath)) { var assembly = Assembly.LoadFrom((string)assemblyPath); var entityCount = assembly.GetTypes().Count(t => typeof(IEntity).IsAssignableFrom(t) && !t.IsAbstract); - activityData[ActivityPropertyNames.EntityCount] = entityCount; + activityEvent[ActivityPropertyNames.EntityCount] = entityCount; } return Task.CompletedTask;