8000 Merge | Merge metrics/performance counter methodology by edwardneal · Pull Request #3251 · dotnet/SqlClient · GitHub
[go: up one dir, main page]
Skip to content

Merge | Merge metrics/performance counter methodology #3251

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
merged 8 commits into from
Apr 21, 2025
Merged

Merge | Merge metrics/performance counter methodology #3251

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7d9ca2
Merge event counters and performance counters
edwardneal Mar 25, 2025
b3706d0
Merge branch 'main' into merge/metrics
edwardneal Apr 1, 2025
06b837b
Correct null coalescing behaviour
edwardneal Apr 1, 2025
9613c3a
Widened existing EventCounter tests to include PerformanceCounters
edwardneal Apr 5, 2025
f6d3a6b
Merge into one file, reduce conditional compilation branches
edwardneal Apr 7, 2025
f0ccb5a
Merge branch 'main' into merge/metrics
edwardneal Apr 11, 2025
845903a
Account for the removal of InternalsVisibleTo
edwardneal Apr 11, 2025
1a82a49
Merge branch 'main' into merge/metrics
benrr101 Apr 16, 2025
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
Prev Previous commit
Next Next commit
Correct null coalescing behaviour
  • Loading branch information
@edwardneal
edwardneal committed Apr 1, 2025
commit 06b837be43ddcbdf7e6dd04d79113e390c780a01
2 changes: 1 addition & 1 deletion ...crosoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal sealed partial class SqlClientMetrics
{
// First try GetEntryAssembly name, then AppDomain.FriendlyName.
Assembly? assembly = Assembly.GetEntryAssembly();
AssemblyName? name = assembly.GetName();
AssemblyName? name = assembly?.GetName();

return name?.Name;
}
Expand Down
Loading
0