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

Add support for HotChocolate v15.x.x #6648

Merged
merged 5 commits into from
Feb 11, 2025
Merged

Add support for HotChocolate v15.x.x #6648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78ec6ed
Add testing for HotChcolate v15
andrewlock Feb 10, 2025
e6f69a7
Update sample to build 15.0.3 on Windows
andrewlock Feb 10, 2025
b04ae91
Update integrations for v15
andrewlock Feb 10, 2025
a0a54c0
Update generated files
andrewlock Feb 10, 2025
02d7a13
Update generated_calltargets.g.cpp
bouwkast Feb 10, 2025
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
8 changes: 6 additions & 2 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,19 +213,23 @@
"SampleProjectName": "Samples.HotChocolate",
"NugetPackageSearchName": "HotChocolate.AspNetCore",
"MinVersion": "11.0.0",
"MaxVersionExclusive": "15.0.0",
"MaxVersionExclusive": "16.0.0",
"SpecificVersions": [
"11.*.*",
"12.*.*",
"13.*.*",
"14.*.*"
"14.*.*",
"15.*.*"
],
"VersionConditions": [{
"MinVersion": "12.22.0",
"ExcludeTargetFrameworks": [ "netcoreapp3.1", "net5.0" ]
},{
"MaxVersionExclusive": "15.0.0",
"ExcludeTargetFrameworks": [ "net462", "netcoreapp2.1", "netcoreapp3.0" ]
},{
"MinVersion": "15.0.0",
"ExcludeTargetFrameworks": [ "net462", "netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0", "net6.0", "net7.0" ]
}]
},
{
Expand Down
12 changes: 12 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 @@ -834,6 +834,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=11.3.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand All @@ -858,6 +864,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
12 changes: 12 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 @@ -6414,6 +6414,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=11.0.9;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand Down Expand Up @@ -6660,6 +6666,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
<Properties>ApiVersion=4.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
12 changes: 12 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 @@ -1734,6 +1734,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=11.3.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
Expand All @@ -1758,6 +1764,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj">
<Properties>ApiVersion=15.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.HotChocolate</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions tracer/build/supported_calltargets.g.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7858,7 +7858,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 14,
"Item1": 15,
"Item2": 65535,
"Item3": 65535
},
Expand Down Expand Up @@ -7933,7 +7933,7 @@
"Item3": 0
},
"MaximumVersion": {
"Item1": 14,
"Item1": 15,
"Item2": 65535,
"Item3": 65535
},
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/supported_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@
"minVersionTestedInclusive": "11.3.8",
"maxVersionSupportedInclusive": "14.3.0",
"maxVersionAvailableInclusive": "15.0.3",
"maxVersionTestedInclusive": "14.3.0"
"maxVersionTestedInclusive": "15.0.3"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion tracer/dependabot/Datadog.Dependabot.Integrations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<!-- Integration: HotChocolate.Execution -->
<!-- Assembly: HotChocolate.Execution -->
<!-- Latest package https://www.nuget.org/packages/HotChocolate.AspNetCore/15.0.3 -->
<PackageReference Include="HotChocolate.AspNetCore" Version="14.3.0" />
<PackageReference Include="HotChocolate.AspNetCore" Version="15.0.3" />

