Skip to content

Commit

Permalink
Bump OTel .NET Auto to 1.10.0-beta.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Kielek committed Dec 17, 2024
1 parent 824e60c commit 2b53a34
Show file tree
Hide file tree
Showing 35 changed files with 145 additions and 174 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.427
7.0.410
8.0.403
8.0.404
9.0.101
- run: ./build.cmd Workflow
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
Expand Down Expand Up @@ -132,9 +131,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.427
7.0.410
8.0.403
8.0.404
9.0.101
- run: ./build.cmd NuGetWorkflow
- uses: actions/[email protected]
with:
Expand All @@ -157,9 +155,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.427
7.0.410
8.0.403
8.0.404
9.0.101
- name: Download NuGet Artifacts from build-nuget-package job
uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
dotnet-version: 8.0.403
dotnet-version: 9.0.101

- name: dotnet format
run: dotnet format ./Splunk.OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
16 changes: 8 additions & 8 deletions .github/workflows/scripts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
steps:
- uses: actions/[email protected]
with:
dotnet-version: 8.0.403
dotnet-version: 9.0.101
- name: Test the PowerShell module instructions from README.md
shell: powershell
run: |
mkdir testapp
cd testapp
dotnet new console
dotnet publish -f net8.0 -c Release
dotnet publish -f net9.0 -c Release
$module_url = "https://github.com/signalfx/splunk-otel-dotnet/releases/download/${{ github.event.release.tag_name }}/Splunk.OTel.DotNet.psm1"
$dl_path = Join-Path $env:temp "Splunk.OTel.DotNet.psm1"
$log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
Expand All @@ -26,12 +26,12 @@ jobs:
Install-OpenTelemetryCore
$install_dir = Get-OpenTelemetryInstallDirectory
Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
./bin/Release/net8.0/publish/testapp
./bin/Release/net9.0/publish/testapp
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
Remove-Item $log_path
Unregister-OpenTelemetryForCurrentSession
./bin/Release/net8.0/publish/testapp
./bin/Release/net9.0/publish/testapp
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
Uninstall-OpenTelemetryCore
Expand Down Expand Up @@ -64,14 +64,14 @@ jobs:
mkdir testapp
cd testapp
dotnet new console
dotnet publish -f net8.0 -c Release
dotnet publish -f net9.0 -c Release
set -e
curl -sSfL https://github.com/signalfx/splunk-otel-dotnet/releases/download/${{ github.event.release.tag_name }}/splunk-otel-dotnet-install.sh -O
sh ./splunk-otel-dotnet-install.sh
test "$(ls -A "$HOME/.splunk-otel-dotnet")"
curl -sSfL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
./bin/Release/net8.0/publish/testapp
./bin/Release/net9.0/publish/testapp
test "$(ls -A '${{ matrix.log-dir }}' )"
shell-scripts-container:
Expand All @@ -91,12 +91,12 @@ jobs:
mkdir testapp
cd testapp
dotnet new console
dotnet publish /p:TreatWarningsAsErrors=false -f net8.0 -c Release
dotnet publish /p:TreatWarningsAsErrors=false -f net9.0 -c Release
curl -sSfL https://github.com/signalfx/splunk-otel-dotnet/releases/download/${{ github.event.release.tag_name }}/splunk-otel-dotnet-install.sh -O
sh ./splunk-otel-dotnet-install.sh
test "$(ls -A "$HOME/.splunk-otel-dotnet")"
curl -sSfL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
./bin/Release/net8.0/publish/testapp
./bin/Release/net9.0/publish/testapp
test "$(ls -A /var/log/opentelemetry/dotnet )"
'
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.8.0...HEAD)

This release is built on top of [OpenTelemetry .NET Auto Instrumentation v1.10.0-beta.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.10.0-beta.1).

### Added

### Changed

- Updated [OpenTelemetry .NET Auto Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation):
[`1.10.0-beta.1`](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.10.0-beta.1).

### Deprecated

### Removed
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Splunk Distribution of OpenTelemetry .NET

