From fb3c0ee578a23e3927fedd8e40ae4f6181e3deab Mon Sep 17 00:00:00 2001 From: qinyouzeng Date: Thu, 14 Mar 2024 14:45:10 +0800 Subject: [PATCH] fix: fix apmservice init --- .../Services/ApmService.cs | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs b/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs index 74db2728..d18dcc72 100644 --- a/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs +++ b/src/Services/Masa.Tsc.Service.Admin/Services/ApmService.cs @@ -5,13 +5,11 @@ namespace Masa.Tsc.Service.Admin.Services; public class ApmService : ServiceBase { - private readonly IApmService apmService; - public ApmService(IApmService apmService) : base("/api/apm") + public ApmService() : base("/api/apm") { - this.apmService = apmService; - } + } - public async Task> GetServices(int page, int pageSize, string start, string end, string? env, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) + public async Task> GetServices([FromServices] IApmService apmService, int page, int pageSize, string start, string end, string? env, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) => await apmService.ServicePageAsync(new BaseApmRequestDto { Start = start.ParseTime(), @@ -26,7 +24,7 @@ public async Task> GetServices(int page, int p StatusCodes = string.Join(',', ConfigConst.TraceErrorStatus) }); - public async Task> GetEndpoints(int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) + public async Task> GetEndpoints([FromServices] IApmService apmService, int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) => await apmService.EndpointPageAsync(new BaseApmRequestDto { Start = start.ParseTime(), @@ -42,7 +40,7 @@ public async Task> GetEndpoints(int page, int StatusCodes = string.Join(',', ConfigConst.TraceErrorStatus) }); - public async Task> GetCharts(string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries) + public async Task> GetCharts([FromServices] IApmService apmService, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries) => await apmService.ChartDataAsync(new BaseApmRequestDto { Start = start.ParseTime(), @@ -54,7 +52,7 @@ public async Task> GetCharts(string start, string end, StatusCodes = string.Join(',', ConfigConst.TraceErrorStatus) }); - public async Task GetLatencyDistributions(string start, string end, string? env, string? service, string endpoint) + public async Task GetLatencyDistributions([FromServices] IApmService apmService, string start, string end, string? env, string? service, string endpoint) => await apmService.EndpointLatencyDistributionAsync(new ApmEndpointRequestDto { Start = start.ParseTime(), @@ -65,7 +63,7 @@ public async Task GetLatencyDistributions(string StatusCodes = string.Join(',', ConfigConst.TraceErrorStatus) }); - public async Task> GetErrors(int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) + public async Task> GetErrors([FromServices] IApmService apmService, int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) => await apmService.ErrorMessagePageAsync(new ApmEndpointRequestDto { Start = start.ParseTime(), @@ -79,7 +77,7 @@ public async Task> GetErrors(int page, int pa Service = service }); - public Task> GetSpanErrors(int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) + public Task> GetSpanErrors([FromServices] IApmService apmService, int page, int pageSize, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries, string? orderField, bool? isDesc) => apmService.GetTraceErrorsAsync(new ApmEndpointRequestDto { Start = start.ParseTime(), @@ -93,7 +91,7 @@ public Task> GetSpanErrors(int page, int pageSize, st Service = service }); - public async Task> GetTraceDetail(int page, string start, string end, string? env, string? service, string endpoint, long? latMin, long? latMax) + public async Task> GetTraceDetail([FromServices] IApmService apmService, int page, string start, string end, string? env, string? service, string endpoint, long? latMin, long? latMax) => await apmService.TraceLatencyDetailAsync(new ApmTraceLatencyRequestDto { Start = start.ParseTime(), @@ -106,7 +104,7 @@ public async Task> GetTraceDetail(int page, LatMin = latMin }); - public async Task> GetErrorChart(string start, string end, string? env, string? service, string? endpoint, ComparisonTypes? comparisonType, string? queries) + public async Task> GetErrorChart([FromServices] IApmService apmService, string start, string end, string? env, string? service, string? endpoint, ComparisonTypes? comparisonType, string? queries) => await apmService.GetErrorChartAsync(new ApmEndpointRequestDto { Start = start.ParseTime(), @@ -119,7 +117,7 @@ public async Task> GetErrorChart(string start, st StatusCodes = string.Join(',', ConfigConst.TraceErrorStatus) }); - public async Task> GetLogChart(string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries) + public async Task> GetLogChart([FromServices] IApmService apmService, string start, string end, string? env, string? service, ComparisonTypes? comparisonType, string? queries) => await apmService.GetLogChartAsync(new ApmEndpointRequestDto { Start = start.ParseTime(),