Skip to content

Commit ef8eaf2

Browse files
authored
Merge pull request #2530 from exceptionless/issue/reduce-stack-trace-dom-anchors
Simplify stack trace frame rendering
2 parents f99defa + 45c1007 commit ef8eaf2

16 files changed

Lines changed: 378 additions & 167 deletions

‎src/Exceptionless.Core/Utility/RandomEventGenerator.cs‎

Lines changed: 190 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private static string GenerateReferenceId()
178178
private List<Error>? _randomErrors;
179179
private List<SimpleError>? _randomSimpleErrors;
180180

181-
private Error GenerateError(int maxNesting = 3, int currentLevel = 0)
181+
internal Error GenerateError(int maxNesting = 3, int currentLevel = 0)
182182
{
183183
var error = new Error
184184
{
@@ -191,18 +191,15 @@ private Error GenerateError(int maxNesting = 3, int currentLevel = 0)
191191

192192
error.Data = GenerateErrorData();
193193

194-
var stack = new StackFrameCollection();
195-
for (int i = 0; i < RandomData.GetInt(2, 8); i++)
196-
stack.Add(GenerateStackFrame());
197-
error.StackTrace = stack;
194+
error.StackTrace = GenerateStackTrace(currentLevel == 0);
198195

199-
if (currentLevel < maxNesting && RandomData.GetBool())
196+
if (currentLevel < maxNesting && (currentLevel == 0 || RandomData.GetBool()))
200197
error.Inner = GenerateError(maxNesting, currentLevel + 1);
201198

202199
return error;
203200
}
204201

205-
private SimpleError GenerateSimpleError(int maxNesting = 3, int currentLevel = 0)
202+
internal SimpleError GenerateSimpleError(int maxNesting = 3, int currentLevel = 0)
206203
{
207204
var error = new SimpleError
208205
{
@@ -212,25 +209,203 @@ private SimpleError GenerateSimpleError(int maxNesting = 3, int currentLevel = 0
212209

213210
error.Data = GenerateErrorData();
214211

215-
error.StackTrace = RandomData.GetString();
212+
error.StackTrace = GenerateSimpleStackTrace();
216213

217-
if (currentLevel < maxNesting && RandomData.GetBool())
214+
if (currentLevel < maxNesting && (currentLevel == 0 || RandomData.GetBool()))
218215
error.Inner = GenerateSimpleError(maxNesting, currentLevel + 1);
219216

220217
return error;
221218
}
222219

223-
private static StackFrame GenerateStackFrame()
220+
private static StackFrameCollection GenerateStackTrace(bool isOuterError)
224221
{
225-
return new StackFrame
222+
var stackTrace = new StackFrameCollection();
223+
int frameCount = isOuterError ? RandomData.GetInt(18, 32) : RandomData.GetInt(4, 8);
224+
225+
for (int i = 0; i < frameCount; i++)
226+
stackTrace.Add(GenerateStackFrame(i));
227+
228+
return stackTrace;
229+
}
230+
231+
private static StackFrame GenerateStackFrame(int index)
232+
{
233+
return (index % 7) switch
226234
{
227-
DeclaringNamespace = Namespaces.Random(),
228-
DeclaringType = TypeNames.Random(),
229-
Name = MethodNames.Random(),
230-
Parameters = [new Parameter { Type = "String", Name = "path" }]
235+
0 => new StackFrame
236+
{
237+
DeclaringNamespace = "Exceptionless.Core.Pipeline",
238+
DeclaringType = "EventPipeline",
239+
Name = "RunAsync",
240+
GenericArguments = ["TEvent", "TContext"],
241+
Parameters =
242+
[
243+
new Parameter
244+
{
245+
TypeNamespace = "System.Collections.Generic",
246+
Type = "IReadOnlyCollection",
247+
Name = "events",
248+
GenericArguments = ["TEvent"]
249+
},
250+
new Parameter
251+
{
252+
TypeNamespace = "System.Threading",
253+
Type = "CancellationToken",
254+
Name = "cancellationToken"
255+
}
256+
],
257+
FileName = "/src/Exceptionless.Core/Pipeline/EventPipeline.cs",
258+
LineNumber = 84 + index,
259+
Column = 13,
260+
Data = new DataDictionary { ["ILOffset"] = 128 + index }
261+
},
262+
1 => new StackFrame
263+
{
264+
DeclaringNamespace = "Exceptionless.Core.Services",
265+
DeclaringType = "StackRollupService+<ProcessAsync>d__14",
266+
Name = "MoveNext",
267+
FileName = "/src/Exceptionless.Core/Services/StackRollupService.cs",
268+
LineNumber = 156 + index,
269+
Column = 17,
270+
Data = new DataDictionary { ["ILOffset"] = 64 + index }
271+
},
272+
2 => new StackFrame
273+
{
274+
DeclaringNamespace = "Foundatio.Repositories",
275+
DeclaringType = "ElasticRepositoryBase",
276+
Name = "FindAsync",
277+
GenericArguments = ["TDocument"],
278+
Parameters =
279+
[
280+
new Parameter
281+
{
282+
TypeNamespace = "Foundatio.Repositories.Models",
283+
Type = "RepositoryQuery",
284+
Name = "query",
285+
GenericArguments = ["TDocument"]
286+
},
287+
new Parameter
288+
{
289+
TypeNamespace = "System.Threading",
290+
Type = "CancellationToken",
291+
Name = "cancellationToken"
292+
}
293+
],
294+
FileName = "/_/src/Foundatio.Repositories/Repositories/ElasticRepositoryBase.cs",
295+
LineNumber = 312 + index,
296+
Column = 21,
297+
Data = new DataDictionary { ["ILOffset"] = 92 + index }
298+
},
299+
3 => new StackFrame
300+
{
301+
DeclaringNamespace = "Microsoft.AspNetCore.Mvc.Infrastructure",
302+
DeclaringType = "ControllerActionInvoker",
303+
Name = "InvokeActionMethodAsync",
304+
Parameters =
305+
[
306+
new Parameter
307+
{
308+
TypeNamespace = "Microsoft.AspNetCore.Mvc.Abstractions",
309+
Type = "ActionContext",
310+
Name = "actionContext"
311+
},
312+
new Parameter
313+
{
314+
TypeNamespace = "System.Collections.Generic",
315+
Type = "IDictionary",
316+
Name = "arguments",
317+
GenericArguments = ["String", "Object"]
318+
}
319+
],
320+
FileName = "/_/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs",
321+
LineNumber = 429 + index,
322+
Column = 9,
323+
Data = new DataDictionary { ["NativeOffset"] = 24 + index }
324+
},
325+
4 => new StackFrame
326+
{
327+
DeclaringNamespace = "Microsoft.AspNetCore.Routing",
328+
DeclaringType = "EndpointMiddleware",
329+
Name = "Invoke",
330+
Parameters =
331+
[
332+
new Parameter
333+
{
334+
TypeNamespace = "Microsoft.AspNetCore.Http",
335+
Type = "HttpContext",
336+
Name = "httpContext"
337+
}
338+
],
339+
FileName = "/_/src/Http/Routing/src/EndpointMiddleware.cs",
340+
LineNumber = 101 + index,
341+
Column = 13,
342+
ModuleId = 7,
343+
Data = new DataDictionary { ["ILOffset"] = 48 + index }
344+
},
345+
5 => new StackFrame
346+
{
347+
DeclaringNamespace = "System.Threading",
348+
DeclaringType = "ExecutionContext",
349+
Name = "RunInternal",
350+
Parameters =
351+
[
352+
new Parameter
353+
{
354+
TypeNamespace = "System.Threading",
355+
Type = "ExecutionContext",
356+
Name = "executionContext"
357+
},
358+
new Parameter
359+
{
360+
TypeNamespace = "System.Threading",
361+
Type = "ContextCallback",
362+
Name = "callback"
363+
},
364+
new Parameter { TypeNamespace = "System", Type = "Object", Name = "state" }
365+
],
366+
FileName = "/_/src/libraries/System.Private.CoreLib/src/System/Threading/ExecutionContext.cs",
367+
LineNumber = 179 + index,
368+
Column = 13,
369+
ModuleId = 1,
370+
Data = new DataDictionary { ["NativeOffset"] = 16 + index }
371+
},
372+
_ => new StackFrame
373+
{
374+
DeclaringNamespace = "System.Runtime.CompilerServices",
375+
DeclaringType = "AsyncTaskMethodBuilder",
376+
Name = "Start",
377+
GenericArguments = ["TStateMachine"],
378+
Parameters =
379+
[
380+
new Parameter
381+
{
382+
Type = "TStateMachine",
383+
Name = "stateMachine",
384+
GenericArguments = ["TStateMachine"]
385+
}
386+
],
387+
FileName = "/_/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs",
388+
LineNumber = 38 + index,
389+
Column = 9,
390+
ModuleId = 1,
391+
Data = new DataDictionary { ["ILOffset"] = 32 + index }
392+
}
231393
};
232394
}
233395

396+
private static string GenerateSimpleStackTrace()
397+
{
398+
return """
399+
at Exceptionless.Core.Pipeline.EventPipeline.RunAsync[TEvent,TContext](IReadOnlyCollection`1 events, CancellationToken cancellationToken) in /src/Exceptionless.Core/Pipeline/EventPipeline.cs:line 84
400+
at Exceptionless.Core.Services.StackRollupService.<ProcessAsync>d__14.MoveNext() in /src/Exceptionless.Core/Services/StackRollupService.cs:line 157
401+
at Foundatio.Repositories.ElasticRepositoryBase.FindAsync[TDocument](RepositoryQuery`1 query, CancellationToken cancellationToken) in /_/src/Foundatio.Repositories/Repositories/ElasticRepositoryBase.cs:line 314
402+
at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync(ActionContext actionContext, IDictionary`2 arguments) in /_/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs:line 432
403+
at Microsoft.AspNetCore.Routing.EndpointMiddleware.Invoke(HttpContext httpContext) in /_/src/Http/Routing/src/EndpointMiddleware.cs:line 105
404+
at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) in /_/src/libraries/System.Private.CoreLib/src/System/Threading/ExecutionContext.cs:line 184
405+
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start[TStateMachine](TStateMachine stateMachine) in /_/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs:line 44
406+
""";
407+
}
408+
234409
private static void AddSampleExtendedData(Event ev, string? identity)
235410
{
236411
var data = ev.Data ??= new DataDictionary();
@@ -469,22 +644,4 @@ private static DataDictionary GenerateErrorData()
469644
"Authentication", "Search", "Billing", "Notification", "Import"
470645
];
471646

472-
private static readonly List<string> Namespaces =
473-
[
474-
"System", "System.IO", "System.Net.Http",
475-
"Exceptionless.Core.Pipeline", "Exceptionless.Core.Services",
476-
"Foundatio.Jobs", "Foundatio.Repositories"
477-
];
478-
479-
private static readonly List<string> TypeNames =
480-
[
481-
"EventPipeline", "UsageService", "StackRepository",
482-
"EventPostsJob", "OrganizationController", "BillingManager"
483-
];
484-
485-
private static readonly List<string> MethodNames =
486-
[
487-
"ProcessAsync", "RunAsync", "GetByIdAsync",
488-
"SaveAsync", "HandleItemAsync", "ValidateAsync"
489-
];
490647
}

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/simple-stack-trace/simple-stack-trace.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
const errors = $derived(getErrors(error));
1717
</script>
1818

19-
<pre class="bg-muted/50 border-border rounded-xl border p-2 wrap-break-word whitespace-pre-wrap"><Code class="bg-transparent px-0 py-0"
19+
<pre class="bg-muted/50 border-border max-w-full overflow-x-auto rounded-xl border p-2 whitespace-pre"><Code class="bg-transparent px-0 py-0"
2020
>{#each errors.reverse() as error, index (index)}<SimpleStackTraceHeader {error} /><SimpleStackTraceFrames {error} />{#if index < errors.length - 1}<br
2121
/>{/if}{/each}</Code
2222
></pre>

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-file-name.svelte‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-generic-arguments.svelte‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-method-name.svelte‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-namespace.svelte‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-offset.svelte‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-parameter-generic-arguments.svelte‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-parameter-name.svelte‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Exceptionless.Web/ClientApp/src/lib/features/events/components/stack-trace/stack-trace-frame-parameter-namespace.svelte‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⌂ 换网址