fix integration

DataDog · Dec 26, 2024 · a8e92be · a8e92be
1 parent b2453a7
commit a8e92be
Show file tree

Hide file tree

Showing 6 changed files with 421 additions and 425 deletions.
diff --git a/tracer/build/supported_calltargets.g.json b/tracer/build/supported_calltargets.g.json
@@ -1050,7 +1050,7 @@
   {
     "IntegrationName": "AspNetCore",
     "AssemblyName": "Microsoft.AspNetCore.Identity",
-    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1",
     "TargetMethodName": "PasswordSignInAsync",
     "TargetReturnType": "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
     "TargetParameterTypes": [
@@ -1077,7 +1077,7 @@
   {
     "IntegrationName": "AspNetCore",
     "AssemblyName": "Microsoft.AspNetCore.Identity",
-    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1",
     "TargetMethodName": "PasswordSignInAsync",
     "TargetReturnType": "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
     "TargetParameterTypes": [
@@ -1104,7 +1104,7 @@
   {
     "IntegrationName": "AspNetCore",
     "AssemblyName": "Microsoft.AspNetCore.Identity",
-    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1",
     "TargetMethodName": "PasswordSignInAsync",
     "TargetReturnType": "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
     "TargetParameterTypes": [
@@ -1131,7 +1131,7 @@
   {
     "IntegrationName": "AspNetCore",
     "AssemblyName": "Microsoft.AspNetCore.Identity",
-    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    "TargetTypeName": "Microsoft.AspNetCore.Identity.SignInManager`1",
     "TargetMethodName": "PasswordSignInAsync",
     "TargetReturnType": "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
     "TargetParameterTypes": [

diff --git a/...ace/ClrProfiler/AutoInstrumentation/AspNetCore/AspNetCoreBlockMiddlewareIntegrationEnd.cs b/...ace/ClrProfiler/AutoInstrumentation/AspNetCore/AspNetCoreBlockMiddlewareIntegrationEnd.cs
@@ -4,13 +4,9 @@
 // </copyright>
 
 #if !NETFRAMEWORK
-using System;
 using System.ComponentModel;
-using System.Threading.Tasks;
-using Datadog.Trace.AppSec;
 using Datadog.Trace.ClrProfiler.CallTarget;
 using Datadog.Trace.Configuration;
-using Microsoft.AspNetCore.Http;
 
 namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore
 {

diff --git a/...ofiler/AutoInstrumentation/AspNetCore/DefaultModelBindingContext_SetResult_Integration.cs b/...ofiler/AutoInstrumentation/AspNetCore/DefaultModelBindingContext_SetResult_Integration.cs
@@ -8,12 +8,9 @@
 using System.ComponentModel;
 using Datadog.Trace.AppSec;
 using Datadog.Trace.AppSec.Coordinator;
-using Datadog.Trace.AppSec.Waf;
 using Datadog.Trace.ClrProfiler.CallTarget;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.DuckTyping;
-using Datadog.Trace.Iast;
-using Microsoft.AspNetCore.Http;
 
 namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore
 {
@@ -25,7 +22,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore
     TypeName = "Microsoft.AspNetCore.Mvc.ModelBinding.DefaultModelBindingContext",
     MethodName = "set_Result",
     ReturnTypeName = ClrNames.Void,
-    ParameterTypeNames = new[] { "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult" },
+    ParameterTypeNames = ["Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"],
     MinimumVersion = "2.0.0.0",
     MaximumVersion = SupportedVersions.LatestDotNet,
     IntegrationName = IntegrationName,

diff --git a/...filer/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs b/...filer/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs
@@ -26,7 +26,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore.UserEvents;
 /// </summary>
 [InstrumentMethod(
     AssemblyName = AssemblyName,
-    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1",
     MethodName = "PasswordSignInAsync",
     ParameterTypeNames = [ClrNames.String, ClrNames.String, ClrNames.Bool, ClrNames.Bool],
     ReturnTypeName = "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
@@ -36,7 +36,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore.UserEvents;
     InstrumentationCategory = InstrumentationCategory.AppSec)]
 [InstrumentMethod(
     AssemblyName = AssemblyName,
-    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1",
     MethodName = "PasswordSignInAsync",
     ParameterTypeNames = [ClrNames.String, ClrNames.String, ClrNames.Bool, ClrNames.Bool],
     ReturnTypeName = "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",

diff --git a/...r/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs b/...r/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs
@@ -26,7 +26,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore.UserEvents;
 /// </summary>
 [InstrumentMethod(
     AssemblyName = AssemblyName,
-    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1",
     MethodName = "PasswordSignInAsync",
     ParameterTypeNames = ["!0", ClrNames.String, ClrNames.Bool, ClrNames.Bool],
     ReturnTypeName = "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",
@@ -36,7 +36,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore.UserEvents;
     InstrumentationCategory = InstrumentationCategory.AppSec)]
 [InstrumentMethod(
     AssemblyName = AssemblyName,
-    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1<!!0>",
+    TypeName = "Microsoft.AspNetCore.Identity.SignInManager`1",
     MethodName = "PasswordSignInAsync",
     ParameterTypeNames = [ClrNames.String, ClrNames.String, ClrNames.Bool, ClrNames.Bool],
     ReturnTypeName = "System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Identity.SignInResult]",