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

Log more info when perf counter category is missing #60955

Merged
merged 3 commits into from
Oct 29, 2021
Merged

Log more info when perf counter category is missing #60955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee153bd
Better perf ctr detail
danmoseley Oct 28, 2021
f3ca6f9
ypot
danmoseley Oct 28, 2021
211853a
Update src/libraries/System.Diagnostics.PerformanceCounter/src/System…
danmoseley Oct 29, 2021
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
21 changes: 9 additions & 12 deletions src/libraries/System.Diagnostics.PerformanceCounter/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@
<value>Instance '{0}' does not exist in the specified Category.</value>
</data>
<data name="CantReadCategoryIndex" xml:space="preserve">
<value>Could not Read Category Index: {0}.</value>
</data>
<data name="MissingCategory" xml:space="preserve">
<value>Category does not exist.</value>
<value>Could not read Category Index '{0}'.</value>
</data>
<data name="CounterLayout" xml:space="preserve">
<value>The Counter layout for the Category specified is invalid, a counter of the type: AverageCount64, AverageTimer32, CounterMultiTimer, CounterMultiTimerInverse, CounterMultiTimer100Ns, CounterMultiTimer100NsInverse, RawFraction, or SampleFraction has to be immediately followed by any of the base counter types: AverageBase, CounterMultiBase, RawBase or SampleBase.</value>
Expand All @@ -194,17 +191,17 @@
<data name="HelpNotAvailable" xml:space="preserve">
<value>Help Not Available</value>
</data>
<data name="MissingCategoryDetail" xml:space="preserve">
<value>Category {0} does not exist.</value>
<data name="MissingCategory" xml:space="preserve">
<value>Category '{0}' does not exist.</value>
</data>
<data name="MissingCounter" xml:space="preserve">
<value>Counter {0} does not exist.</value>
<value>Counter '{0}' does not exist.</value>
</data>
<data name="CantChangeCategoryRegistration" xml:space="preserve">
<value>Cannot create or delete the Performance Category '{0}' because access is denied.</value>
</data>
<data name="InvalidProperty" xml:space="preserve">
<value>Invalid value {1} for property {0}.</value>
<value>Invalid value '{1}' for property '{0}'.</value>
</data>
<data name="CategoryNameNotSet" xml:space="preserve">
<value>Category name property has not been set.</value>
Expand All @@ -228,7 +225,7 @@
<value>Invalid empty or null string for counter name.</value>
</data>
<data name="DuplicateCounterName" xml:space="preserve">
<value>Cannot create Performance Category with counter name {0} because the name is a duplicate.</value>
<value>Cannot create Performance Category with counter name '{0}' because the name is a duplicate.</value>
</data>
<data name="CantDeleteCategory" xml:space="preserve">
<value>Cannot delete Performance Category because this category is not registered or is a system category.</value>
Expand All @@ -237,7 +234,7 @@
<value>Counter is not single instance, an instance name needs to be specified.</value>
</data>
<data name="MissingInstance" xml:space="preserve">
<value>Instance {0} does not exist in category {1}.</value>
<value>Instance '{0}' does not exist in category '{1}'.</value>
</data>
<data name="CantSetLifetimeAfterInitialized" xml:space="preserve">
<value>The InstanceLifetime cannot be set after the instance has been initialized. You must use the default constructor and set the CategoryName, InstanceName, CounterName, InstanceLifetime and ReadOnly properties manually before setting the RawValue.</value>
Expand Down Expand Up @@ -279,13 +276,13 @@
<value>Cannot initialize security descriptor initialized.</value>
</data>
<data name="RegKeyMissingShort" xml:space="preserve">
<value>Cannot open registry key {0} on computer {1}.</value>
<value>Cannot open registry key '{0}' on computer '{1}'</value>
</data>
<data name="CantGetMappingSize" xml:space="preserve">
<value>Cannot calculate the size of the file view.</value>
</data>
<data name="CantReadCategory" xml:space="preserve">
<value>Cannot read Category {0}.</value>
<value>Cannot read Category '{0}'.</value>
</data>
<data name="PlatformNotSupported_PerfCounters" xml:space="preserve">
<value>Performance Counters are not supported on this platform.</value>
Expand Down
16 changes: 10 additions & 6 deletions ...ies/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,12 @@ internal static bool CounterExists(string machine, string category, string count

if (!categoryExists)
{
// Consider adding diagnostic logic here, may be we can dump the nameTable...
throw new InvalidOperationException(SR.MissingCategory);
#if DEBUG
string categories = "Categories: " + string.Join(';', library.GetCategories());
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category) + "\r\n" + categories);
#else
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category));
#endif
}

return counterExists;
Expand Down Expand Up @@ -792,7 +796,7 @@ internal static string GetCategoryHelp(string machine, string category)
help = library.GetCategoryHelp(category);

if (help == null)
throw new InvalidOperationException(SR.MissingCategory);
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category));

return help;
}
Expand Down Expand Up @@ -823,7 +827,7 @@ internal static CategorySample GetCategorySample(string machine, string category
}
}
if (sample == null)
throw new InvalidOperationException(SR.MissingCategory);
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category));

return sample;
}
Expand Down Expand Up @@ -864,7 +868,7 @@ internal static string[] GetCounters(string machine, string category)
}

if (!categoryExists)
throw new InvalidOperationException(SR.MissingCategory);
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category));

return counters;
}
Expand Down Expand Up @@ -929,7 +933,7 @@ internal static string GetCounterHelp(string machine, string category, string co
help = library.GetCounterHelp(category, counter, ref categoryExists);

if (!categoryExists)
throw new InvalidOperationException(SR.Format(SR.MissingCategoryDetail, category));
throw new InvalidOperationException(SR.Format(SR.MissingCategory, category));

return help;
}
Expand Down