From 11a6db3af4e40d38c2892bfb0585b3cd385e5ed6 Mon Sep 17 00:00:00 2001 From: Andrew Lock Date: Wed, 22 Nov 2023 14:22:23 +0000 Subject: [PATCH 1/2] Add support for ServiceStack.Redis 8.0.0 --- .../RedisNativeClientSendReceiveIntegration_6_2_0.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Redis/ServiceStack/RedisNativeClientSendReceiveIntegration_6_2_0.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Redis/ServiceStack/RedisNativeClientSendReceiveIntegration_6_2_0.cs index 178da1af4208..0d3de4b0e08c 100644 --- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Redis/ServiceStack/RedisNativeClientSendReceiveIntegration_6_2_0.cs +++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Redis/ServiceStack/RedisNativeClientSendReceiveIntegration_6_2_0.cs @@ -25,7 +25,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack ReturnTypeName = "!!0", ParameterTypeNames = new[] { "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", ClrNames.Bool, ClrNames.String }, MinimumVersion = "6.0.0", - MaximumVersion = "6.*.*", + MaximumVersion = "8.*.*", IntegrationName = IntegrationName)] [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 0c573acf563b..a654ad6898aa 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -386,7 +386,7 @@ static InstrumentationDefinitions() // ServiceStackRedis new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean"), 5, 4, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 8, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), // SqlClient new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient.SqlCommand"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ExecuteDbDataReader"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Data.Common.DbDataReader", "System.Data.CommandBehavior"), 2, 1, 0, 0, 5, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 36355f0d4da6..11b832c52a07 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -398,7 +398,7 @@ static InstrumentationDefinitions() // ServiceStackRedis new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean"), 5, 4, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 8, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), // SqlClient new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient.SqlCommand"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ExecuteDbDataReader"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Data.Common.DbDataReader", "System.Data.CommandBehavior"), 2, 1, 0, 0, 5, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 98611a631779..22ce1f2d96b6 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -395,7 +395,7 @@ static InstrumentationDefinitions() // ServiceStackRedis new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean"), 5, 4, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 8, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), // SqlClient new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient.SqlCommand"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ExecuteDbDataReader"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Data.Common.DbDataReader", "System.Data.CommandBehavior"), 2, 1, 0, 0, 5, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 98611a631779..22ce1f2d96b6 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -395,7 +395,7 @@ static InstrumentationDefinitions() // ServiceStackRedis new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean"), 5, 4, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 6, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ServiceStack.Redis.RedisNativeClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("SendReceive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!!0", "System.Byte[][]", "System.Func`1[!!0]", "System.Action`1[System.Func`1[!!0]]", "System.Boolean", "System.String"), 6, 6, 0, 0, 8, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Redis.ServiceStack.RedisNativeClientSendReceiveIntegration_6_2_0"), 0, 1), // SqlClient new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Microsoft.Data.SqlClient.SqlCommand"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ExecuteDbDataReader"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Data.Common.DbDataReader", "System.Data.CommandBehavior"), 2, 1, 0, 0, 5, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"), 0, 1), From 39712d5f497d29a25ea6d6b717fa099ed9dd56cc Mon Sep 17 00:00:00 2001 From: Andrew Lock Date: Wed, 22 Nov 2023 14:25:43 +0000 Subject: [PATCH 2/2] Update testing to include 8.0.0 --- .../PackageVersionsGeneratorDefinitions.json | 7 ++-- .../build/PackageVersionsLatestMajors.g.props | 36 +++++++++++++++++++ .../build/PackageVersionsLatestMinors.g.props | 36 +++++++++++++++++++ .../PackageVersionsLatestSpecific.g.props | 36 +++++++++++++++++++ tracer/build/supported_versions.json | 6 ++-- .../Datadog.Dependabot.Integrations.csproj | 4 +-- .../PackageVersions.g.cs | 2 +- .../PackageVersionsLatestMajors.g.cs | 8 ++++- .../PackageVersionsLatestMinors.g.cs | 8 ++++- .../PackageVersionsLatestSpecific.g.cs | 8 ++++- 10 files changed, 139 insertions(+), 12 deletions(-) diff --git a/tracer/build/PackageVersionsGeneratorDefinitions.json b/tracer/build/PackageVersionsGeneratorDefinitions.json index fbc34949fb8b..0f78f8588692 100644 --- a/tracer/build/PackageVersionsGeneratorDefinitions.json +++ b/tracer/build/PackageVersionsGeneratorDefinitions.json @@ -218,7 +218,7 @@ ] }, { - "IntegrationName": " DataStreamsRabbitMQ", + "IntegrationName": "DataStreamsRabbitMQ", "SampleProjectName": "Samples.DataStreams.RabbitMQ", "NugetPackageSearchName": "RabbitMQ.Client", "MinVersion": "3.6.9", @@ -287,11 +287,12 @@ "SampleProjectName": "Samples.ServiceStack.Redis", "NugetPackageSearchName": "ServiceStack.Redis", "MinVersion": "4.0.48", - "MaxVersionExclusive": "7.0.0", + "MaxVersionExclusive": "9.0.0", "SpecificVersions": [ "4.*.*", "5.*.*", - "6.*.*" + "6.*.*", + "8.*.*" ], "VersionConditions": [{ "MaxVersionExclusive": "5.0.0", diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props index 08676e815a3f..bb0234903ac7 100644 --- a/tracer/build/PackageVersionsLatestMajors.g.props +++ b/tracer/build/PackageVersionsLatestMajors.g.props @@ -1566,6 +1566,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net462 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -1602,6 +1608,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + netcoreapp3.1 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net5.0 @@ -1614,6 +1626,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net5.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net6.0 @@ -1626,6 +1644,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net6.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net7.0 @@ -1638,6 +1662,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net7.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net8.0 @@ -1650,6 +1680,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + All + Samples.ServiceStack.Redis + ApiVersion=6.10.9;RestoreRecursive=false;BuildProjectReferences=false net462 diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props index 0baf49e25d42..c287c6e971d6 100644 --- a/tracer/build/PackageVersionsLatestMinors.g.props +++ b/tracer/build/PackageVersionsLatestMinors.g.props @@ -7470,6 +7470,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net462 + All + Samples.ServiceStack.Redis + ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -7818,6 +7824,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + netcoreapp3.1 + All + Samples.ServiceStack.Redis + ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false net5.0 @@ -7974,6 +7986,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net5.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false net6.0 @@ -8130,6 +8148,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net6.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false net7.0 @@ -8286,6 +8310,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net7.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false net8.0 @@ -8442,6 +8472,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + All + Samples.ServiceStack.Redis + ApiVersion=6.7.9;RestoreRecursive=false;BuildProjectReferences=false net462 diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props index f20722f73daa..bea70ad97cc2 100644 --- a/tracer/build/PackageVersionsLatestSpecific.g.props +++ b/tracer/build/PackageVersionsLatestSpecific.g.props @@ -2286,6 +2286,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net462 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false netcoreapp2.1 @@ -2322,6 +2328,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + netcoreapp3.1 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net5.0 @@ -2334,6 +2346,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net5.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net6.0 @@ -2346,6 +2364,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net6.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net7.0 @@ -2358,6 +2382,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net7.0 + All + Samples.ServiceStack.Redis + ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false net8.0 @@ -2370,6 +2400,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely All Samples.ServiceStack.Redis + + ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false + net8.0 + All + Samples.ServiceStack.Redis + ApiVersion=6.7.9;RestoreRecursive=false;BuildProjectReferences=false net462 diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json index c07373815d34..cc76fa75cce5 100644 --- a/tracer/build/supported_versions.json +++ b/tracer/build/supported_versions.json @@ -909,16 +909,16 @@ "integrationName": "ServiceStackRedis", "assemblyName": "ServiceStack.Redis", "minAssemblyVersionInclusive": "4.0.0", - "maxAssemblyVersionInclusive": "6.65535.65535", + "maxAssemblyVersionInclusive": "8.65535.65535", "packages": [ { "name": "ServiceStack.Redis", "minVersionAvailableInclusive": "2.9.0", "minVersionSupportedInclusive": "4.0.2", "minVersionTestedInclusive": "4.5.14", - "maxVersionSupportedInclusive": "6.11.0", + "maxVersionSupportedInclusive": "8.0.0", "maxVersionAvailableInclusive": "8.0.0", - "maxVersionTestedInclusive": "6.11.0" + "maxVersionTestedInclusive": "8.0.0" } ] }, diff --git a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj index 010265960d00..8b309d993e93 100644 --- a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj +++ b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj @@ -198,8 +198,8 @@ - - + + diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs index 245f6930bfaf..dc88a22e517e 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs @@ -54,7 +54,7 @@ public class PackageVersions public static IEnumerable RabbitMQ => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.RabbitMQ : PackageVersionsLatestSpecific.RabbitMQ; - public static IEnumerable DataStreamsRabbitMQ => IsAllMinorPackageVersions ? PackageVersionsLatestMinors. DataStreamsRabbitMQ : PackageVersionsLatestSpecific. DataStreamsRabbitMQ; + public static IEnumerable DataStreamsRabbitMQ => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.DataStreamsRabbitMQ : PackageVersionsLatestSpecific.DataStreamsRabbitMQ; public static IEnumerable SystemDataSqlClient => IsAllMinorPackageVersions ? PackageVersionsLatestMinors.SystemDataSqlClient : PackageVersionsLatestSpecific.SystemDataSqlClient; diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs index 81e46e8fc552..e79c3054ef82 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs @@ -513,7 +513,7 @@ public class PackageVersionsLatestMajors #endif }; - public static IEnumerable DataStreamsRabbitMQ => + public static IEnumerable DataStreamsRabbitMQ => new List { @@ -724,6 +724,7 @@ public class PackageVersionsLatestMajors new object[] { "4.5.14" }, new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "5.14.0" }, @@ -736,22 +737,27 @@ public class PackageVersionsLatestMajors #if NETCOREAPP3_1 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET5_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET6_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET7_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET8_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.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 282dda7f1c5c..0b98c851744b 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs @@ -1277,7 +1277,7 @@ public class PackageVersionsLatestMinors #endif }; - public static IEnumerable DataStreamsRabbitMQ => + public static IEnumerable DataStreamsRabbitMQ => new List { @@ -1708,6 +1708,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "5.0.2" }, @@ -1772,6 +1773,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET5_0 new object[] { "5.0.2" }, @@ -1800,6 +1802,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET6_0 new object[] { "5.0.2" }, @@ -1828,6 +1831,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET7_0 new object[] { "5.0.2" }, @@ -1856,6 +1860,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET8_0 new object[] { "5.0.2" }, @@ -1884,6 +1889,7 @@ public class PackageVersionsLatestMinors new object[] { "6.9.1" }, new object[] { "6.10.0" }, new object[] { "6.11.0" }, + new object[] { "8.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 878354e2380a..530aa0b9e74a 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs @@ -616,7 +616,7 @@ public class PackageVersionsLatestSpecific #endif }; - public static IEnumerable DataStreamsRabbitMQ => + public static IEnumerable DataStreamsRabbitMQ => new List { @@ -844,6 +844,7 @@ public class PackageVersionsLatestSpecific new object[] { "4.5.14" }, new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NETCOREAPP2_1 new object[] { "5.14.0" }, @@ -856,22 +857,27 @@ public class PackageVersionsLatestSpecific #if NETCOREAPP3_1 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET5_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET6_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET7_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #if NET8_0 new object[] { "5.14.0" }, new object[] { "6.11.0" }, + new object[] { "8.0.0" }, #endif #endif };