[Resources.AWS] Remove .NET 6 target and add .NET Standard 2.0 (#2164)

Co-authored-by: joegoldman2 <[email protected]> Co-authored-by: Mikel Blanchard <[email protected]>
open-telemetry · Oct 4, 2024 · 98a36c8 · 98a36c8
1 parent 1f7c44e
commit 98a36c8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/...S/.publicApi/net6.0/PublicAPI.Shipped.txt → ...S/.publicApi/net8.0/PublicAPI.Shipped.txt b/...S/.publicApi/net6.0/PublicAPI.Shipped.txt → ...S/.publicApi/net8.0/PublicAPI.Shipped.txt
diff --git a/....publicApi/net6.0/PublicAPI.Unshipped.txt → ....publicApi/net8.0/PublicAPI.Unshipped.txt b/....publicApi/net6.0/PublicAPI.Unshipped.txt → ....publicApi/net8.0/PublicAPI.Unshipped.txt
diff --git 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
@@ -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<KeyValuePair<string, object>> 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<KeyValuePair<string, object>> 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
@@ -33,7 +33,7 @@ public static ResourceBuilder AddAWSEC2Detector(this ResourceBuilder builder)
         return builder.AddDetector(new AWSEC2Detector());
     }
 
-#if !NETFRAMEWORK
+#if NET
     /// <summary>
     /// Enables AWS ECS resource detector.
     /// </summary>

diff --git 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
@@ -2,24 +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 - AWS Resource Detectors for ElasticBeanstalk, EC2, ECS, EKS.</Description>
+    <Description>OpenTelemetry Resource Detectors for AWS ElasticBeanstalk, EC2, ECS, EKS.</Description>
     <MinVerTagPrefix>Resources.AWS-</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)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Unit test project for AWS 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 AWS Detector for OpenTelemetry.</Description>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,7 +25,6 @@
     <None Update="ecs_metadata\metadatav4-response-task-fargate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-
   </ItemGroup>
 
   <ItemGroup>