NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

采样明细数据，显示ClientId，方便查IP

This commit is contained in:
大石头 2022-01-18 10:02:47 +08:00
parent bad7b767b4
commit 48dc6611b7
9 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DLL/NewLife.Core.dll Normal file
View File

Binary file not shown.

BIN
DLL/XCode.dll Normal file
View File

Binary file not shown.

4
Stardust.Data/Monitors/Build.tt
View File

@ -1,6 +1,6 @@
<#@ template language="C#" hostSpecific="true" debug="true" #>
<#@ assembly name="$(ProjectDir)\$(OutputPath)\NewLife.Core.dll" #>
<#@ assembly name="$(ProjectDir)\$(OutputPath)\XCode.dll" #>
<#@ assembly name="$(SolutionDir)\DLL\NewLife.Core.dll" #>
<#@ assembly name="$(SolutionDir)\DLL\XCode.dll" #>
<#@ import namespace="System.Diagnostics" #>
<#@ import namespace="System.IO" #>
<#@ import namespace="XCode.Code" #>

17
Stardust.Data/Monitors/Data/machine_info.json
View File

@ -1,17 +0,0 @@
{
"OSName": "Windows 11 家庭中文版",
"OSVersion": "10.0.22000.0",
"Product": "VivoBook_ASUSLaptop X415EA_V4200EA",
"Processor": "11th Gen Intel(R) Core(TM) i5-1135G7 @ 2.40GHz",
"CpuID": "BFEBFBFF000806C1",
"UUID": "02049C0D-3CBB-7544-AF9A-A8B065317CE9",
"Guid": "d8b5d5a7-a5be-45b1-bc3b-b67701460a93",
"DiskID": "0025_38A1_11D7_CC20.",
"Memory": 16859500544,
"AvailableMemory": 5194964992,
"CpuRate": 0.01795382,
"UplinkSpeed": 0,
"DownlinkSpeed": 0,
"Temperature": 17,
"Battery": 0.78
}

2
Stardust.Data/Monitors/Model.xml
View File

@ -69,6 +69,7 @@
<Column Name="StartTime" DataType="Int64" Description="开始时间。Unix毫秒" />
<Column Name="EndTime" DataType="Int64" Description="结束时间。Unix毫秒" />
<Column Name="Cost" DataType="Int32" Description="耗时。毫秒" />
<Column Name="ClientId" DataType="String" Description="实例。应用可能多实例部署，ip@proccessid" />
<Column Name="TraceId" DataType="String" Description="追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递" />
<Column Name="SpanId" DataType="String" Description="唯一标识。随线程上下文、Http、Rpc传递，作为内部片段的父级" />
<Column Name="ParentId" DataType="String" Description="父级标识" />
@ -92,6 +93,7 @@
<Column Name="StartTime" DataType="Int64" Description="开始时间。Unix毫秒" />
<Column Name="EndTime" DataType="Int64" Description="结束时间。Unix毫秒" />
<Column Name="Cost" DataType="Int32" Description="耗时。毫秒" />
<Column Name="ClientId" DataType="String" Description="实例。应用可能多实例部署，ip@proccessid" />
<Column Name="TraceId" DataType="String" Description="追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递" />
<Column Name="SpanId" DataType="String" Description="唯一标识。随线程上下文、Http、Rpc传递，作为内部片段的父级" />
<Column Name="ParentId" DataType="String" Description="父级标识" />

1
Stardust.Data/Monitors/采样数据.Biz.cs
View File

@ -151,6 +151,7 @@ namespace Stardust.Data.Monitors
Id = snow.NewId(),
DataId = data.Id,
AppId = data.AppId,
ClientId = data.ClientId,
Name = data.Name,
TraceId = item.TraceId,

16
Stardust.Data/Monitors/采样数据.cs
View File

@ -84,6 +84,14 @@ namespace Stardust.Data.Monitors
[BindColumn("Cost", "耗时。毫秒", "")]
public Int32 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } }
private String _ClientId;
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
[DisplayName("实例")]
[Description("实例。应用可能多实例部署，ip@proccessid")]
[DataObjectField(false, false, true, 50)]
[BindColumn("ClientId", "实例。应用可能多实例部署，ip@proccessid", "")]
public String ClientId { get => _ClientId; set { if (OnPropertyChanging("ClientId", value)) { _ClientId = value; OnPropertyChanged("ClientId"); } } }
private String _TraceId;
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
[DisplayName("追踪标识")]
@ -159,6 +167,7 @@ namespace Stardust.Data.Monitors
case "StartTime": return _StartTime;
case "EndTime": return _EndTime;
case "Cost": return _Cost;
case "ClientId": return _ClientId;
case "TraceId": return _TraceId;
case "SpanId": return _SpanId;
case "ParentId": return _ParentId;
@ -181,6 +190,7 @@ namespace Stardust.Data.Monitors
case "StartTime": _StartTime = value.ToLong(); break;
case "EndTime": _EndTime = value.ToLong(); break;
case "Cost": _Cost = value.ToInt(); break;
case "ClientId": _ClientId = Convert.ToString(value); break;
case "TraceId": _TraceId = Convert.ToString(value); break;
case "SpanId": _SpanId = Convert.ToString(value); break;
case "ParentId": _ParentId = Convert.ToString(value); break;
@ -222,6 +232,9 @@ namespace Stardust.Data.Monitors
/// <summary>耗时。毫秒</summary>
public static readonly Field Cost = FindByName("Cost");
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
public static readonly Field ClientId = FindByName("ClientId");
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
public static readonly Field TraceId = FindByName("TraceId");
@ -273,6 +286,9 @@ namespace Stardust.Data.Monitors
/// <summary>耗时。毫秒</summary>
public const String Cost = "Cost";
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
public const String ClientId = "ClientId";
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
public const String TraceId = "TraceId";

