Remove invalid profiler method integrations (#2349)

elastic · May 13, 2024 · aaa175f · aaa175f
1 parent 1025061
commit aaa175f
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 315 deletions.
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -28,12 +28,12 @@
     <PackageReference Include="Bullseye" Version="3.5.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
 
-    <PackageReference Include="Fake.Core.Environment" Version="5.20.4" />
-    <PackageReference Include="Fake.Core.SemVer" Version="5.20.4" />
-    <PackageReference Include="Fake.DotNet.MsBuild" Version="5.20.4" />
-    <PackageReference Include="Fake.IO.FileSystem" Version="5.20.4" />
-    <PackageReference Include="Fake.IO.Zip" Version="5.20.4" />
-    <PackageReference Include="Fake.Tools.Git" Version="5.20.4" />
+    <PackageReference Include="Fake.Core.Environment" Version="6.0.0" />
+    <PackageReference Include="Fake.Core.SemVer" Version="6.0.0" />
+    <PackageReference Include="Fake.DotNet.MsBuild" Version="6.0.0" />
+    <PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
+    <PackageReference Include="Fake.IO.Zip" Version="6.0.0" />
+    <PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
 
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 

diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
@@ -70,13 +70,14 @@ module Build =
         DotNet.Exec [target; projectOrSln; "-c"; "Release"; "-v"; "q"; "--nologo"]
 
     let private msBuild target projectOrSln =
-        MSBuild.build (fun p ->
+        MSBuild.build (fun (p: MSBuildParams) ->
                 { p with
                     Verbosity = Some(Quiet)
                     Targets = [target]
                     Properties = [
                         "Configuration", "Release"
                         "Optimize", "True"
+                        "dummy", "test" // See https://github.com/fsprojects/FAKE/issues/2738
                     ]
                     // current version of Fake MSBuild module does not support latest bin log file
                     // version of MSBuild in VS 16.8, so disable for now.

diff --git a/...Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteNonQueryWithBehaviorIntegration.cs b/...Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteNonQueryWithBehaviorIntegration.cs
@@ -20,14 +20,7 @@ namespace Elastic.Apm.Profiler.Managed.Integrations.AdoNet
 	/// CallTarget instrumentation for:
 	/// int [Command].ExecuteNonQuery(CommandBehavior)
 	/// </summary>
-	[InstrumentMySqlAttribute(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccess(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccessCore(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlite(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	[InstrumentSystemDataSqlite(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSql(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSqlClient(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlClient(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	public class CommandExecuteNonQueryWithBehaviorIntegration
 	{
 		/// <summary>

diff --git a/...c.Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteScalarWithBehaviorIntegration.cs b/...c.Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteScalarWithBehaviorIntegration.cs
@@ -20,19 +20,7 @@ namespace Elastic.Apm.Profiler.Managed.Integrations.AdoNet
 	/// CallTarget instrumentation for:
 	/// object [Command].ExecuteScalar(CommandBehavior)
 	/// </summary>
-	[InstrumentMySqlAttribute(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccess(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccessCore(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlite(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	[InstrumentSystemDataSqlite(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSql(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSqlClient(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlClient(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	public class CommandExecuteScalarWithBehaviorIntegration
 	{
 		/// <summary>