Skip to content

Commit

Permalink
Various profiler updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevejgordon
stevejgordon committed Feb 26, 2024
1 parent 287e2a6 commit 72ea473
Show file tree
Hide file tree
Showing 15 changed files with 151 additions and 151 deletions.
2 changes: 1 addition & 1 deletion build/build.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Tooling.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sample/HttpListenerSample/HttpListenerSample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions src/profiler/Elastic.Apm.Profiler.Managed/DuckTyping/DuckType.Statics.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down
2 changes: 1 addition & 1 deletion src/profiler/Elastic.Apm.Profiler.Managed/Integrations/AdoNet/AdoNetTypeNames.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}
Expand Down
266 changes: 133 additions & 133 deletions src/profiler/Elastic.Apm.Profiler.Managed/integrations.yml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/Elastic.Apm.Tests.MockApmServer/Elastic.Apm.Tests.MockApmServer.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -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 -->
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions test/profiler/applications/KafkaSample/KafkaSample.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/profiler/applications/SqliteSample/SqliteSample.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 72ea473

Please sign in to comment.