From 0a9debf61d5b0bc1b0cf0f0ea6bc3848738e9329 Mon Sep 17 00:00:00 2001 From: Emre KARA Date: Tue, 6 May 2025 23:41:44 +0300 Subject: [PATCH] Simplify telemetry activity processing logic. Removed unnecessary usage of `IActivityDataProvider` in `TelemetryService` and `TelemetryDataSender`. Optimized activity handling by directly working with provided data, reducing complexity and improving maintainability. --- .../Volo/Abp/Telemetry/TelemetryDataSender.cs | 3 +-- .../Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs index ac3893ae63..cf71614035 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryDataSender.cs @@ -38,12 +38,11 @@ public class TelemetryDataSender : ITelemetryDataSender , IScopedDependency if (activities.Count > 0) { + await _activityDataProvider.AddExtraInformationAsync(activities[0]); foreach (var activity in activities) { - await _activityDataProvider.AddExtraInformationAsync(activity); await httpClient.PostAsync(ApiUrl, new StringContent(JsonSerializer.Serialize(activity), Encoding.UTF8, "application/json")); - } await _activityStorage.MarkActivitiesAsSentAsync(); 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 e546e9770d..9962eb427f 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Telemetry/TelemetryService.cs @@ -10,13 +10,11 @@ namespace Volo.Abp.Telemetry; public class TelemetryService : ITelemetryService , IScopedDependency { private readonly IActivityStorage _activityStorage; - private readonly IActivityDataProvider _activityDataProvider; private readonly ITelemetryDataSender _telemetryDataSender; - public TelemetryService(IActivityStorage activityStorage, IActivityDataProvider activityDataProvider, ITelemetryDataSender telemetryDataSender) + public TelemetryService(IActivityStorage activityStorage, ITelemetryDataSender telemetryDataSender) { _activityStorage = activityStorage; - _activityDataProvider = activityDataProvider; _telemetryDataSender = telemetryDataSender; } @@ -67,8 +65,8 @@ public class TelemetryService : ITelemetryService , IScopedDependency } public async Task AddActivityAsync(ActivityData data, CancellationToken cancellationToken = default) { - var build = await _activityDataProvider.AddExtraInformationAsync(data, cancellationToken); - await _activityStorage.BufferActivityAsync(build, cancellationToken); + + await _activityStorage.BufferActivityAsync(data, cancellationToken); await CheckIfActivitySendTimeIsDueAsync(); }