Skip to content
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

Jump to bottom

Add support for ServiceStack.Redis 8.0.0 #4911

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Add support for ServiceStack.Redis 8.0.0 #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a6db3
Add support for ServiceStack.Redis 8.0.0
andrewlock Nov 22, 2023
39712d5
Update testing to include 8.0.0
andrewlock Nov 22, 2023
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
7 changes: 4 additions & 3 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
]
},
{
"IntegrationName": " DataStreamsRabbitMQ",
"IntegrationName": "DataStreamsRabbitMQ",
"SampleProjectName": "Samples.DataStreams.RabbitMQ",
"NugetPackageSearchName": "RabbitMQ.Client",
"MinVersion": "3.6.9",
Expand Down Expand Up @@ -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",
Expand Down
36 changes: 36 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 @@ -1566,6 +1566,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -1602,6 +1608,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
Expand All @@ -1614,6 +1626,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -1626,6 +1644,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
Expand All @@ -1638,6 +1662,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
Expand All @@ -1650,6 +1680,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MySql\Samples.MySql.csproj">
<Properties>ApiVersion=6.10.9;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
36 changes: 36 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 @@ -7470,6 +7470,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -7818,6 +7824,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
Expand Down Expand Up @@ -7974,6 +7986,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
Expand Down Expand Up @@ -8130,6 +8148,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
Expand Down Expand Up @@ -8286,6 +8310,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -8442,6 +8472,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MySql\Samples.MySql.csproj">
<Properties>ApiVersion=6.7.9;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
36 changes: 36 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 @@ -2286,6 +2286,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -2322,6 +2328,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
Expand All @@ -2334,6 +2346,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -2346,6 +2364,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
Expand All @@ -2358,6 +2382,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=5.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
Expand All @@ -2370,6 +2400,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.ServiceStack.Redis</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MySql\Samples.MySql.csproj">
<Properties>ApiVersion=6.7.9;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
6 changes: 3 additions & 3 deletions tracer/build/supported_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions tracer/dependabot/Datadog.Dependabot.Integrations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@

<!-- Integration: ServiceStack.Redis -->
<!-- Assembly: ServiceStack.Redis -->
<!-- Latest package https://www.nuget.org/packages/ServiceStack.Redis/6.11.0 -->
<PackageReference Include="ServiceStack.Redis" Version="6.11.0" />
<!-- Latest package https://www.nuget.org/packages/ServiceStack.Redis/8.0.0 -->
<PackageReference Include="ServiceStack.Redis" Version="8.0.0" />

<!-- Integration: Microsoft.Data.SqlClient -->
<!-- Assembly: Microsoft.Data.SqlClient -->
Expand Down
2 changes: 1 addition & 1 deletion ...r/AutoInstrumentation/Redis/ServiceStack/RedisNativeClientSendReceiveIntegration_6_2_0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Loading
Loading