Skip to content

Commit

Permalink
chore: 更新StorageConst
Browse files Browse the repository at this point in the history
  • Loading branch information
@Qinyouzeng
Qinyouzeng committed Jul 29, 2024
1 parent e3e127a commit fde9922
Show file tree
Hide file tree
Showing 28 changed files with 278 additions and 223 deletions.
1 change: 1 addition & 0 deletions src/ApiGateways/Masa.Tsc.ApiGateways.Caller/Masa.Tsc.ApiGateways.Caller.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
<ItemGroup>
<ProjectReference Include="..\..\Contracts\Masa.Tsc.Contracts.Admin\Masa.Tsc.Contracts.Admin.csproj" />
<ProjectReference Include="..\..\Infrastructure\Masa.Tsc.Storage.Clickhouse.Apm\Masa.Tsc.Storage.Clickhouse.Apm.csproj" />
<ProjectReference Include="..\..\Infrastructure\Masa.Tsc.Storage.Elasticsearch\Masa.Tsc.Storage.Elasticsearch.csproj" />
</ItemGroup>
</Project>
66 changes: 33 additions & 33 deletions src/Contracts/Masa.Tsc.Contracts.Admin/Infrastructure/Const/StorageConst.cs
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
//// Copyright (c) MASA Stack All rights reserved.
//// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Tsc.Contracts.Admin.Infrastructure.Const;
//namespace Masa.Tsc.Contracts.Admin.Infrastructure.Const;

