diff --git a/tracer/build/PackageVersionsGeneratorDefinitions.json b/tracer/build/PackageVersionsGeneratorDefinitions.json index 3fa8970890e4..14b5cffbc114 100644 --- a/tracer/build/PackageVersionsGeneratorDefinitions.json +++ b/tracer/build/PackageVersionsGeneratorDefinitions.json @@ -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", diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props index ec390ddf4ade..f20f2eed0377 100644 --- a/tracer/build/PackageVersionsLatestMajors.g.props +++ b/tracer/build/PackageVersionsLatestMajors.g.props @@ -2772,6 +2772,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net48 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -2988,6 +2994,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false net9.0 @@ -3024,6 +3036,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net9.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false net10.0 @@ -3060,6 +3078,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net10.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.2.6;RestoreRecursive=false;BuildProjectReferences=false net48 diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props index 9a204c87442a..ab768f9932cb 100644 --- a/tracer/build/PackageVersionsLatestMinors.g.props +++ b/tracer/build/PackageVersionsLatestMinors.g.props @@ -15114,6 +15114,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net48 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -15564,6 +15570,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false net9.0 @@ -15642,6 +15654,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net9.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.0.19269.1;RestoreRecursive=false;BuildProjectReferences=false net10.0 @@ -15720,6 +15738,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net10.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false net48 diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props index 330986a8ffef..fc2359f9978e 100644 --- a/tracer/build/PackageVersionsLatestSpecific.g.props +++ b/tracer/build/PackageVersionsLatestSpecific.g.props @@ -4008,6 +4008,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net48 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -4224,6 +4230,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false net9.0 @@ -4260,6 +4272,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net9.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.1.4;RestoreRecursive=false;BuildProjectReferences=false net10.0 @@ -4296,6 +4314,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely LinuxAndMac Samples.Microsoft.Data.SqlClient + + ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false + net10.0 + LinuxAndMac + Samples.Microsoft.Data.SqlClient + ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false net48 diff --git a/tracer/build/supported_calltargets.g.json b/tracer/build/supported_calltargets.g.json index e88f055d8947..d3baeeb09353 100644 --- a/tracer/build/supported_calltargets.g.json +++ b/tracer/build/supported_calltargets.g.json @@ -16383,7 +16383,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16408,7 +16408,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16430,7 +16430,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16454,7 +16454,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16476,7 +16476,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16500,7 +16500,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16522,7 +16522,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16546,7 +16546,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16570,7 +16570,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16595,7 +16595,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16617,7 +16617,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16641,7 +16641,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16663,7 +16663,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16687,7 +16687,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16711,7 +16711,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16733,7 +16733,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, @@ -16757,7 +16757,7 @@ "Item3": 0 }, "MaximumVersion": { - "Item1": 6, + "Item1": 7, "Item2": 65535, "Item3": 65535 }, diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json index cc3aaba20f28..0a7a99ea6e11 100644 --- a/tracer/build/supported_versions.json +++ b/tracer/build/supported_versions.json @@ -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" } ] }, diff --git a/tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Data.SqlClient.csproj b/tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Data.SqlClient.csproj index 4a8f7b4a5478..c92a4c9bc015 100644 --- a/tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Data.SqlClient.csproj +++ b/tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Data.SqlClient.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs index c2c485238d27..9696f1e4c095 100644 --- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs +++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs @@ -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]", @@ -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, diff --git a/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp b/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp index dff661caa48c..9353234a4d3e 100644 --- a/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp +++ b/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp @@ -1090,23 +1090,23 @@ std::vector callTargets = {(WCHAR*)WStr("Serilog"),(WCHAR*)WStr("Serilog.LoggerConfiguration"),(WCHAR*)WStr("CreateLogger"),sig119,1,1,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Serilog.DirectSubmission.LoggerConfigurationInstrumentation"),CallTargetKind::Default,1,15}, {(WCHAR*)WStr("ServiceStack.Redis"),(WCHAR*)WStr("ServiceStack.Redis.RedisNativeClient"),(WCHAR*)WStr("SendReceive"),sig002,5,4,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration"),CallTargetKind::Default,1,15}, {(WCHAR*)WStr("ServiceStack.Redis"),(WCHAR*)WStr("ServiceStack.Redis.RedisNativeClient"),(WCHAR*)WStr("SendReceive"),sig003,6,6,0,0,10,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig135,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig293,3,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig146,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQueryAsync"),sig296,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReader"),sig082,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReader"),sig083,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig267,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig270,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig268,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig269,3,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig160,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig301,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig311,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig169,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig162,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig121,1,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15}, -{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig301,2,1,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig135,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig293,3,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig146,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQueryAsync"),sig296,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReader"),sig082,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReader"),sig083,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig267,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig270,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig268,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig269,3,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig160,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig301,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig311,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig169,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig162,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig121,1,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15}, +{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig301,2,1,0,0,7,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15}, {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("Close"),sig311,1,2,0,0,10,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15}, {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetString"),sig169,2,2,0,0,10,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetValue"),sig162,2,2,0,0,10,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15}, diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs index bf75faea61aa..27984f606973 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs @@ -1145,6 +1145,7 @@ public class PackageVersionsLatestMajors new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "1.1.4" }, @@ -1195,6 +1196,7 @@ public class PackageVersionsLatestMajors new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET9_0 new object[] { "1.1.4" }, @@ -1203,6 +1205,7 @@ public class PackageVersionsLatestMajors new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET10_0 new object[] { "1.1.4" }, @@ -1211,6 +1214,7 @@ public class PackageVersionsLatestMajors new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #endif }; diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs index 0d76868d7d75..ea7caaf618b8 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs @@ -3202,6 +3202,7 @@ public class PackageVersionsLatestMinors new object[] { "5.2.3" }, new object[] { "6.0.5" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "1.0.19269.1" }, @@ -3291,6 +3292,7 @@ public class PackageVersionsLatestMinors new object[] { "5.2.3" }, new object[] { "6.0.5" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET9_0 new object[] { "1.0.19269.1" }, @@ -3306,6 +3308,7 @@ public class PackageVersionsLatestMinors new object[] { "5.2.3" }, new object[] { "6.0.5" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET10_0 new object[] { "1.0.19269.1" }, @@ -3321,6 +3324,7 @@ public class PackageVersionsLatestMinors new object[] { "5.2.3" }, new object[] { "6.0.5" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #endif }; diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs index 8fe1082d3ad6..437150a865ce 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs @@ -1351,6 +1351,7 @@ public class PackageVersionsLatestSpecific new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "1.1.4" }, @@ -1401,6 +1402,7 @@ public class PackageVersionsLatestSpecific new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET9_0 new object[] { "1.1.4" }, @@ -1409,6 +1411,7 @@ public class PackageVersionsLatestSpecific new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #if NET10_0 new object[] { "1.1.4" }, @@ -1417,6 +1420,7 @@ public class PackageVersionsLatestSpecific new object[] { "4.1.1" }, new object[] { "5.2.3" }, new object[] { "6.1.4" }, + new object[] { "7.0.0" }, #endif #endif };