Skip to content

Commit 48dc661

Browse files
nnhynnhy
committed
采样明细数据，显示ClientId，方便查IP
1 parent bad7b76 commit 48dc661

File tree

9 files changed

+42
-22
lines changed

9 files changed

+42
-22
lines changed

‎DLL/NewLife.Core.dll

929 KB
Binary file not shown.

‎DLL/XCode.dll

681 KB
Binary file not shown.

‎Stardust.Data/Monitors/Build.tt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#@ template language="C#" hostSpecific="true" debug="true" #>
2-
<#@ assembly name="$(ProjectDir)\$(OutputPath)\NewLife.Core.dll" #>
3-
<#@ assembly name="$(ProjectDir)\$(OutputPath)\XCode.dll" #>
2+
<#@ assembly name="$(SolutionDir)\DLL\NewLife.Core.dll" #>
3+
<#@ assembly name="$(SolutionDir)\DLL\XCode.dll" #>
44
<#@ import namespace="System.Diagnostics" #>
55
<#@ import namespace="System.IO" #>
66
<#@ import namespace="XCode.Code" #>

‎Stardust.Data/Monitors/Data/machine_info.json

-17
This file was deleted.

‎Stardust.Data/Monitors/Model.xml

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

‎Stardust.Data/Monitors/采样数据.Biz.cs

+1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public static IList<SampleData> Create(TraceData data, IList<ISpan> spans, Boole
151151
Id = snow.NewId(),
152152
DataId = data.Id,
153153
AppId = data.AppId,
154+
ClientId = data.ClientId,
154155
Name = data.Name,
155156

156157
TraceId = item.TraceId,

‎Stardust.Data/Monitors/采样数据.cs

+16
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ public partial class SampleData
8484
[BindColumn("Cost", "耗时。毫秒", "")]
8585
public Int32 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } }
8686

87+
private String _ClientId;
88+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
89+
[DisplayName("实例")]
90+
[Description("实例。应用可能多实例部署，ip@proccessid")]
91+
[DataObjectField(false, false, true, 50)]
92+
[BindColumn("ClientId", "实例。应用可能多实例部署，ip@proccessid", "")]
93+
public String ClientId { get => _ClientId; set { if (OnPropertyChanging("ClientId", value)) { _ClientId = value; OnPropertyChanged("ClientId"); } } }
94+
8795
private String _TraceId;
8896
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
8997
[DisplayName("追踪标识")]
@@ -159,6 +167,7 @@ public override Object this[String name]
159167
case "StartTime": return _StartTime;
160168
case "EndTime": return _EndTime;
161169
case "Cost": return _Cost;
170+
case "ClientId": return _ClientId;
162171
case "TraceId": return _TraceId;
163172
case "SpanId": return _SpanId;
164173
case "ParentId": return _ParentId;
@@ -181,6 +190,7 @@ public override Object this[String name]
181190
case "StartTime": _StartTime = value.ToLong(); break;
182191
case "EndTime": _EndTime = value.ToLong(); break;
183192
case "Cost": _Cost = value.ToInt(); break;
193+
case "ClientId": _ClientId = Convert.ToString(value); break;
184194
case "TraceId": _TraceId = Convert.ToString(value); break;
185195
case "SpanId": _SpanId = Convert.ToString(value); break;
186196
case "ParentId": _ParentId = Convert.ToString(value); break;
@@ -222,6 +232,9 @@ public partial class _
222232
/// <summary>耗时。毫秒</summary>
223233
public static readonly Field Cost = FindByName("Cost");
224234

235+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
236+
public static readonly Field ClientId = FindByName("ClientId");
237+
225238
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
226239
public static readonly Field TraceId = FindByName("TraceId");
227240

@@ -273,6 +286,9 @@ public partial class __
273286
/// <summary>耗时。毫秒</summary>
274287
public const String Cost = "Cost";
275288

289+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
290+
public const String ClientId = "ClientId";
291+
276292
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
277293
public const String TraceId = "TraceId";
278294

‎Stardust.Data/Monitors/采样数据2.cs

+16
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ public partial class SampleData2
8383
[BindColumn("Cost", "耗时。毫秒", "")]
8484
public Int32 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } }
8585

86+
private String _ClientId;
87+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
88+
[DisplayName("实例")]
89+
[Description("实例。应用可能多实例部署，ip@proccessid")]
90+
[DataObjectField(false, false, true, 50)]
91+
[BindColumn("ClientId", "实例。应用可能多实例部署，ip@proccessid", "")]
92+
public String ClientId { get => _ClientId; set { if (OnPropertyChanging("ClientId", value)) { _ClientId = value; OnPropertyChanged("ClientId"); } } }
93+
8694
private String _TraceId;
8795
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
8896
[DisplayName("追踪标识")]
@@ -174,6 +182,7 @@ public override Object this[String name]
174182
case "StartTime": return _StartTime;
175183
case "EndTime": return _EndTime;
176184
case "Cost": return _Cost;
185+
case "ClientId": return _ClientId;
177186
case "TraceId": return _TraceId;
178187
case "SpanId": return _SpanId;
179188
case "ParentId": return _ParentId;
@@ -198,6 +207,7 @@ public override Object this[String name]
198207
case "StartTime": _StartTime = value.ToLong(); break;
199208
case "EndTime": _EndTime = value.ToLong(); break;
200209
case "Cost": _Cost = value.ToInt(); break;
210+
case "ClientId": _ClientId = Convert.ToString(value); break;
201211
case "TraceId": _TraceId = Convert.ToString(value); break;
202212
case "SpanId": _SpanId = Convert.ToString(value); break;
203213
case "ParentId": _ParentId = Convert.ToString(value); break;
@@ -241,6 +251,9 @@ public partial class _
241251
/// <summary>耗时。毫秒</summary>
242252
public static readonly Field Cost = FindByName("Cost");
243253

254+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
255+
public static readonly Field ClientId = FindByName("ClientId");
256+
244257
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
245258
public static readonly Field TraceId = FindByName("TraceId");
246259

@@ -298,6 +311,9 @@ public partial class __
298311
/// <summary>耗时。毫秒</summary>
299312
public const String Cost = "Cost";
300313

314+
/// <summary>实例。应用可能多实例部署，ip@proccessid</summary>
315+
public const String ClientId = "ClientId";
316+
301317
/// <summary>追踪标识。可用于关联多个片段，建立依赖关系，随线程上下文、Http、Rpc传递</summary>
302318
public const String TraceId = "TraceId";
303319

‎Stardust.Web/Views/Trace/Index.cshtml

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

0 commit comments

Comments
 (0)