feat: add trace detail latency changed

masastack · Nov 15, 2024 · 63e1e96 · 63e1e96
1 parent ee56e0a
commit 63e1e96
Show file tree

Hide file tree

Showing 19 changed files with 254 additions and 67 deletions.
diff --git a/src/ApiGateways/Masa.Tsc.ApiGateways.Caller/Services/ApmService.cs b/src/ApiGateways/Masa.Tsc.ApiGateways.Caller/Services/ApmService.cs
@@ -39,5 +39,5 @@ internal ApmService(ICaller caller) : base(caller, "/api/apm") { }
 
     public Task<List<string>> GetExceptionTypesAsync(BaseRequestDto query) => Caller.GetByBodyAsync<List<string>>($"{RootPath}/errorTypes", query)!;
 
-    public Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmEndpointRequestDto query) => Caller.GetByBodyAsync<PaginatedListBase<SimpleTraceListDto>>($"{RootPath}/simpleTraceList", body: query)!;
+    public Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmTraceLatencyRequestDto query) => Caller.GetByBodyAsync<PaginatedListBase<SimpleTraceListDto>>($"{RootPath}/simpleTraceList", body: query)!;
 }
diff --git a/src/Infrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Cliclhouse/ClickhouseApmService.cs b/src/Infrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Cliclhouse/ClickhouseApmService.cs
@@ -313,7 +313,7 @@ public async Task<PaginatedListBase<TraceResponseDto>> TraceLatencyDetailAsync(A
         return await _traceService.ListAsync(queryDto);
     }
 
-    public async Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmEndpointRequestDto query)
+    public async Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmTraceLatencyRequestDto query)
     {
         var orderBy = GetOrderBy(query, new() { { StorageConst.Current.Timestimap, StorageConst.Current.Timestimap } });
         var (where, ors, parameters) = AppendWhere(query);
@@ -323,16 +323,18 @@ public async Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync
             string sql1;
             if (query.IsInstrument)
             {
-                sql1 = $"select count(1) as Total from {MasaStackClickhouseConnection.TraceHttpServerTable} where {where}";
+                sql1 = $"select 1 as Total from {MasaStackClickhouseConnection.TraceHttpServerTable} where {where}";
             }
             else
             {
-                sql1 = $@"select countMerge(Total) as Total from {Constants.DurationCountTable} where {where}";
+                sql1 = $@"select 1 as Total from {Constants.DurationCountTable} where {where}";
             }
 
             sql1 = CombineOrs(sql1, ors);
             var countSql = $"select sum(Total) from({sql1})";
+            SetMinDurationUnit(parameters);
             result.Total = Convert.ToInt64(await Scalar(countSql, parameters));
+            ResetMinDurationUnit(parameters);
         }
 
         var sql = CombineOrs($@"select TraceId,Duration,Timestamp from {(query.IsInstrument ? MasaStackClickhouseConnection.TraceHttpServerTable : Constants.DurationTable)} where {where}", ors);
@@ -342,6 +344,30 @@ public async Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync
         return result;
     }
 
+    private void SetMinDurationUnit(List<ClickHouseParameter> parameters)
+    {
+        if (parameters == null || !parameters.Any())
+            return;
+        var param = parameters.Find(p => p.ParameterName == "minDuration");
+        if (param != null)
+            param.Value = (long)(((long)param.Value) / MILLSECOND);
+        param = parameters.Find(p => p.ParameterName == "maxDuration");
+        if (param != null)
+            param.Value = (long)(((long)param.Value) / MILLSECOND);
+    }
+
+    private void ResetMinDurationUnit(List<ClickHouseParameter> parameters)
+    {
+        if (parameters == null || !parameters.Any())
+            return;
+        var param = parameters.Find(p => p.ParameterName == "minDuration");
+        if (param != null)
+            param.Value = (long)(((long)param.Value) * MILLSECOND);
+        param = parameters.Find(p => p.ParameterName == "maxDuration");
+        if (param != null)
+            param.Value = (long)(((long)param.Value) * MILLSECOND);
+    }
+
     private static SimpleTraceListDto ToSampleTraceListDto(IDataReader reader)
     {
         var startTime = Convert.ToDateTime(reader[StorageConst.Current.Timestimap]);

diff --git a/src/Infrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Interfaces/IApmService.cs b/src/Infrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Interfaces/IApmService.cs
@@ -69,7 +69,7 @@ public interface IApmService : IDisposable
     /// </summary>
     /// <param name="query"></param>
     /// <returns></returns>
-    Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmEndpointRequestDto query);
+    Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync(ApmTraceLatencyRequestDto query);
 
     Task<List<string>> GetErrorTypesAsync(BaseApmRequestDto query);
 

diff --git a/...nfrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Models/Request/ApmTraceLatencyRequestDto.cs b/...nfrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Models/Request/ApmTraceLatencyRequestDto.cs
@@ -15,5 +15,5 @@ public class ApmTraceLatencyRequestDto : ApmEndpointRequestDto
     /// </summary>
     public long? LatMax { get; set; }
 
-    public new int PageSize { get; } = 1;
+    public new int PageSize { get; } = 500;
 }
