Skip to content

Commit 3a9410a

Browse files
andrewlockandrewlock
authored
Add support for Microsoft.Data.SqlClient 6.x.x (#6638)
## Summary of changes Adds support for Microsoft.Data.SqlClient 6.x.x ## Reason for change We want to support the latest versions of the packages ## Implementation details Bump the numbers and testing ## Test coverage Standard ## Other details Fixes #6637
1 parent 284b530 commit 3a9410a

12 files changed

+107
-40
lines changed

‎tracer/build/PackageVersionsGeneratorDefinitions.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,21 @@
288288
"SampleProjectName": "Samples.Microsoft.Data.SqlClient",
289289
"NugetPackageSearchName": "Microsoft.Data.SqlClient",
290290
"MinVersion": "1.0.0",
291-
"MaxVersionExclusive": "6.0.0",
291+
"MaxVersionExclusive": "7.0.0",
292292
"SpecificVersions": [
293293
"1.*.*",
294294
"2.*.*",
295295
"3.*.*",
296296
"4.*.*",
297-
"5.*.*"
297+
"5.*.*",
298+
"6.*.*"
298299
],
299300
"VersionConditions": [{
300301
"MinVersion": "5.1.0",
301302
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0"]
303+
},{
304+
"MinVersion": "6.0.0",
305+
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0", "net6.0", "net7.0"]
302306
}]
303307
},
304308
{

‎tracer/build/PackageVersionsLatestMajors.g.props

+18
Original file line numberDiff line numberDiff line change
@@ -1680,6 +1680,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
16801680
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
16811681
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
16821682
</PackageVersionSample>
1683+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
1684+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1685+
<TargetFramework>net462</TargetFramework>
1686+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
1687+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
1688+
</PackageVersionSample>
16831689
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
16841690
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
16851691
<TargetFramework>netcoreapp2.1</TargetFramework>
@@ -1890,6 +1896,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
18901896
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
18911897
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
18921898
</PackageVersionSample>
1899+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
1900+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1901+
<TargetFramework>net8.0</TargetFramework>
1902+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
1903+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
1904+
</PackageVersionSample>
18931905
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
18941906
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
18951907
<TargetFramework>net9.0</TargetFramework>
@@ -1920,6 +1932,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
19201932
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
19211933
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
19221934
</PackageVersionSample>
1935+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
1936+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1937+
<TargetFramework>net9.0</TargetFramework>
1938+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
1939+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
1940+
</PackageVersionSample>
19231941
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
19241942
<Properties>ApiVersion=1.2.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
19251943
<TargetFramework>net462</TargetFramework>

‎tracer/build/PackageVersionsLatestMinors.g.props

+18
Original file line numberDiff line numberDiff line change
@@ -9018,6 +9018,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
90189018
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
90199019
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
90209020
</PackageVersionSample>
9021+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
9022+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
9023+
<TargetFramework>net462</TargetFramework>
9024+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
9025+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
9026+
</PackageVersionSample>
90219027
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
90229028
<Properties>ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
90239029
<TargetFramework>netcoreapp2.1</TargetFramework>
@@ -9456,6 +9462,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
94569462
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
94579463
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
94589464
</PackageVersionSample>
9465+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
9466+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
9467+
<TargetFramework>net8.0</TargetFramework>
9468+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
9469+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
9470+
</PackageVersionSample>
94599471
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
94609472
<Properties>ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
94619473
<TargetFramework>net9.0</TargetFramework>
@@ -9522,6 +9534,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
95229534
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
95239535
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
95249536
</PackageVersionSample>
9537+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
9538+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
9539+
<TargetFramework>net9.0</TargetFramework>
9540+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
9541+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
9542+
</PackageVersionSample>
95259543
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
95269544
<Properties>ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false</Properties>
95279545
<TargetFramework>net462</TargetFramework>

‎tracer/build/PackageVersionsLatestSpecific.g.props

+18
Original file line numberDiff line numberDiff line change
@@ -2526,6 +2526,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
25262526
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
25272527
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
25282528
</PackageVersionSample>
2529+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
2530+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2531+
<TargetFramework>net462</TargetFramework>
2532+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
2533+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
2534+
</PackageVersionSample>
25292535
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
25302536
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
25312537
<TargetFramework>netcoreapp2.1</TargetFramework>
@@ -2736,6 +2742,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
27362742
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
27372743
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
27382744
</PackageVersionSample>
2745+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
2746+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2747+
<TargetFramework>net8.0</TargetFramework>
2748+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
2749+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
2750+
</PackageVersionSample>
27392751
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
27402752
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
27412753
<TargetFramework>net9.0</TargetFramework>
@@ -2766,6 +2778,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
27662778
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
27672779
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
27682780
</PackageVersionSample>
2781+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
2782+
<Properties>ApiVersion=6.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2783+
<TargetFramework>net9.0</TargetFramework>
2784+
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
2785+
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
2786+
</PackageVersionSample>
27692787
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
27702788
<Properties>ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false</Properties>
27712789
<TargetFramework>net462</TargetFramework>

‎tracer/build/supported_calltargets.g.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -12916,7 +12916,7 @@
1291612916
"Item3": 0
1291712917
},
1291812918
"MaximumVersion": {
12919-
"Item1": 5,
12919+
"Item1": 6,
1292012920
"Item2": 65535,
1292112921
"Item3": 65535
1292212922
},
@@ -12941,7 +12941,7 @@
1294112941
"Item3": 0
1294212942
},
1294312943
"MaximumVersion": {
12944-
"Item1": 5,
12944+
"Item1": 6,
1294512945
"Item2": 65535,
1294612946
"Item3": 65535
1294712947
},
@@ -12963,7 +12963,7 @@
1296312963
"Item3": 0
1296412964
},
1296512965
"MaximumVersion": {
12966-
"Item1": 5,
12966+
"Item1": 6,
1296712967
"Item2": 65535,
1296812968
"Item3": 65535
1296912969
},
@@ -12987,7 +12987,7 @@
1298712987
"Item3": 0
1298812988
},
1298912989
"MaximumVersion": {
12990-
"Item1": 5,
12990+
"Item1": 6,
1299112991
"Item2": 65535,
1299212992
"Item3": 65535
1299312993
},
@@ -13009,7 +13009,7 @@
1300913009
"Item3": 0
1301013010
},
1301113011
"MaximumVersion": {
13012-
"Item1": 5,
13012+
"Item1": 6,
1301313013
"Item2": 65535,
1301413014
"Item3": 65535
1301513015
},
@@ -13033,7 +13033,7 @@
1303313033
"Item3": 0
1303413034
},
1303513035
"MaximumVersion": {
13036-
"Item1": 5,
13036+
"Item1": 6,
1303713037
"Item2": 65535,
1303813038
"Item3": 65535
1303913039
},
@@ -13055,7 +13055,7 @@
1305513055
"Item3": 0
1305613056
},
1305713057
"MaximumVersion": {
13058-
"Item1": 5,
13058+
"Item1": 6,
1305913059
"Item2": 65535,
1306013060
"Item3": 65535
1306113061
},
@@ -13079,7 +13079,7 @@
1307913079
"Item3": 0
1308013080
},
1308113081
"MaximumVersion": {
13082-
"Item1": 5,
13082+
"Item1": 6,
1308313083
"Item2": 65535,
1308413084
"Item3": 65535
1308513085
},
@@ -13103,7 +13103,7 @@
1310313103
"Item3": 0
1310413104
},
1310513105
"MaximumVersion": {
13106-
"Item1": 5,
13106+
"Item1": 6,
1310713107
"Item2": 65535,
1310813108
"Item3": 65535
1310913109
},
@@ -13128,7 +13128,7 @@
1312813128
"Item3": 0
1312913129
},
1313013130
"MaximumVersion": {
13131-
"Item1": 5,
13131+
"Item1": 6,
1313213132
"Item2": 65535,
1313313133
"Item3": 65535
1313413134
},
@@ -13150,7 +13150,7 @@
1315013150
"Item3": 0
1315113151
},
1315213152
"MaximumVersion": {
13153-
"Item1": 5,
13153+
"Item1": 6,
1315413154
"Item2": 65535,
1315513155
"Item3": 65535
1315613156
},
@@ -13174,7 +13174,7 @@
1317413174
"Item3": 0
1317513175
},
1317613176
"MaximumVersion": {
13177-
"Item1": 5,
13177+
"Item1": 6,
1317813178
"Item2": 65535,
1317913179
"Item3": 65535
1318013180
},
@@ -13196,7 +13196,7 @@
1319613196
"Item3": 0
1319713197
},
1319813198
"MaximumVersion": {
13199-
"Item1": 5,
13199+
"Item1": 6,
1320013200
"Item2": 65535,
1320113201
"Item3": 65535
1320213202
},
@@ -13220,7 +13220,7 @@
1322013220
"Item3": 0
1322113221
},
1322213222
"MaximumVersion": {
13223-
"Item1": 5,
13223+
"Item1": 6,
1322413224
"Item2": 65535,
1322513225
"Item3": 65535
1322613226
},
@@ -13244,7 +13244,7 @@
1324413244
"Item3": 0
1324513245
},
1324613246
"MaximumVersion": {
13247-
"Item1": 5,
13247+
"Item1": 6,
1324813248
"Item2": 65535,
1324913249
"Item3": 65535
1325013250
},
@@ -13266,7 +13266,7 @@
1326613266
"Item3": 0
1326713267
},
1326813268
"MaximumVersion": {
13269-
"Item1": 5,
13269+
"Item1": 6,
1327013270
"Item2": 65535,
1327113271
"Item3": 65535
1327213272
},
@@ -13290,7 +13290,7 @@
1329013290
"Item3": 0
1329113291
},
1329213292
"MaximumVersion": {
13293-
"Item1": 5,
13293+
"Item1": 6,
1329413294
"Item2": 65535,
1329513295
"Item3": 65535
1329613296
},

