Skip to content

Add support for Microsoft.Data.SqlClient 7.0.0 #8345

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

Closed
bouwkast wants to merge 1 commit into from
Closed

Add support for Microsoft.Data.SqlClient 7.0.0 #8345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,15 @@
"SampleProjectName": "Samples.Microsoft.Data.SqlClient",
"NugetPackageSearchName": "Microsoft.Data.SqlClient",
"MinVersion": "1.0.0",
"MaxVersionExclusive": "7.0.0",
"MaxVersionExclusive": "8.0.0",
"SpecificVersions": [
"1.*.*",
"2.*.*",
"3.*.*",
"4.*.*",
"5.*.*",
"6.*.*"
"6.*.*",
"7.*.*"
],
"VersionConditions": [{
"MinVersion": "5.1.0",
Expand Down
24 changes: 24 additions & 0 deletions tracer/build/PackageVersionsLatestMajors.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2772,6 +2772,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -2988,6 +2994,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand Down Expand Up @@ -3024,6 +3036,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
Expand Down Expand Up @@ -3060,6 +3078,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
<Properties>ApiVersion=1.2.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
Expand Down
24 changes: 24 additions & 0 deletions tracer/build/PackageVersionsLatestMinors.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15114,6 +15114,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -15564,6 +15570,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand Down Expand Up @@ -15642,6 +15654,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
Expand Down Expand Up @@ -15720,6 +15738,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
<Properties>ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
Expand Down
24 changes: 24 additions & 0 deletions tracer/build/PackageVersionsLatestSpecific.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4008,6 +4008,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -4224,6 +4230,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand Down Expand Up @@ -4260,6 +4272,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
Expand Down Expand Up @@ -4296,6 +4314,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>LinuxAndMac</RequiresDockerDependency>
<SampleName>Samples.Microsoft.Data.SqlClient</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
<Properties>ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
Expand Down
34 changes: 17 additions & 17 deletions tracer/build/supported_calltargets.g.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16383,7 +16383,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16408,7 +16408,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16430,7 +16430,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16454,7 +16454,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16476,7 +16476,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16500,7 +16500,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16522,7 +16522,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16546,7 +16546,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16570,7 +16570,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16595,7 +16595,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16617,7 +16617,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16641,7 +16641,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16663,7 +16663,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16687,7 +16687,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16711,7 +16711,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16733,7 +16733,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand All @@ -16757,7 +16757,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 6,
"Item1": 7,
"Item2": 65535,
"Item3": 65535
},
Expand Down
8 changes: 4 additions & 4 deletions tracer/build/supported_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,16 +1258,16 @@
"integrationName": "SqlClient",
"assemblyName": "Microsoft.Data.SqlClient",
"minAssemblyVersionInclusive": "1.0.0",
"maxAssemblyVersionInclusive": "6.65535.65535",
"maxAssemblyVersionInclusive": "7.65535.65535",
"packages": [
{
"name": "Microsoft.Data.SqlClient",
"minVersionAvailableInclusive": "1.0.19239.1",
"minVersionSupportedInclusive": "1.0.19239.1",
"minVersionTestedInclusive": "1.1.4",
"maxVersionSupportedInclusive": "6.1.4",
"maxVersionAvailableInclusive": "6.1.4",
"maxVersionTestedInclusive": "6.1.4"
"maxVersionSupportedInclusive": "7.0.0",
"maxVersionAvailableInclusive": "7.0.0",
"maxVersionTestedInclusive": "7.0.0"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ItemGroup>
<!-- Integration: Microsoft.Data.SqlClient -->
<!-- Assembly: Microsoft.Data.SqlClient -->
<!-- Latest package https://www.nuget.org/packages/Microsoft.Data.SqlClient/6.1.4 -->
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
<!-- Latest package https://www.nuget.org/packages/Microsoft.Data.SqlClient/7.0.0 -->
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...rc/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
AssemblyName = "Microsoft.Data.SqlClient",
TypeName = "Microsoft.Data.SqlClient.SqlCommand",
MinimumVersion = "1.0.0",
MaximumVersion = "6.*.*",
MaximumVersion = "7.*.*",
IntegrationName = nameof(IntegrationId.SqlClient),
DataReaderType = "Microsoft.Data.SqlClient.SqlDataReader",
DataReaderTaskType = "System.Threading.Tasks.Task`1[Microsoft.Data.SqlClient.SqlDataReader]",
Expand Down Expand Up @@ -143,7 +143,7 @@
AssemblyName = "Microsoft.Data.SqlClient",
TypeName = "Microsoft.Data.SqlClient.SqlDataReader",
MinimumVersion = "1.0.0",
MaximumVersion = "6.*.*",
MaximumVersion = "7.*.*",
IntegrationName = nameof(IntegrationId.SqlClient),
DataReaderType = TypeNames.DbDataReaderType,
DataReaderTaskType = TypeNames.DbDataReaderTaskType,
Expand Down
Loading
Loading