Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tsc-clickhouse): fix clickhouse timezone and apm chart query bugs #704

Merged
merged 2 commits into from
Mar 22, 2024
Merged

fix(tsc-clickhouse): fix clickhouse timezone and apm chart query bugs #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d198d5e
fix: clickhouse query timezone bug
Qinyouzeng Mar 22, 2024
278506d
chore: update
Qinyouzeng Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions ...ib/StackSdks/Masa.Contrib.StackSdks.Tsc.Apm.Clickhouse/Cliclhouse/ClickhouseApmService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal class ClickhouseApmService : IApmService
private readonly ITraceService _traceService;
private readonly static object lockObj = new();
private static Dictionary<string, string> serviceOrders = new() {
{nameof(ServiceListDto.Name),"ServiceName"},
{nameof(ServiceListDto.Name),SERVICE_NAME},
{nameof(ServiceListDto.Envs),"env"},
{nameof(ServiceListDto.Latency),"latency"},
{nameof(ServiceListDto.Throughput),"throughput"},
Expand All @@ -19,7 +19,7 @@ internal class ClickhouseApmService : IApmService

private static Dictionary<string, string> endpointOrders = new() {
{nameof(EndpointListDto.Name),"`Attributes.http.target`"},
{nameof(EndpointListDto.Service),"ServiceName"},
{nameof(EndpointListDto.Service),SERVICE_NAME},
{nameof(EndpointListDto.Method),"`method`"},
{nameof(EndpointListDto.Latency),"latency"},
{nameof(EndpointListDto.Throughput),"throughput"},
Expand All @@ -33,6 +33,7 @@ internal class ClickhouseApmService : IApmService
{nameof(ErrorMessageDto.Total),"`total`"}
};
const double MILLSECOND = 1e6;
const string SERVICE_NAME = "ServiceName";

public ClickhouseApmService(MasaStackClickhouseConnection dbConnection, ITraceService traceService)
{
Expand All @@ -50,7 +51,7 @@ public Task<PaginatedListBase<ServiceListDto>> ServicePageAsync(BaseApmRequestDt
var groupby = "group by ServiceName";
var countSql = $"select count(1) from(select count(1) from {Constants.TraceTableFull} where {where} {groupby})";
PaginatedListBase<ServiceListDto> result = new() { Total = Convert.ToInt64(Scalar(countSql, parameters)) };
var orderBy = GetOrderBy(query, serviceOrders, defaultSort: "ServiceName");
var orderBy = GetOrderBy(query, serviceOrders, defaultSort: SERVICE_NAME);
var sql = $@"select * from(
select
ServiceName,
Expand All @@ -76,7 +77,7 @@ public Task<PaginatedListBase<EndpointListDto>> InstancePageAsync(BaseApmRequest
var selectField = $@"ResourceAttributesValues[indexOf(ResourceAttributesKeys,'service.instance.id')] instance`,
AVG(Duration/{MILLSECOND}) Latency,
count(1)*1.0/DATEDIFF(MINUTE ,toDateTime(@startTime),toDateTime (@endTime)) throughput
sum(has(['{string.Join(',', query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))/count(1) failed";
sum(has(['{string.Join("','", query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))/count(1) failed";
return GetEndpointAsync(query, groupBy, selectField, reader => new EndpointListDto()
{
Name = reader[0].ToString()!,
Expand All @@ -92,7 +93,7 @@ public Task<PaginatedListBase<EndpointListDto>> DependencyPageAsync(BaseApmReque
var selectField = $@"`Attributes.http.target`,ServiceName,SpanAttributesValues[indexOf(SpanAttributesKeys,'http.method')] `method`,
AVG(Duration{MILLSECOND}) Latency,
count(1)*1.0/DATEDIFF(MINUTE ,toDateTime(@startTime),toDateTime (@endTime)) throughput
sum(has(['{string.Join(',', query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))/count(1) failed";
sum(has(['{string.Join("','", query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))/count(1) failed";
return GetEndpointAsync(query, groupBy, selectField, ConvertEndpointDto);
}

Expand All @@ -114,7 +115,7 @@ public Task<PaginatedListBase<EndpointListDto>> EndpointPageAsync(BaseApmRequest
var selectField = $@"`Attributes.http.target`,ServiceName,SpanAttributesValues[indexOf(SpanAttributesKeys,'http.method')] `method`,
floor(AVG(Duration/{MILLSECOND})) latency,
round(count(1)*1.0/DATEDIFF(MINUTE ,toDateTime(@startTime),toDateTime (@endTime)),2) throughput,
round(sum(has(['{string.Join(',', query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))*100.0/count(1),2) failed";
round(sum(has(['{string.Join("','", query.GetErrorStatusCodes())}'],`Attributes.http.status_code`))*100.0/count(1),2) failed";
return GetEndpointAsync(query, groupBy, selectField, ConvertEndpointDto);
}

Expand All @@ -136,9 +137,10 @@ public Task<IEnumerable<ChartLineDto>> ChartDataAsync(BaseApmRequestDto query)
query.IsServer = true;
var (where, parameters) = AppendWhere(query);
var result = new List<ChartLineDto>();
var groupby = "group by ServiceName ,`time` order by ServiceName ,`time`";
var field = query is ApmEndpointRequestDto apmEndpointDto && string.IsNullOrEmpty(apmEndpointDto.Endpoint) ? "Attributes.http.target" : SERVICE_NAME;
var groupby = $"group by {field} ,`time` order by {field} ,`time`";
var sql = $@"select
ServiceName,
{field},
toStartOfInterval(`Timestamp` , INTERVAL {GetPeriod(query)} ) as `time`,
floor(avg(Duration/{MILLSECOND})) `latency`,
floor(quantile(0.95)(Duration/{MILLSECOND})) `p95`,
Expand Down Expand Up @@ -464,7 +466,7 @@ public Task<IEnumerable<ChartLineCountDto>> GetErrorChartAsync(ApmEndpointReques
var sql = $@"select
toStartOfInterval(`Timestamp` , INTERVAL {GetPeriod(query)} ) as `time`,
count(1) `total`
from {Constants.LogTableFull} where {where} and SeverityText='Error' {groupby}";
from {Constants.LogTableFull} where {where} and SeverityText='Error' and `Attributes.exception.message`!='' {groupby}";

return Task.FromResult(getChartCountData(sql, parameters, query.ComparisonType).AsEnumerable());
}
Expand Down
5 changes: 3 additions & 2 deletions ...ib/StackSdks/Masa.Contrib.StackSdks.Tsc.Clickhouse/Model/MASAStackClickhouseConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ internal sealed class MasaStackClickhouseConnection : ClickHouseConnection

public static TimeZoneInfo TimeZone { get; set; }

public static DateTime ToTimeZone(DateTime utcTime)
public static DateTime ToTimeZone(DateTime time)
{
return utcTime + TimeZone.BaseUtcOffset;
var newTime = time.Kind == DateTimeKind.Unspecified ? time : DateTime.SpecifyKind(time, DateTimeKind.Unspecified);
return new DateTimeOffset(newTime + TimeZone.BaseUtcOffset, TimeZone.BaseUtcOffset).DateTime;
}

public object LockObj { get; init; } = new();
Expand Down
Loading