From 55a511f10fa384cb55d3a30b56aed34c99414600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SAL=C4=B0H=20=C3=96ZKARA?= Date: Wed, 10 Dec 2025 15:37:40 +0300 Subject: [PATCH] revert changes --- .../Telemetry/Activity/ActivityContext.cs | 48 +--------------- .../TelemetrySolutionInfoEnricher.cs | 56 +------------------ .../Activity/TelemetryJsonExtensions.cs | 10 ---- 3 files changed, 3 insertions(+), 111 deletions(-) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/ActivityContext.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/ActivityContext.cs index f6bb8e7e50..8a03a66e65 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/ActivityContext.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/ActivityContext.cs @@ -19,7 +19,7 @@ public class ActivityContext public string? DeviceId => Current.Get(ActivityPropertyNames.DeviceId); - public string? SolutionPath => TryGetValue(ActivityPropertyNames.SolutionPath, out var solutionPath) + public string? SolutionPath => ExtraProperties.TryGetValue(ActivityPropertyNames.SolutionPath, out var solutionPath) ? solutionPath?.ToString() : null; @@ -42,52 +42,6 @@ public class ActivityContext return new ActivityContext(activity); } - - public bool TryGetValue(string key, out object? value) - { - if (Current.TryGetValue(key, out value)) - { - return true; - } - - if (ExtraProperties.TryGetValue(key, out value)) - { - return true; - } - - if (Current.TryGetValue(ActivityPropertyNames.AdditionalProperties, out var additionalProperties) && - additionalProperties is Dictionary additionalPropertiesDict && - additionalPropertiesDict.TryGetValue(key, out value)) - { - return true; - } - - return false; - } - - public void SetSolutionPath(string solutionPath) - { - if (solutionPath == SolutionPath) - { - return; - } - - ExtraProperties[ActivityPropertyNames.SolutionPath] = solutionPath; - - if(Current.ContainsKey(ActivityPropertyNames.SolutionPath)) - { - Current[ActivityPropertyNames.SolutionPath] = solutionPath; - } - - if (Current.TryGetValue(ActivityPropertyNames.AdditionalProperties, out var additionalPropertiesObj) && - additionalPropertiesObj is Dictionary additionalPropertiesDict) - { - if (additionalPropertiesDict.ContainsKey(ActivityPropertyNames.SolutionPath)) - { - additionalPropertiesDict[ActivityPropertyNames.SolutionPath] = solutionPath; - } - } - } public void Terminate() { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs index 97a2eba926..c57d51e6f2 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetrySolutionInfoEnricher.cs @@ -21,17 +21,12 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri protected override Task CanExecuteAsync(ActivityContext context) { - if (context.SolutionPath.IsNullOrEmpty()) - { - return Task.FromResult(false); - } - - if (context.SolutionId.HasValue) + if (context.SolutionId.HasValue && !context.SolutionPath.IsNullOrEmpty()) { return Task.FromResult(_telemetryActivityStorage.ShouldAddSolutionInformation(context.SolutionId.Value)); } - return Task.FromResult(true); + return Task.FromResult(false); } protected override Task ExecuteAsync(ActivityContext context) @@ -42,14 +37,6 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri { return Task.CompletedTask; } - - var correctSolutionPath = FindCorrectSolutionPath(context.SolutionPath); - if (correctSolutionPath.IsNullOrEmpty()) - { - return Task.CompletedTask; - } - - context.SetSolutionPath(correctSolutionPath); var jsonContent = File.ReadAllText(context.SolutionPath!); using var doc = JsonDocument.Parse(jsonContent, new JsonDocumentOptions @@ -58,15 +45,6 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri }); var root = doc.RootElement; - - var solutionId = TelemetryJsonExtensions.GetGuidOrNull(root, "id"); - - if (!solutionId.HasValue) - { - return Task.CompletedTask; - } - - context.Current[ActivityPropertyNames.SolutionId] = solutionId; if (root.TryGetProperty("versions", out var versions)) { @@ -171,34 +149,4 @@ internal sealed class TelemetrySolutionInfoEnricher : TelemetryActivityEventEnri var fullPath = Path.Combine(Path.GetDirectoryName(solutionPath)!, path); return File.Exists(fullPath) ? fullPath : null; } - - private static string? FindCorrectSolutionPath(string solutionPath) - { - if (solutionPath.EndsWith(".abpsln")) - { - return solutionPath; - } - - var possibleExtensions = new[] - { - ".sln", - ".slnx" - }; - - foreach (var extension in possibleExtensions) - { - if (!solutionPath.EndsWith(extension)) - { - continue; - } - - var abpSlnPath = solutionPath.Substring(0, solutionPath.Length - extension.Length) + ".abpsln"; - if (File.Exists(abpSlnPath)) - { - return abpSlnPath; - } - } - - return null; - } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/TelemetryJsonExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/TelemetryJsonExtensions.cs index f822f72f18..6f8b5c2a10 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/TelemetryJsonExtensions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/TelemetryJsonExtensions.cs @@ -31,14 +31,4 @@ static internal class TelemetryJsonExtensions return null; } - - static internal Guid? GetGuidOrNull(JsonElement element, string propertyName) - { - if (element.TryGetProperty(propertyName, out var guidProperty) && Guid.TryParse(guidProperty.GetString(), out var guidValue)) - { - return guidValue; - } - - return null; - } } \ No newline at end of file