Add support for HotChocolate v15.x.x (#6648)

## Summary of changes Bump to support latest version of HotChocolate ## Reason for change We want to support the latest versions ## Implementation details Bumped places where we use 14.x to 15.x, counting on the tests to catch any issues ## Test coverage Updated the Windows samples to test against latest, but otherwise pretty standard --------- Co-authored-by: Steven Bouwkamp <[email protected]>
DataDog · Feb 11, 2025 · 6c4bfa5 · 6c4bfa5
1 parent 40c118d
commit 6c4bfa5
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 11 deletions.
diff --git a/tracer/build/PackageVersionsGeneratorDefinitions.json b/tracer/build/PackageVersionsGeneratorDefinitions.json
@@ -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" ]
     }]
   },
   {

diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props
@@ -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>
@@ -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>

diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props
@@ -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>
@@ -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>

diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props
@@ -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>
@@ -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>

diff --git a/tracer/build/supported_calltargets.g.json b/tracer/build/supported_calltargets.g.json
@@ -7858,7 +7858,7 @@
       "Item3": 0
     },
     "MaximumVersion": {
-      "Item1": 14,
+      "Item1": 15,
       "Item2": 65535,
       "Item3": 65535
     },
@@ -7933,7 +7933,7 @@
       "Item3": 0
     },
     "MaximumVersion": {
-      "Item1": 14,
+      "Item1": 15,
       "Item2": 65535,
       "Item3": 65535
     },

diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json
@@ -661,7 +661,7 @@
         "minVersionTestedInclusive": "11.3.8",
         "maxVersionSupportedInclusive": "14.3.0",
         "maxVersionAvailableInclusive": "15.0.3",
-        "maxVersionTestedInclusive": "14.3.0"
+        "maxVersionTestedInclusive": "15.0.3"
       }
     ]
   },

diff --git a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
@@ -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 -->

diff --git a/...e/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationExtraV13.cs b/...e/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationExtraV13.cs
@@ -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

diff --git a/....Trace/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationV14.cs b/....Trace/ClrProfiler/AutoInstrumentation/GraphQL/HotChocolate/ExecuteAsyncIntegrationV14.cs
@@ -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

diff --git a/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp b/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
@@ -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},

diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
@@ -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
             };

diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
@@ -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" },
@@ -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
             };

diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
@@ -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
             };

diff --git a/tracer/test/test-applications/integrations/Samples.HotChocolate/Samples.HotChocolate.csproj b/tracer/test/test-applications/integrations/Samples.HotChocolate/Samples.HotChocolate.csproj
@@ -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>