Skip to content

[Resources.OperatingSystem] Replace .NET 6 target with .NET 8 and add .NET Standard 2.0 target #2169

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
Kielek merged 3 commits into from
Oct 4, 2024
Merged

[Resources.OperatingSystem] Replace .NET 6 target with .NET 8 and add .NET Standard 2.0 target #2169

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
9036f99
[Resources.OperatingSystem] Replace .NET 6 target with .NET 8 and add…
joegoldman2 Oct 4, 2024
21a1e99
Add changelog entry
joegoldman2 Oct 4, 2024
0e340f3
Merge branch 'main' into resourcesos-tfm
Kielek Oct 4, 2024
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
4 changes: 4 additions & 0 deletions src/OpenTelemetry.Resources.OperatingSystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

* Drop support for .NET 6 as this target is no longer supported
and add .NET 8/.NET Standard 2.0 targets.
([#2169](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2169))

## 0.1.0-alpha.4

Released 2024-Sep-09
Expand Down
9 changes: 5 additions & 4 deletions src/OpenTelemetry.Resources.OperatingSystem/OpenTelemetry.Resources.OperatingSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@

<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>OpenTelemetry Extensions - Operating System Resource Detector for .NET</Description>
<Description>OpenTelemetry Resource Detectors for Operating System.</Description>
<MinVerTagPrefix>Resources.OperatingSystem-</MinVerTagPrefix>
</PropertyGroup>

<!--Do not run Package Baseline Validation as this package has never released a stable version.
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property.-->
<!-- Do not run Package Baseline Validation as this package has never released a stable version.
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property. -->
<PropertyGroup>
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
</ItemGroup>

<ItemGroup>
Expand Down
21 changes: 11 additions & 10 deletions src/OpenTelemetry.Resources.OperatingSystem/OperatingSystemDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#if NET
#if !NETFRAMEWORK
using System.Runtime.InteropServices;
#endif
#if NET
using System.Xml.Linq;
#endif

using static OpenTelemetry.Resources.OperatingSystem.OperatingSystemSemanticConventions;

namespace OpenTelemetry.Resources.OperatingSystem;
Expand All @@ -18,16 +19,16 @@ internal sealed class OperatingSystemDetector : IResourceDetector
private const string RegistryKey = @"SOFTWARE\Microsoft\Windows NT\CurrentVersion";
private const string KernelOsRelease = "/proc/sys/kernel/osrelease";
private static readonly string[] DefaultEtcOsReleasePaths =
[
"/etc/os-release",
"/usr/lib/os-release"
];
[
"/etc/os-release",
"/usr/lib/os-release"
];

private static readonly string[] DefaultPlistFilePaths =
[
"/System/Library/CoreServices/SystemVersion.plist",
"/System/Library/CoreServices/ServerVersion.plist"
];
[
"/System/Library/CoreServices/SystemVersion.plist",
"/System/Library/CoreServices/ServerVersion.plist"
];

private readonly string? osType;
private readonly string? registryKey;
Expand Down
4 changes: 2 additions & 2 deletions ...etry.Resources.OperatingSystem.Tests/OpenTelemetry.Resources.OperatingSystem.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Unit test project for Operating System Detector for OpenTelemetry</Description>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>Unit test project for Operating System Detector for OpenTelemetry.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down