public sealed class StorageConst
{
private StorageConst() { }
//public sealed class StorageConst
//{
// private StorageConst() { }

public static string Timestimap(bool isElasticsearch = false, bool isClickhouse = false)
{
if (isElasticsearch)
{
return "@timestamp";
}
else if (isClickhouse)
{
return "Timestamp";
}
return default!;
}
// public static string Timestimap(bool isElasticsearch = false, bool isClickhouse = false)
// {
// if (isElasticsearch)
// {
// return "@timestamp";
// }
// else if (isClickhouse)
// {
// return "Timestamp";
// }
// return default!;
// }

public const string LogLevelText = "SeverityText";
// public const string LogLevelText = "SeverityText";

public const string LogErrorText = "Error";
// public const string LogErrorText = "Error";

public const string LogWarningText = "Warning";
// public const string LogWarningText = "Warning";

public const string ServiceName = "Resource.service.name";
// public const string ServiceName = "Resource.service.name";

public const string ServiceInstance = "Resource.service.instance.id";
// public const string ServiceInstance = "Resource.service.instance.id";

public const string URL = "Attributes.http.target";
// public const string URL = "Attributes.http.target";

public const string HttpPort = "Attributes.http.status_code";
// public const string HttpPort = "Attributes.http.status_code";

public static string TraceId { get; private set; } = "TraceId";
// public static string TraceId { get; private set; } = "TraceId";

public static string SpanId { get; private set; } = "SpanId";
// public static string SpanId { get; private set; } = "SpanId";

public const string Environment = "Resource.service.namespace";
// public const string Environment = "Resource.service.namespace";

public const string ExceptionMessage = "Attributes.exception.message";
// public const string ExceptionMessage = "Attributes.exception.message";

public const string ExceptionType = "Attributes.exception.type";
// public const string ExceptionType = "Attributes.exception.type";

public const string TaskId = "Attributes.TaskId";
// public const string TaskId = "Attributes.TaskId";

public const string UserId = "Attributes.enduser.id";
}
// public const string UserId = "Attributes.enduser.id";
//}
46 changes: 23 additions & 23 deletions src/Infrastructure/Masa.Tsc.Storage.Clickhouse.Apm/Cliclhouse/ClickhouseApmService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ public async Task<List<string>> GetEndpointsAsync(BaseApmRequestDto query)
var period = GetPeriod(query);
var tableName = Constants.GetAggregateTable(period);
var (where, ors, parameters) = AppendWhere(query);
var sql = @$"select {StorageConstaaa.Current.Trace.URL}
var sql = @$"select {StorageConst.Current.Trace.URL}
from {tableName}
where {where}
group by ServiceName,{StorageConstaaa.Current.Trace.URL}
order by {StorageConstaaa.Current.Trace.URL}";
group by ServiceName,{StorageConst.Current.Trace.URL}
order by {StorageConst.Current.Trace.URL}";
var result = new List<string>();
using var reader = await Query(sql, parameters);
while (await reader.NextResultAsync())
Expand Down Expand Up @@ -330,7 +330,7 @@ public async Task<PaginatedListBase<TraceResponseDto>> TraceLatencyDetailAsync(A
{
conditions.Add(new FieldConditionDto
{
Name = StorageConstaaa.Current.Environment,
Name = StorageConst.Current.Environment,
Type = ConditionTypes.Equal,
Value = query.Env
});
Expand All @@ -340,7 +340,7 @@ public async Task<PaginatedListBase<TraceResponseDto>> TraceLatencyDetailAsync(A
{
conditions.Add(new FieldConditionDto
{
Name = StorageConstaaa.Current.Trace.Duration,
Name = StorageConst.Current.Trace.Duration,
Type = ConditionTypes.GreatEqual,
Value = (long)(query.LatMin.Value * MILLSECOND),
});
Expand All @@ -351,7 +351,7 @@ public async Task<PaginatedListBase<TraceResponseDto>> TraceLatencyDetailAsync(A
|| query.LatMin.HasValue && query.LatMax - query.LatMin.Value > 0))
conditions.Add(new FieldConditionDto
{
Name = StorageConstaaa.Current.Trace.Duration,
Name = StorageConst.Current.Trace.Duration,
Type = ConditionTypes.LessEqual,
Value = (long)(query.LatMax.Value * MILLSECOND),
});
Expand Down Expand Up @@ -388,11 +388,11 @@ public async Task<PaginatedListBase<SimpleTraceListDto>> GetSimpleTraceListAsync

private static SimpleTraceListDto ToSampleTraceListDto(IDataReader reader)
{
var startTime = Convert.ToDateTime(reader[StorageConstaaa.Current.Timestimap]);
var startTime = Convert.ToDateTime(reader[StorageConst.Current.Timestimap]);
long ns = Convert.ToInt64(reader["Duration"]);
var result = new SimpleTraceListDto
{
TraceId = reader[StorageConstaaa.Current.TraceId].ToString()!,
TraceId = reader[StorageConst.Current.TraceId].ToString()!,
Timestamp = startTime,
EndTimestamp = startTime.AddMilliseconds(ns / 1e6),
};
Expand Down Expand Up @@ -656,17 +656,17 @@ private static (string where, List<string> ors, List<ClickHouseParameter> parame
{
List<ClickHouseParameter> parameters = new();
var sql = new StringBuilder();
sql.AppendLine($" {StorageConstaaa.Current.Timestimap} between @startTime and @endTime");
sql.AppendLine($" {StorageConst.Current.Timestimap} between @startTime and @endTime");
parameters.Add(new ClickHouseParameter { ParameterName = "startTime", Value = MasaStackClickhouseConnection.ToTimeZone(query.Start), DbType = DbType.DateTime });
parameters.Add(new ClickHouseParameter { ParameterName = "endTime", Value = MasaStackClickhouseConnection.ToTimeZone(query.End), DbType = DbType.DateTime });
if (!string.IsNullOrEmpty(query.Env))
{
sql.AppendLine($" and {StorageConstaaa.Current.Environment}=@environment");
sql.AppendLine($" and {StorageConst.Current.Environment}=@environment");
parameters.Add(new ClickHouseParameter { ParameterName = "environment", Value = query.Env });
}
if (!string.IsNullOrEmpty(query.Service))
{
sql.AppendLine($" and {StorageConstaaa.Current.ServiceName}=@serviceName");
sql.AppendLine($" and {StorageConst.Current.ServiceName}=@serviceName");
parameters.Add(new ClickHouseParameter { ParameterName = "serviceName", Value = query.Service });
}
//if (query.IsServer.HasValue && (query.IsMetric == null || !query.IsMetric.Value))
Expand Down Expand Up @@ -703,42 +703,42 @@ private static List<string> AppendRawQuery<TQuery>(TQuery query, List<ClickHouse
{
if (str.Length - 32 == 0)
{
list.Add($" and {StorageConstaaa.Current.TraceId}='{str}'");
list.Add($" and {StorageConst.Current.TraceId}='{str}'");
}
else
{
list.Add($" and {StorageConstaaa.Current.Trace.UserId}='{str}'");
list.Add($" and {StorageConst.Current.Trace.UserId}='{str}'");
}
return list;
}

//status_code
if (int.TryParse(str, out int num) && num - -1 >= 0 && num - 600 < 0 && isTrace)
{
list.Add($" and {StorageConstaaa.Current.Trace.HttpStatusCode}='{query.Queries}'");
list.Add($" and {StorageConst.Current.Trace.HttpStatusCode}='{query.Queries}'");
return list;
}

//exception
if (str.EndsWith("exception", StringComparison.CurrentCultureIgnoreCase) && Regex.IsMatch(str, @"[\da-zA-Z]+"))
{
list.Add($" and {StorageConstaaa.Current.ExceptionType} = '{str}'");
list.Add($" and {StorageConst.Current.ExceptionType} = '{str}'");
return list;
}

if (isLog)
{
list.Add(ClickhouseHelper.AppendLike(StorageConstaaa.Current.Log.Body, "p1", str));
list.Add(ClickhouseHelper.AppendLike(StorageConst.Current.Log.Body, "p1", str));

}
else if (isTrace)
{
list.Add(ClickhouseHelper.AppendLike(StorageConstaaa.Current.Trace.URL, "p1", str));
list.Add(ClickhouseHelper.AppendLike(StorageConstaaa.Current.Trace.HttpRequestBody, "p1", str));
list.Add(ClickhouseHelper.AppendLike(StorageConst.Current.Trace.URL, "p1", str));
list.Add(ClickhouseHelper.AppendLike(StorageConst.Current.Trace.HttpRequestBody, "p1", str));
}

if (!isTrace)
list.Add(ClickhouseHelper.AppendLike(StorageConstaaa.Current.ExceptionMessage, "p1", str));
list.Add(ClickhouseHelper.AppendLike(StorageConst.Current.ExceptionMessage, "p1", str));

parameters.Add(ClickhouseHelper.GetLikeParameter("p1", str));
return list;
Expand All @@ -765,12 +765,12 @@ private static void AppendEndpoint(ApmEndpointRequestDto? traceQuery, StringBuil
var name = "endpoint";
if (traceQuery.IsLog.HasValue && traceQuery.IsLog.Value)
{
sql.AppendLine($" and {ClickhouseHelper.GetName(StorageConstaaa.Current.Log.Url, true)} like @{name}");
sql.AppendLine($" and {ClickhouseHelper.GetName(StorageConst.Current.Log.Url, true)} like @{name}");
parameters.Add(new ClickHouseParameter { ParameterName = name, Value = $"{traceQuery.Endpoint}%" });
}
else
{
sql.AppendLine($" and {StorageConstaaa.Current.Trace.URL}=@{name}");
sql.AppendLine($" and {StorageConst.Current.Trace.URL}=@{name}");
parameters.Add(new ClickHouseParameter { ParameterName = name, Value = traceQuery.Endpoint });
}
}
Expand All @@ -780,12 +780,12 @@ private static void AppendDuration(ApmTraceLatencyRequestDto? query, StringBuild
if (query == null || !query.LatMin.HasValue && !query.LatMax.HasValue || query.IsMetric != null && query.IsMetric.Value) return;
if (query.LatMin.HasValue && query.LatMin > 0)
{
sql.AppendLine($" and {StorageConstaaa.Current.Trace.Duration} >=@minDuration");
sql.AppendLine($" and {StorageConst.Current.Trace.Duration} >=@minDuration");
parameters.Add(new ClickHouseParameter { ParameterName = "minDuration", Value = (long)(query.LatMin * MILLSECOND) });
}
if (query.LatMax.HasValue && query.LatMax > 0)
{
sql.AppendLine($" and {StorageConstaaa.Current.Trace.Duration} <=@maxDuration");
sql.AppendLine($" and {StorageConst.Current.Trace.Duration} <=@maxDuration");
parameters.Add(new ClickHouseParameter { ParameterName = "maxDuration", Value = (long)(query.LatMax * MILLSECOND) });
}
}
Expand Down
Loading

0 comments on commit fde9922

Please sign in to comment.