diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/net8.0/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Shipped.txt rename to src/OpenTelemetry.Resources.AWS/.publicApi/net8.0/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/net8.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/OpenTelemetry.Resources.AWS/.publicApi/net6.0/PublicAPI.Unshipped.txt rename to src/OpenTelemetry.Resources.AWS/.publicApi/net8.0/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs index c7b8e815c2..c992995072 100644 --- a/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs +++ b/src/OpenTelemetry.Resources.AWS/AWSECSDetector.cs @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#if !NETFRAMEWORK +#if NET using System.Text.Json; using System.Text.RegularExpressions; diff --git a/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs b/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs index d28d0fc434..c26e10571d 100644 --- a/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs +++ b/src/OpenTelemetry.Resources.AWS/AWSEKSDetector.cs @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#if !NETFRAMEWORK +#if NET using System.Text; using OpenTelemetry.Resources.AWS.Models; @@ -62,7 +62,7 @@ internal static List> ExtractResourceAttributes(str { try { - var stringBuilder = new StringBuilder(); + var stringBuilder = new StringBuilder("Bearer "); using (var streamReader = ResourceDetectorUtils.GetStreamReader(path)) { @@ -72,8 +72,6 @@ internal static List> ExtractResourceAttributes(str } } - stringBuilder.Insert(0, "Bearer "); - return stringBuilder.ToString(); } catch (Exception ex) diff --git a/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs index f963f1e672..325f7a5b08 100644 --- a/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs +++ b/src/OpenTelemetry.Resources.AWS/AWSResourceBuilderExtensions.cs @@ -33,7 +33,7 @@ public static ResourceBuilder AddAWSEC2Detector(this ResourceBuilder builder) return builder.AddDetector(new AWSEC2Detector()); } -#if !NETFRAMEWORK +#if NET /// /// Enables AWS ECS resource detector. /// diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md index 8997d27ac3..96cd089d1b 100644 --- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md @@ -5,6 +5,10 @@ * Updated OpenTelemetry core component version(s) to `1.9.0`. ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) +* Drop support for .NET 6 as this target is no longer supported + and add .NET Standard 2.0 target. + ([#2164](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2164)) + ## 1.5.0-beta.1 Released 2024-Jun-04 diff --git a/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj index 102b4946b0..acfae6f7c4 100644 --- a/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj +++ b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj @@ -2,24 +2,21 @@ - net6.0 + net8.0;$(NetStandardMinimumSupportedVersion) $(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion) - OpenTelemetry Extensions - AWS Resource Detectors for ElasticBeanstalk, EC2, ECS, EKS. + OpenTelemetry Resource Detectors for AWS ElasticBeanstalk, EC2, ECS, EKS. Resources.AWS- - + true - - - - + diff --git a/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs b/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs index ab957e7539..4ec15c1a90 100644 --- a/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs +++ b/src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs @@ -6,7 +6,7 @@ #endif using System.Text; using System.Text.Json; -#if !NETFRAMEWORK +#if NET using System.Text.Json.Serialization.Metadata; #endif diff --git a/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj index 8143037e07..abfaa2d3f6 100644 --- a/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj +++ b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj @@ -1,10 +1,10 @@ - Unit test project for AWS Detector for OpenTelemetry - $(SupportedNetTargets) + $(SupportedNetTargetsWithoutNet6) $(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion) + Unit test project for AWS Detector for OpenTelemetry. @@ -25,7 +25,6 @@ PreserveNewest -