Skip to content

Update dependencies and improve project configuration #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevejgordon merged 3 commits into from
Apr 27, 2026
Merged

Update dependencies and improve project configuration #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0242e
Update dependencies and improve project configuration
stevejgordon Apr 24, 2026
5e9000a
Fix dependencies and test issues
stevejgordon Apr 24, 2026
43e5adf
Fix formatting
stevejgordon Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 63 additions & 38 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,60 +4,85 @@
</PropertyGroup>
<ItemGroup>
<!-- OpenTelemetry -->
<PackageVersion Include="OpenTelemetry" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.14.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.15.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.OpAmp.Client" Version="0.2.0-alpha.1" />
<!-- Microsoft Extensions -->
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<!--
Match the major version of Microsoft.Extensions.* packages to the major version of the TFM's
shared framework. Pinning 10.0.0 across all TFMs breaks the zip/profiler scenario: the net8.0
build of the plugin ends up with a hard reference to M.E.* 10.0.0 which cannot be resolved on
a .NET 8 host (shared framework only supplies 8.x). It also forces NuGet consumers onto a
higher runtime version than necessary. Pattern follows upstream OpenTelemetry-dotnet.
-->
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[10.0.0,)" />
<!-- General -->
<PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta16" />
<PackageVersion Include="Polyfill" Version="9.3.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.203" />
<PackageVersion Include="MinVer" Version="7.0.0" />
<PackageVersion Include="NetEscapades.EnumGenerators.Generators" Version="1.0.0-beta21" />
<PackageVersion Include="Polyfill" Version="10.3.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<!-- Transient dependencies -->
<!-- We bring this in explicitly because it is required by the OpAMP client implementation,
however, that package brings in a version with a known AoT issue. We force a newer dependency
to avoid build warnings for AoT consumers. -->
<!--
We bring this in explicitly because it is required by the OpAMP client implementation,
however, that package brings in a version with a known AoT issue. We force a newer dependency
to avoid build warnings for AoT consumers.
-->
<PackageVersion Include="Google.Protobuf" Version="3.34.1" />
<!-- Build -->
<PackageVersion Include="Argu" Version="6.2.5" />
<PackageVersion Include="Bullseye" Version="6.0.0" />
<PackageVersion Include="Bullseye" Version="6.1.0" />
<PackageVersion Include="Octokit" Version="14.0.0" />
<PackageVersion Include="Proc.Fs" Version="0.11.0" />
<PackageVersion Include="Proc.Fs" Version="0.14.0" />
<PackageVersion Include="Fake.Tools.Git" Version="6.1.4" />
<!-- Testing -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="JunitXml.TestLogger" Version="7.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageVersion Include="JunitXml.TestLogger" Version="8.0.0" />
<PackageVersion Include="Nullean.VsTest.Pretty.TestLogger" Version="0.10.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="Testcontainers" Version="4.9.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
<PackageVersion Include="Testcontainers" Version="4.11.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.3" />
<PackageVersion Include="Grpc.Tools" Version="2.80.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.22" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.26" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.15" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" Condition="'$(TargetFramework)' == 'net10.0'" />
<!-- Examples -->
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
</ItemGroup>
<!-- Per-TFM overrides for Microsoft.Extensions.* to match the shared framework major version. -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="[8.0.2,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Http.Resilience" Version="[8.10.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Console" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.ServiceDiscovery" Version="[8.2.2,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Http.Resilience" Version="[9.8.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Console" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.ServiceDiscovery" Version="[9.3.1,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0,)" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Elastic.OpenTelemetry.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
<Project Path="tests/Elastic.OpenTelemetry.Tests/Elastic.OpenTelemetry.Tests.csproj" />
</Folder>
<Folder Name="/tests/applications/">
<Project Path="test-applications/AutoInstr.Console.Net10/AutoInstr.Console.Net10.csproj" />
<Project Path="test-applications/AutoInstr.Console.Net8/AutoInstr.Console.Net8.csproj" />
<Project Path="test-applications/AutoInstr.Console.Net9/AutoInstr.Console.Net9.csproj" />
<Project Path="test-applications/NuGetAutoInstr.Aot.Net10/NuGetAutoInstr.Aot.Net10.csproj" />
<Project Path="test-applications/NuGetAutoInstr.Net10/NuGetAutoInstr.Net10.csproj" />
<Project Path="test-applications/NuGetConsumer.Net462/NuGetConsumer.Net462.csproj" />
Expand Down
5 changes: 5 additions & 0 deletions aspire.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"appHost": {
"path": "examples/AppHost/AppHost.csproj"
}
}
2 changes: 1 addition & 1 deletion dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"minver-cli": {
"version": "6.0.0",
"version": "7.0.0",
"commands": [
"minver"
]
Expand Down
8 changes: 1 addition & 7 deletions examples/AppHost/AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
<Project Sdk="Aspire.AppHost.Sdk/13.2.3">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -11,10 +9,6 @@
<MinVerSkip>true</MinVerSkip>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Example.AspNetCore.Mvc\Example.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\Example.MinimalApi\Example.MinimalApi.csproj" />
Expand Down
4 changes: 3 additions & 1 deletion ...lastic.OpenTelemetry.AutoInstrumentation/Elastic.OpenTelemetry.AutoInstrumentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" PrivateAssets="all" />
<PackageReference Include="Polyfill" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="NetEscapades.EnumGenerators" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="NetEscapades.EnumGenerators.Generators" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Elastic.OpenTelemetry.AutoInstrumentation/_instrument.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ Attempting to use the native profiler from runtimes\win-x64\native and runtimes\
set COR_ENABLE_PROFILING=1
set COR_PROFILER={918728DD-259F-4A6A-AC2B-B85E1B658318}

:: On .NET Framework automatic assembly redirection MUST be disabled. This setting
:: is ignored on .NET. This is necessary because the NuGet package doesn't bring
:: the pre-defined versions of the transitive dependencies used in the automatic
:: redirection. Instead the transitive dependencies versions are determined by
:: Automatic assembly redirection MUST be disabled. This is necessary
:: because the NuGet package doesn't bring the pre-defined versions
:: of the transitive dependencies used in the automatic redirection.
:: Instead the transitive dependencies versions are determined by
:: the NuGet version resolution algorithm when building the application.
set OTEL_DOTNET_AUTO_NETFX_REDIRECT_ENABLED=false
set OTEL_DOTNET_AUTO_REDIRECT_ENABLED=false

:: Settings for .NET
set ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper
Expand Down
7 changes: 7 additions & 0 deletions src/Elastic.OpenTelemetry.AutoInstrumentation/_instrument.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ fi

export CORECLR_PROFILER_PATH

# Automatic assembly redirection MUST be disabled. This is necessary
# because the NuGet package doesn't bring the pre-defined versions
# of the transitive dependencies used in the automatic redirection.
# Instead the transitive dependencies versions are determined by
# the NuGet version resolution algorithm when building the application.
export OTEL_DOTNET_AUTO_REDIRECT_ENABLED=false

# Settings for .NET
export ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper
export CORECLR_ENABLE_PROFILING=1
Expand Down
6 changes: 4 additions & 2 deletions src/Elastic.OpenTelemetry.Core/Elastic.OpenTelemetry.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand All @@ -20,7 +20,9 @@
<PackageReference Include="OpenTelemetry.Resources.Host" />
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" />
<PackageReference Include="Polyfill" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="NetEscapades.EnumGenerators" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="NetEscapades.EnumGenerators.Generators" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'">
Expand Down
4 changes: 3 additions & 1 deletion src/Elastic.OpenTelemetry/Elastic.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
<PackageReference Include="Google.Protobuf" />

<PackageReference Include="Polyfill" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="NetEscapades.EnumGenerators" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="NetEscapades.EnumGenerators.Generators" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
Expand Down
18 changes: 18 additions & 0 deletions test-applications/AutoInstr.Console.Net10/AutoInstr.Console.Net10.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<MinVerSkip>true</MinVerSkip>
</PropertyGroup>

<ItemGroup>
<!-- Remove MinVer inherited from Directory.Build.props — not needed for this standalone app -->
<PackageReference Remove="MinVer" />
</ItemGroup>

<!-- No Elastic references — the auto-instrumentation profiler injects everything. -->

</Project>
11 changes: 11 additions & 0 deletions test-applications/AutoInstr.Console.Net10/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

// Plain console app — no Elastic or OpenTelemetry references.
// The auto-instrumentation profiler injects EDOT at runtime via env vars
// (CORECLR_ENABLE_PROFILING, CORECLR_PROFILER, etc.).

Console.WriteLine("APP_STARTED");
await Task.Delay(30_000).ConfigureAwait(false);
Console.WriteLine("APP_COMPLETE");
18 changes: 18 additions & 0 deletions test-applications/AutoInstr.Console.Net9/AutoInstr.Console.Net9.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<MinVerSkip>true</MinVerSkip>
</PropertyGroup>

<ItemGroup>
<!-- Remove MinVer inherited from Directory.Build.props — not needed for this standalone app -->
<PackageReference Remove="MinVer" />
</ItemGroup>

<!-- No Elastic references — the auto-instrumentation profiler injects everything. -->

</Project>
11 changes: 11 additions & 0 deletions test-applications/AutoInstr.Console.Net9/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

// Plain console app — no Elastic or OpenTelemetry references.
// The auto-instrumentation profiler injects EDOT at runtime via env vars
// (CORECLR_ENABLE_PROFILING, CORECLR_PROFILER, etc.).

Console.WriteLine("APP_STARTED");
await Task.Delay(30_000).ConfigureAwait(false);
Console.WriteLine("APP_COMPLETE");
3 changes: 1 addition & 2 deletions tests/AutoInstrumentation.IntegrationTests/PluginLoaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public PluginLoaderTests()
.Build();

_output = Consume.RedirectStdoutAndStderrToStream(new MemoryStream(), new MemoryStream());
_container = new ContainerBuilder()
.WithImage(_image)
_container = new ContainerBuilder(_image)
.WithPortBinding(5000, 8080)
.WithLogger(ConsoleLogger.Instance)
.WithOutputConsumer(_output)
Expand Down
Loading
Loading