diff --git a/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs b/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs
@@ -308,7 +308,7 @@ private async Task<Dictionary<string, List<EnviromentAppDto>>> GetTeamAllEnvApps
         return result;
     }
 
-    public Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceList([FromServices] IApmService apmService, [FromBody] ApmEndpointRequestDto query)
+    public Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceList([FromServices] IApmService apmService, [FromBody] ApmTraceLatencyRequestDto query)
         => apmService.GetSimpleTraceListAsync(query);
 
     public Task<List<string>> GetEndpointList([FromServices] IApmService apmService, [FromBody] BaseApmRequestDto query)

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Components/Apm/ApmSearchComponent.razor.cs b/src/Web/Masa.Tsc.Web.Admin.Rcl/Components/Apm/ApmSearchComponent.razor.cs
@@ -45,8 +45,7 @@ public partial class ApmSearchComponent
         AppTypes.Service.ToString(),
          AppTypes.Job.ToString()
     };
-
-    private bool Isloaded = false;
+
     private QuickRangeKey quickRangeKey = QuickRangeKey.Last15Minutes;
     private List<string> textFileds = new();
 
@@ -60,7 +59,7 @@ protected override async Task OnInitializedAsync()
         {
             await InitAsync();
         }
-        Isloaded = true;
+        Search.Loaded = true;
         await OnValueChanged();
         StateHasChanged();
     }
@@ -198,7 +197,7 @@ private void SetQueryList()
     private void TeamChanged(Guid teamId)
     {
         GlobalConfig.CurrentTeamId = teamId;
-        if (Isloaded && CheckUrl())
+        if (Search.Loaded && CheckUrl())
         {
             NavigationManager.NavigateTo(NavigationManager.Uri, true);
             return;
@@ -379,12 +378,12 @@ private async Task LoadErrorAsync()
 
     private async Task OnTimeUpdate((DateTimeOffset? start, DateTimeOffset? end) times)
     {
-        if (Isloaded || Search.Start == DateTime.MinValue)
+        if (Search.Loaded || Search.Start == DateTime.MinValue)
         {
             Search.Start = times.start!.Value.UtcDateTime;
             Search.End = times.end!.Value.UtcDateTime;
         }
-        if (Isloaded)
+        if (Search.Loaded)
         {
             await InitAsync();
             await OnValueChanged();
@@ -473,7 +472,7 @@ private async Task OnMessageEnter()
 
     private async Task OnValueChanged()
     {
-        if (!Isloaded || string.IsNullOrEmpty(Value.Environment))
+        if (!Search.Loaded || string.IsNullOrEmpty(Value.Environment))
             return;
         if (ValueChanged.HasDelegate)
             await ValueChanged.InvokeAsync(Value);

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Data/Apm/SearchData.cs b/src/Web/Masa.Tsc.Web.Admin.Rcl/Data/Apm/SearchData.cs
@@ -41,6 +41,11 @@ public SearchData()
     public string TraceId { get; set; }
 
     public string SpanId { get; set; }
+
+    /// <summary>
+    /// search com
+    /// </summary>
+    public bool Loaded { get; set; }
 }
 
 public enum ApmComparisonTypes

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Extentions/ObjectExtensions.cs b/src/Web/Masa.Tsc.Web.Admin.Rcl/Extentions/ObjectExtensions.cs
@@ -60,6 +60,21 @@ public static string FormatTime(this double millionSeconds)
         return $"{minis} min{(seconds > 0 ? $"{seconds} s" : "")}";
     }
 
+    public static int FormatTimeToNumber(this string s)
+    {
+        if (string.IsNullOrEmpty(s))
+            return 0;
+        if (s == "<1ms")
+            return 0;
+        if (s.EndsWith("ms"))
+            return Convert.ToInt32(s.Substring(0, s.Length - 2));
+        if (s.EndsWith(" s"))
+            return Convert.ToInt32(s.Substring(0, s.Length - 2)) * 60;
+        if (s.EndsWith(" min"))
+            return Convert.ToInt32(s.Substring(0, s.Length - 4)) * 360;
+        return default;
+    }
+
     public static string FormatHistory(this DateTime time)
     {
         var now = DateTime.UtcNow;

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/EndpointDetail.razor.cs b/src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/EndpointDetail.razor.cs
@@ -11,7 +11,7 @@ public partial class EndpointDetail
     private string spanId = default!;
 
     [Parameter]
-    public string Name { get; set; }
+    public string Name { get; set; }   
 
     private void OnSearchValueChanged(SearchData data)
     {

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Endpoints/OverView.razor b/src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/Apm/Endpoints/OverView.razor
@@ -79,7 +79,7 @@
         <MCardText>
             @if (!timeTypeCount.ChartLoading && timeTypeCount.HasChart)
             {
-                <MECharts Option="@(timeTypeCount.Data)" Height="166" Style="@("width:100%")" />
+                <MECharts Option="@(timeTypeCount.Data)" Height="166" Style="@("width:100%")" @ref="mechart" />
             }
         </MCardText>
     </MCard>