Skip to content

Change MetricSpec.TryParse to be Parse #78729

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

Merged
stephentoub merged 3 commits into from
Nov 27, 2022
Merged

Change MetricSpec.TryParse to be Parse #78729

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f701ddc
Change MetricSpec.TryParse to be Parse
stephentoub Nov 22, 2022
ad5a289
Update src/libraries/System.Diagnostics.DiagnosticSource/src/System/D…
stephentoub Nov 24, 2022
835e1c3
Merge branch 'dotnet:main' into metricparse
stephentoub Nov 27, 2022
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
31 changes: 12 additions & 19 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 @@ -386,24 +386,19 @@ private void ParseSpecs(string? metricsSpecs)
{
return;
}

string[] specStrings = metricsSpecs.Split(s_instrumentSeparators, StringSplitOptions.RemoveEmptyEntries);
foreach (string specString in specStrings)
{
if (!MetricSpec.TryParse(specString, out MetricSpec spec))
MetricSpec spec = MetricSpec.Parse(specString);
Parent.Message($"Parsed metric: {spec}");
if (spec.InstrumentName != null)
{
Parent.Message($"Failed to parse metric spec: {specString}");
_aggregationManager!.Include(spec.MeterName, spec.InstrumentName);
}
else
{
Parent.Message($"Parsed metric: {spec}");
if (spec.InstrumentName != null)
{
_aggregationManager!.Include(spec.MeterName, spec.InstrumentName);
}
else
{
_aggregationManager!.Include(spec.MeterName);
}
_aggregationManager!.Include(spec.MeterName);
}
}
}
Expand Down Expand Up @@ -467,20 +462,18 @@ public MetricSpec(string meterName, string? instrumentName)
InstrumentName = instrumentName;
}

public static bool TryParse(string text, out MetricSpec spec)
public static MetricSpec Parse(string text)
{
int slashIdx = text.IndexOf(MeterInstrumentSeparator);
if (slashIdx == -1)
if (slashIdx < 0)
{
spec = new MetricSpec(text.Trim(), null);
return true;
return new MetricSpec(text.Trim(), null);
}
else
{
string meterName = text.Substring(0, slashIdx).Trim();
string? instrumentName = text.Substring(slashIdx + 1).Trim();
spec = new MetricSpec(meterName, instrumentName);
return true;
string meterName = text.AsSpan(0, slashIdx).Trim().ToString();
string? instrumentName = text.AsSpan(slashIdx + 1).Trim().ToString();
return new MetricSpec(meterName, instrumentName);
}
}

Expand Down