<!-- Integration: amqmdnetstd -->
<!-- Assembly: amqmdnetstd -->
Expand Down
2 changes: 1 addition & 1 deletion ...e/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationExtraV13.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate
AssemblyName = "HotChocolate.Execution",
TypeName = "HotChocolate.Execution.Processing.QueryExecutor",
MinimumVersion = "14",
MaximumVersion = "14.*.*")]
MaximumVersion = "15.*.*")]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public class ExecuteAsyncIntegrationExtraV13
Expand Down
2 changes: 1 addition & 1 deletion ....Trace/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationV14.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate;
AssemblyName = "HotChocolate.Execution",
TypeName = "HotChocolate.Execution.RequestExecutor",
MinimumVersion = "14",
MaximumVersion = "14.*.*")]
MaximumVersion = "15.*.*")]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public class ExecuteAsyncIntegrationV14
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,10 @@ std::vector<CallTargetDefinition3> callTargets =
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.Processing.MutationExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig235,2,11,0,0,11,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationExtra"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.Processing.QueryExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig235,2,11,0,0,12,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationExtra"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.Processing.QueryExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig237,2,13,0,0,13,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationExtraV13"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.Processing.QueryExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig236,2,14,0,0,14,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationExtraV13"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.Processing.QueryExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig236,2,14,0,0,15,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationExtraV13"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.RequestExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig234,3,11,0,0,12,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegration"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.RequestExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig234,3,13,0,0,13,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationV13"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.RequestExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig233,3,14,0,0,14,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationV14"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("HotChocolate.Execution"),(WCHAR*)WStr("HotChocolate.Execution.RequestExecutor"),(WCHAR*)WStr("ExecuteAsync"),sig233,3,14,0,0,15,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.GraphQL.HotChocolate.ExecuteAsyncIntegrationV14"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("System.Net.Http"),(WCHAR*)WStr("System.Net.Http.CurlHandler"),(WCHAR*)WStr("SendAsync"),sig259,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.HttpClient.CurlHandler.CurlHandlerIntegration"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("System.Net.Http"),(WCHAR*)WStr("System.Net.Http.HttpClientHandler"),(WCHAR*)WStr("Send"),sig139,3,5,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.HttpClient.HttpClientHandler.HttpClientHandlerSyncIntegration"),CallTargetKind::Default,1,15},
{(WCHAR*)WStr("System.Net.Http"),(WCHAR*)WStr("System.Net.Http.HttpClientHandler"),(WCHAR*)WStr("SendAsync"),sig259,3,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.HttpClient.HttpClientHandler.HttpClientHandlerIntegration"),CallTargetKind::Default,1,15},
Expand Down
2 changes: 2 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,12 +510,14 @@ public class PackageVersionsLatestMajors
new object[] { "12.22.6" },
new object[] { "13.9.14" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#if NET9_0
new object[] { "11.3.8" },
new object[] { "12.22.6" },
new object[] { "13.9.14" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#endif
};
Expand Down
2 changes: 2 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,7 @@ public class PackageVersionsLatestMinors
new object[] { "14.1.0" },
new object[] { "14.2.0" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#if NET9_0
new object[] { "11.0.9" },
Expand Down Expand Up @@ -1483,6 +1484,7 @@ public class PackageVersionsLatestMinors
new object[] { "14.1.0" },
new object[] { "14.2.0" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#endif
};
Expand Down
2 changes: 2 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,12 +660,14 @@ public class PackageVersionsLatestSpecific
new object[] { "12.22.6" },
new object[] { "13.9.14" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#if NET9_0
new object[] { "11.3.8" },
new object[] { "12.22.6" },
new object[] { "13.9.14" },
new object[] { "14.3.0" },
new object[] { "15.0.3" },
#endif
#endif
};
Expand Down
5 changes: 4 additions & 1 deletion tracer/test/test-applications/integrations/Samples.HotChocolate/Samples.HotChocolate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
<!-- Only run older version of HotChocolate for net5.0 and netcoreapp3.1 (support dropped in version 13.*.*) -->
<ApiVersion Condition="'$(ApiVersion)' == '' And ('$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'netcoreapp3.1')">12.18.0</ApiVersion>

<ApiVersion Condition="'$(ApiVersion)' == ''">14.0.0</ApiVersion>
<!-- Only run older version of HotChocolate for net6.0 and net 7.0 (support dropped in version 13.*.*) -->
<ApiVersion Condition="'$(ApiVersion)' == '' And ('$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0')">14.0.0</ApiVersion>

<ApiVersion Condition="'$(ApiVersion)' == ''">15.0.3</ApiVersion>

<!-- Required to build multiple projects with the same Configuration|Platform, which is needed for the CI library/version matrix -->
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
Loading