[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.9.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.9.0)
[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.9.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.9.0)
[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.10.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0)
[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.10.0.beta.1-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.10.0-beta.1)
[![Splunk GDI Specification](https://img.shields.io/badge/GDI-1.6.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0)
[![Keep a Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog-%23E05735)](CHANGELOG.md)
[![LICENSE](https://img.shields.io/github/license/signalfx/splunk-otel-dotnet)](LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion build/Build.InstallationScripts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Build : NukeBuild
foreach (var templateFile in templateFiles)
{
var scriptFile = InstallationScriptsFolder / templateFile.Name.Replace(".template", "");
FileSystemTasks.CopyFile(templateFile, scriptFile);
templateFile.Copy(scriptFile);
scriptFile.UpdateText(x =>
x.Replace("{{VERSION}}", VersionHelper.GetVersion()));
}
Expand Down
16 changes: 6 additions & 10 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ partial class Build : NukeBuild
[Parameter("Configuration to build - Default is 'Release'")]
readonly Configuration Configuration = Configuration.Release;

const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.9.0";
const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.10.0-beta.1";

[Parameter($"OpenTelemetry AutoInstrumentation dependency version - Default is '{OpenTelemetryAutoInstrumentationDefaultVersion}'")]
readonly string OpenTelemetryAutoInstrumentationVersion = OpenTelemetryAutoInstrumentationDefaultVersion;
Expand Down Expand Up @@ -116,17 +116,13 @@ static string GetOTelAutoInstrumentationFileName()
.After(Compile)
.Executes(() =>
{
FileSystemTasks.CopyFileToDirectory(
RootDirectory / "src" / "Splunk.OpenTelemetry.AutoInstrumentation" / "bin" / Configuration /
"net6.0" / "Splunk.OpenTelemetry.AutoInstrumentation.dll",
OpenTelemetryDistributionFolder / "net");
(RootDirectory / "src" / "Splunk.OpenTelemetry.AutoInstrumentation" / "bin" / Configuration /
"net8.0" / "Splunk.OpenTelemetry.AutoInstrumentation.dll").CopyToDirectory(OpenTelemetryDistributionFolder / "net");

if (EnvironmentInfo.IsWin)
{
FileSystemTasks.CopyFileToDirectory(
RootDirectory / "src" / "Splunk.OpenTelemetry.AutoInstrumentation" / "bin" / Configuration /
"net462" / "Splunk.OpenTelemetry.AutoInstrumentation.dll",
OpenTelemetryDistributionFolder / "netfx");
(RootDirectory / "src" / "Splunk.OpenTelemetry.AutoInstrumentation" / "bin" / Configuration /
"net462" / "Splunk.OpenTelemetry.AutoInstrumentation.dll").CopyToDirectory(OpenTelemetryDistributionFolder / "netfx");
}
});

Expand All @@ -136,7 +132,7 @@ static string GetOTelAutoInstrumentationFileName()
{
var source = RootDirectory / "instrument.sh";
var dest = OpenTelemetryDistributionFolder;
FileSystemTasks.CopyFileToDirectory(source, dest, FileExistsPolicy.Overwrite);
source.CopyToDirectory(dest, ExistsPolicy.FileOverwrite);
});

Target ExtendLicenseFile => _ => _
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="9.0.3" />
</ItemGroup>

<!-- Reference MinVer so the locally built NuGet version is available when building test applications -->
Expand Down
5 changes: 4 additions & 1 deletion build/_build.csproj.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
Expand All @@ -24,4 +26,5 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
5 changes: 2 additions & 3 deletions docker/alpine-arm64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-alpine3.20
FROM mcr.microsoft.com/dotnet/sdk:9.0.101-alpine3.20

RUN apk update \
&& apk upgrade \
Expand All @@ -22,8 +22,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "c169af55281cd1e58cdbe3ec95c2480cfb210ee460b3ff1421745c8f3236b263 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

# uid 1000 is the uid of the user in our environement
Expand Down
5 changes: 2 additions & 3 deletions docker/alpine-x64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-alpine3.20
FROM mcr.microsoft.com/dotnet/sdk:9.0.101-alpine3.20

RUN apk update \
&& apk upgrade \
Expand All @@ -22,8 +22,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "c169af55281cd1e58cdbe3ec95c2480cfb210ee460b3ff1421745c8f3236b263 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

WORKDIR /project
5 changes: 2 additions & 3 deletions docker/debian-arm64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.403-bookworm-slim
FROM mcr.microsoft.com/dotnet/sdk:9.0.101-bookworm-slim

RUN apt-get update && \
apt-get install -y \
Expand All @@ -11,8 +11,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "c169af55281cd1e58cdbe3ec95c2480cfb210ee460b3ff1421745c8f3236b263 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh -v 6.0.427 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 7.0.410 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

# uid 1000 is the uid of the user in our environement
Expand Down
6 changes: 3 additions & 3 deletions docs/advanced-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## OpenTelemetry configuration

See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.9.0/docs/config.md)
See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.10.0-beta.1/docs/config.md)
for configuration details.

## Splunk distribution configuration
Expand All @@ -23,7 +23,7 @@ Download and install the latest binaries from

When running your application, make sure to:

1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.9.0/docs/config.md#resources).
1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.10-beta.1.0/docs/config.md#resources).
1. Set the environment variables from the table below.

| Environment variable | .NET version | Value |
Expand All @@ -45,7 +45,7 @@ When running your application, make sure to:
| `OTEL_DOTNET_AUTO_HOME` | All versions | `$INSTALL_DIR` |
| `OTEL_DOTNET_AUTO_PLUGINS` | All versions | `Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation` |

> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.9.0/docs/config.md#net-clr-profiler).
> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.10.0-beta.1/docs/config.md#net-clr-profiler).
## Splunk plugin settings

Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net8.0;net462</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<Reference Include="System.Configuration" />
<Reference Include="System.Web" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.9.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.10.0-beta.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -62,7 +62,7 @@
<Content Include="splunk-launch.*">
<PackageCopyToOutput>true</PackageCopyToOutput>
</Content>
<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.9.0">
<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.10.0">
<PrivateAssets>none</PrivateAssets> <!-- Ensures that content and build transitive dependencies are properly delivered -->
</PackageReference>
<None Include="splunk-logo-256x256.png" Pack="true" PackagePath="images" />
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<!-- only run .NET Framework tests on Windows -->
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 2b53a34

Please sign in to comment.