‎tracer/build/supported_versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@
11301130
"minVersionTestedInclusive": "1.1.4",
11311131
"maxVersionSupportedInclusive": "5.2.2",
11321132
"maxVersionAvailableInclusive": "6.0.1",
1133-
"maxVersionTestedInclusive": "5.2.2"
1133+
"maxVersionTestedInclusive": "6.0.1"
11341134
}
11351135
]
11361136
},

‎tracer/dependabot/Datadog.Dependabot.Integrations.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<!-- Integration: Microsoft.Data.SqlClient -->
177177
<!-- Assembly: Microsoft.Data.SqlClient -->
178178
<!-- Latest package https://www.nuget.org/packages/Microsoft.Data.SqlClient/6.0.1 -->
179-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
179+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
180180

181181
<!-- Integration: Microsoft.Data.Sqlite -->
182182
<!-- Assembly: Microsoft.Data.Sqlite -->

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
AssemblyName = "Microsoft.Data.SqlClient",
7474
TypeName = "Microsoft.Data.SqlClient.SqlCommand",
7575
MinimumVersion = "1.0.0",
76-
MaximumVersion = "5.*.*",
76+
MaximumVersion = "6.*.*",
7777
IntegrationName = nameof(IntegrationId.SqlClient),
7878
DataReaderType = "Microsoft.Data.SqlClient.SqlDataReader",
7979
DataReaderTaskType = "System.Threading.Tasks.Task`1[Microsoft.Data.SqlClient.SqlDataReader]",
@@ -143,7 +143,7 @@
143143
AssemblyName = "Microsoft.Data.SqlClient",
144144
TypeName = "Microsoft.Data.SqlClient.SqlDataReader",
145145
MinimumVersion = "1.0.0",
146-
MaximumVersion = "5.*.*",
146+
MaximumVersion = "6.*.*",
147147
IntegrationName = nameof(IntegrationId.SqlClient),
148148
DataReaderType = TypeNames.DbDataReaderType,
149149
DataReaderTaskType = TypeNames.DbDataReaderTaskType,

0 commit comments

Comments
 (0)