From a6644c776de99188d0b4b9a1bd846fc85ac53208 Mon Sep 17 00:00:00 2001 From: Emre KARA Date: Tue, 10 Jun 2025 14:56:44 +0300 Subject: [PATCH] Optimize telemetry test mode timing and adjust activity properties. --- .../Activity/Providers/TelemetrySolutionInfoEnricher.cs | 5 +++-- .../Activity/Storage/TelemetryActivityStorage.cs | 9 ++------- 2 files changed, 5 insertions(+), 9 deletions(-) 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 944177f3e0..62bcb695ef 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 @@ -33,9 +33,10 @@ public class TelemetrySolutionInfoEnricher : ITelemetryActivityDataEnricher, ISi { await FillSolutionInfoAsync(activity); await _telemetryActivityStorage.MarkSolutionInfoAsAddedAsync(solutionId.Value); + activity[ActivityPropertyNames.HasSolutionInfo] = true; + activity.Remove(ActivityPropertyNames.SolutionPath); } - activity[ActivityPropertyNames.HasSolutionInfo] = true; - activity.Remove(ActivityPropertyNames.SolutionPath); + } } 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 1914a56870..e6d604cf12 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 @@ -17,11 +17,6 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep private const string MutexName = "Global\\TelemetryActivityStorage"; private const string TestModeEnvironmentVariable = "ABP_TELEMETRY_TEST_MODE"; - private readonly static TimeSpan DefaultInfoExpirationPeriod = TimeSpan.FromDays(7); - private readonly static TimeSpan DefaultActivitySendPeriod = TimeSpan.FromDays(1); - private readonly static TimeSpan TestModeInfoExpirationPeriod = TimeSpan.FromMinutes(1); - private readonly static TimeSpan TestModeActivitySendPeriod = TimeSpan.FromSeconds(5); - private readonly TimeSpan _infoExpirationPeriod; private readonly TimeSpan _activitySendPeriod; private TelemetryActivityStorageState? _cachedState; @@ -29,8 +24,8 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep public TelemetryActivityStorage() { var isTestMode = IsTestModeEnabled(); - _infoExpirationPeriod = isTestMode ? TestModeInfoExpirationPeriod : DefaultInfoExpirationPeriod; - _activitySendPeriod = isTestMode ? TestModeActivitySendPeriod : DefaultActivitySendPeriod; + _infoExpirationPeriod = isTestMode ? TimeSpan.FromSeconds(15) : TimeSpan.FromDays(7); + _activitySendPeriod = isTestMode ? TimeSpan.FromSeconds(5) : TimeSpan.FromDays(1); } public async Task BufferActivityAsync(ActivityData activityData)