16
Stardust.Data/Monitors/采样数据2.cs
View File

@ -83,6 +83,14 @@ namespace Stardust.Data.Monitors
[BindColumn("Cost", "耗时。毫秒", "")]
public Int32 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } }
private String _ClientId;
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
[DisplayName("实例")]
[Description("实例。应用可能多实例部署，ip@proccessid")]
[DataObjectField(false, false, true, 50)]
[BindColumn("ClientId", "实例。应用可能多实例部署，ip@proccessid", "")]
public String ClientId { get => _ClientId; set { if (OnPropertyChanging("ClientId", value)) { _ClientId = value; OnPropertyChanged("ClientId"); } } }
private String _TraceId;
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
[DisplayName("追踪标识")]
@ -174,6 +182,7 @@ namespace Stardust.Data.Monitors
case "StartTime": return _StartTime;
case "EndTime": return _EndTime;
case "Cost": return _Cost;
case "ClientId": return _ClientId;
case "TraceId": return _TraceId;
case "SpanId": return _SpanId;
case "ParentId": return _ParentId;
@ -198,6 +207,7 @@ namespace Stardust.Data.Monitors
case "StartTime": _StartTime = value.ToLong(); break;
case "EndTime": _EndTime = value.ToLong(); break;
case "Cost": _Cost = value.ToInt(); break;
case "ClientId": _ClientId = Convert.ToString(value); break;
case "TraceId": _TraceId = Convert.ToString(value); break;
case "SpanId": _SpanId = Convert.ToString(value); break;
case "ParentId": _ParentId = Convert.ToString(value); break;
@ -241,6 +251,9 @@ namespace Stardust.Data.Monitors
/// <summary>耗时。毫秒</summary>
public static readonly Field Cost = FindByName("Cost");
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
public static readonly Field ClientId = FindByName("ClientId");
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
public static readonly Field TraceId = FindByName("TraceId");
@ -298,6 +311,9 @@ namespace Stardust.Data.Monitors
/// <summary>耗时。毫秒</summary>
public const String Cost = "Cost";
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
public const String ClientId = "ClientId";
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
public const String TraceId = "TraceId";

8
Stardust.Web/Views/Trace/Index.cshtml
View File

@ -32,9 +32,10 @@
<th class="text-center" style="min-width:134px;" title="开始时间。Unix毫秒"><a href="@Html.Raw(page.GetSortUrl("StartTime"))">开始时间</a></th>
<th class="text-center" style="min-width:134px;" title="结束时间。Unix毫秒"><a href="@Html.Raw(page.GetSortUrl("EndTime"))">结束时间</a></th>
<th class="text-center" title="耗时。毫秒"><a href="@Html.Raw(page.GetSortUrl("Cost"))">耗时</a></th>
<th class="text-center" title="追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递"><a href="@Html.Raw(page.GetSortUrl("TraceId"))">追踪标识</a></th>
<th class="text-center" title="实例。应用可能多实例部署，ip@proccessid"><a href="@Html.Raw(page.GetSortUrl("ClientId"))">追踪标识</a></th>
<th class="text-center" title="唯一标识。随线程上下文、Http、Rpc传递，作为内部片段的父级"><a href="@Html.Raw(page.GetSortUrl("SpanId"))">唯一标识</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("ParentId"))">父级标识</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateIP"))">创建地址</a></th>
<th class="text-center">操作</th>
</tr>
</thead>
@ -63,11 +64,12 @@
<i class="glyphicon glyphicon-@(entity.Success ? "ok" : "remove")" style="color: @(entity.Success ? "green" : "red");"></i>
</td>
<td class="text-center" title="@entity.StartTime">@entity.Start.ToFullString("")</td>
<td class="text-center" title="@entity.EndTime">@entity.End.ToFullString("")</td>
<td class="text-center" title="@entity.EndTime">@entity.End.ToString("HH:mm:ss")</td>
<td class="text-right">@entity.Cost.ToString("n0")</td>
<td>@entity.TraceId</td>
<td>@entity.ClientId</td>
<td>@entity.SpanId</td>
<td>@entity.ParentId</td>
<td>@entity.CreateIP</td>
<td class="text-center">
<a href="/monitors/sampledata/detail/@entity.Id">查看</a>
</td>