Various profiler updates

stevejgordon · stevejgordon · commit 72ea4730f71a · 2024-02-26T17:07:47.000+01:00
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -35,7 +35,7 @@
     <PackageReference Include="Fake.IO.Zip" Version="5.20.4" />
     <PackageReference Include="Fake.Tools.Git" Version="5.20.4" />
 
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 
     <PackageReference Include="Octokit" Version="0.32.0" />
     <PackageReference Include="Proc" Version="0.6.2" />
diff --git a/build/scripts/Tooling.fs b/build/scripts/Tooling.fs
@@ -11,7 +11,7 @@ open ProcNet.Std
 module Tooling = 
     type ExecResult = { ExitCode: int; Output: LineOut seq;}
     
-    let private defaultTimeout = TimeSpan.FromMinutes 5.
+    let private defaultTimeout = TimeSpan.FromMinutes 10.
     
     type NoopWriter () =
         interface IConsoleOutWriter with
diff --git a/sample/HttpListenerSample/HttpListenerSample.csproj b/sample/HttpListenerSample/HttpListenerSample.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/profiler/Elastic.Apm.Profiler.Managed/DuckTyping/DuckType.Statics.cs b/src/profiler/Elastic.Apm.Profiler.Managed/DuckTyping/DuckType.Statics.cs
@@ -45,8 +45,9 @@ public static partial class DuckType
 		private static readonly PropertyInfo DuckTypeInstancePropertyInfo = typeof(IDuckType).GetProperty(nameof(IDuckType.Instance));
 
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
-		private static readonly MethodInfo _methodBuilderGetToken =
-			typeof(MethodBuilder).GetMethod("GetToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+		private static readonly MethodInfo _methodBuilderGetToken = typeof(MethodBuilder)
+			.GetMethod("GetToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+				?? typeof(MethodBuilder).GetProperty("MetadataToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)?.GetMethod;
 
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
 		private static readonly Dictionary<Assembly, ModuleBuilder> ActiveBuilders = new Dictionary<Assembly, ModuleBuilder>();
diff --git a/src/profiler/Elastic.Apm.Profiler.Managed/Integrations/AdoNet/AdoNetTypeNames.cs b/src/profiler/Elastic.Apm.Profiler.Managed/Integrations/AdoNet/AdoNetTypeNames.cs
@@ -64,7 +64,7 @@ public InstrumentMicrosoftDataSqliteAttribute()
 			Assembly = "Microsoft.Data.Sqlite";
 			Type = "Microsoft.Data.Sqlite.SqliteCommand";
 			MinimumVersion = "2.0.0";
-			MaximumVersion = "7.*.*";
+			MaximumVersion = "8.*.*";
 			Group = "SqliteCommand";
 		}
 	}
diff --git a/src/profiler/Elastic.Apm.Profiler.Managed/integrations.yml b/src/profiler/Elastic.Apm.Profiler.Managed/integrations.yml
diff --git a/test/Elastic.Apm.Tests.MockApmServer/Elastic.Apm.Tests.MockApmServer.csproj b/test/Elastic.Apm.Tests.MockApmServer/Elastic.Apm.Tests.MockApmServer.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Elastic.Apm.Tests.MockApmServer</RootNamespace>
diff --git a/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj
@@ -10,7 +10,7 @@
       <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.0.0" />
       <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.21.0" />
       <PackageReference Include="Proc" Version="0.6.2" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.0.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
     <PackageReference Include="Proc" Version="0.6.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionRoot)\test\Elastic.Apm.Tests.Utilities\Elastic.Apm.Tests.Utilities.csproj" />
diff --git a/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj b/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.7.0" />
     <PackageReference Include="Proc" Version="0.6.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj b/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj
@@ -6,7 +6,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- needed because of MockApmServer version -->
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <!-- Don't run Roslyn analyzers as part of build. The StyleCop analyzers conflict with editorconfig -->
@@ -16,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90"/>
-    <PackageReference Include="Proc" Version="0.8.1"/>
+    <PackageReference Include="Proc" Version="0.6.2"/>
     <PackageReference Include="Testcontainers.Kafka" Version="3.7.0" />
     <PackageReference Include="Testcontainers.MsSql" Version="3.7.0" />
     <PackageReference Include="Testcontainers.MySql" Version="3.7.0" />
diff --git a/test/profiler/applications/KafkaSample/KafkaSample.csproj b/test/profiler/applications/KafkaSample/KafkaSample.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <KafkaVersion Condition="'$(KafkaVersion)' == ''">1.4.3</KafkaVersion>
+      <KafkaVersion Condition="'$(KafkaVersion)' == ''">1.9.3</KafkaVersion>
       <OutputType>Exe</OutputType>
       <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Confluent.Kafka" Version="$(KafkaVersion)" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj b/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RabbitMqVersion Condition="'$(RabbitMqVersion)' == ''">6.2.2</RabbitMqVersion>
-    <DefineConstants Condition="$(RabbitMqVersion) &gt;= 6.0.0">$(DefineConstants);RABBITMQ_6_0</DefineConstants>
+    <RabbitMqVersion Condition="'$(RabbitMqVersion)' == ''">6.8.1</RabbitMqVersion>
+    <DefineConstants Condition="$(RabbitMqVersion) >= 6.0.0">$(DefineConstants);RABBITMQ_6_0</DefineConstants>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
diff --git a/test/profiler/applications/SqliteSample/SqliteSample.csproj b/test/profiler/applications/SqliteSample/SqliteSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <SqliteVersion Condition="'$(SqliteVersion)'==''">7.0.2</SqliteVersion>
+    <SqliteVersion Condition="'$(SqliteVersion)'==''">8.0.2</SqliteVersion>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
     <PlatformTarget>x64</PlatformTarget>

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public InstrumentMicrosoftDataSqliteAttribute()`
`64`	`64`	`Assembly = "Microsoft.Data.Sqlite";`
`65`	`65`	`Type = "Microsoft.Data.Sqlite.SqliteCommand";`
`66`	`66`	`MinimumVersion = "2.0.0";`
`67`		`- MaximumVersion = "7..";`
	`67`	`+ MaximumVersion = "8..";`
`68`	`68`	`Group = "SqliteCommand";`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk.Web">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk.Web">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFramework>net8.0</TargetFramework>`
`4`	`4`	`<RootNamespace>Elastic.Apm.Tests.MockApmServer</RootNamespace>`