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

Jump to bottom

Improve MetricEventSource error message #55319

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Improve MetricEventSource error message #55319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .../System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ public void EndInstrumentReporting(string sessionId, string meterName, string? m
}

[Event(9, Keywords = Keywords.TimeSeriesValues | Keywords.Messages | Keywords.InstrumentPublishing)]
public void Error(string sessionId, string errorMessage, string errorStack)
public void Error(string sessionId, string errorMessage)
{
WriteEvent(9, sessionId, errorMessage, errorStack);
WriteEvent(9, sessionId, errorMessage);
}

[Event(10, Keywords = Keywords.TimeSeriesValues | Keywords.InstrumentPublishing)]
Expand Down Expand Up @@ -203,7 +203,7 @@ public void OnEventCommand(EventCommandEventArgs command)
// This limitation shouldn't really matter because browser also doesn't support out-of-proc EventSource communication
// which is the intended scenario for this EventSource. If it matters in the future AggregationManager can be
// modified to have some other fallback path that works for browser.
Log.Error("", "System.Diagnostics.Metrics EventSource not supported on browser", "");
Log.Error("", "System.Diagnostics.Metrics EventSource not supported on browser");
return;
}
#endif
Expand Down Expand Up @@ -301,7 +301,7 @@ public void OnEventCommand(EventCommandEventArgs command)
i => Log.EndInstrumentReporting(sessionId, i.Meter.Name, i.Meter.Version, i.Name, i.GetType().Name, i.Unit, i.Description),
i => Log.InstrumentPublished(sessionId, i.Meter.Name, i.Meter.Version, i.Name, i.GetType().Name, i.Unit, i.Description),
() => Log.InitialInstrumentEnumerationComplete(sessionId),
e => Log.Error(sessionId, e.Message, e.StackTrace?.ToString() ?? ""),
e => Log.Error(sessionId, e.ToString()),
() => Log.TimeSeriesLimitReached(sessionId),
() => Log.HistogramLimitReached(sessionId));

Expand All @@ -328,7 +328,7 @@ public void OnEventCommand(EventCommandEventArgs command)

private bool LogError(Exception e)
{
Log.Error(_sessionId, e.Message, e.StackTrace?.ToString() ?? "");
Log.Error(_sessionId, e.ToString());
// this code runs as an exception filter
// returning false ensures the catch handler isn't run
return false;
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/System.Diagnostics.DiagnosticSource/tests/MetricEventSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,7 @@ private void AssertOnError()
if (errorEvent != null)
{
string message = errorEvent.Payload[1].ToString();
string stackTrace = errorEvent.Payload[2].ToString();
Assert.True(errorEvent == null, "Unexpected Error event: " + message + Environment.NewLine + stackTrace);
Assert.True(errorEvent == null, "Unexpected Error event: " + message);
}
}
}
Expand Down