Skip to content

Commit 042ea74

Browse files
edwardnealbenrr101
edwardneal
and
benrr101
authored
Merge | Merge metrics/performance counter methodology (#3251)
* Merge event counters and performance counters Move functionality into a new Microsoft.Data.SqlClient.Diagnostics.SqlClientMetrics type. This common interface encapsulates both event counters and performance counters. * Correct null coalescing behaviour * Widened existing EventCounter tests to include PerformanceCounters * Merge into one file, reduce conditional compilation branches * Account for the removal of InternalsVisibleTo --------- Co-authored-by: Ben Russell <[email protected]>
1 parent e4ff371 commit 042ea74

File tree

14 files changed

+836
-1199
lines changed

14 files changed

+836
-1199
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@
227227
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.netcore.cs">
228228
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.netcore.cs</Link>
229229
</Compile>
230+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs">
231+
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs</Link>
232+
</Compile>
230233
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.netcore.cs">
231234
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.netcore.cs</Link>
232235
</Compile>
@@ -745,7 +748,6 @@
745748
<Compile Include="Microsoft\Data\SqlClient\SNI\SSRP.cs" />
746749
<Compile Include="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />
747750
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
748-
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
749751
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
750752
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
751753
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />

0 commit comments

Comments
 (0)