[Resources.AWS] Use System.Text.Json source generator with .NET Standard 2.0 (open-telemetry#2185)

Co-authored-by: joegoldman2 <[email protected]>
Co-authored-by: Mikel Blanchard <[email protected]>

Author: joegoldman2

src/OpenTelemetry.Resources.AWS/AWSEBSDetector.cs

@@ -84,10 +84,10 @@ internal static List<KeyValuePair<string, object>> ExtractResourceAttributes(AWS
 
     internal static AWSEBSMetadataModel? GetEBSMetadata(string filePath)
     {
-#if NET
-        return ResourceDetectorUtils.DeserializeFromFile(filePath, SourceGenerationContext.Default.AWSEBSMetadataModel);
-#else
+#if NETFRAMEWORK
         return ResourceDetectorUtils.DeserializeFromFile<AWSEBSMetadataModel>(filePath);
+#else
+        return ResourceDetectorUtils.DeserializeFromFile(filePath, SourceGenerationContext.Default.AWSEBSMetadataModel);
 #endif
     }
 }

src/OpenTelemetry.Resources.AWS/AWSEC2Detector.cs

@@ -83,10 +83,10 @@ internal static List<KeyValuePair<string, object>> ExtractResourceAttributes(AWS
 
     internal static AWSEC2IdentityDocumentModel? DeserializeResponse(string response)
     {
-#if NET
-        return ResourceDetectorUtils.DeserializeFromString(response, SourceGenerationContext.Default.AWSEC2IdentityDocumentModel);
-#else
+#if NETFRAMEWORK
         return ResourceDetectorUtils.DeserializeFromString<AWSEC2IdentityDocumentModel>(response);
+#else
+        return ResourceDetectorUtils.DeserializeFromString(response, SourceGenerationContext.Default.AWSEC2IdentityDocumentModel);
 #endif
     }
 

src/OpenTelemetry.Resources.AWS/ResourceDetectorUtils.cs

@@ -6,7 +6,7 @@
 #endif
 using System.Text;
 using System.Text.Json;
-#if NET
+#if !NETFRAMEWORK
 using System.Text.Json.Serialization.Metadata;
 #endif
 
@@ -17,7 +17,7 @@ namespace OpenTelemetry.Resources.AWS;
 /// </summary>
 internal static class ResourceDetectorUtils
 {
-#if !NET
+#if NETFRAMEWORK
     private static readonly JsonSerializerOptions JsonSerializerOptions = new(JsonSerializerDefaults.Web);
 #endif
 
@@ -47,31 +47,31 @@ internal static async Task<string> SendOutRequestAsync(
         }
     }
 
-#if NET
-    internal static T? DeserializeFromFile<T>(string filePath, JsonTypeInfo<T> jsonTypeInfo)
+#if NETFRAMEWORK
+    internal static T? DeserializeFromFile<T>(string filePath)
     {
         using (var stream = GetStream(filePath))
         {
-            return JsonSerializer.Deserialize(stream, jsonTypeInfo);
+            return JsonSerializer.Deserialize<T>(stream, JsonSerializerOptions);
         }
     }
 
-    internal static T? DeserializeFromString<T>(string json, JsonTypeInfo<T> jsonTypeInfo)
+    internal static T? DeserializeFromString<T>(string json)
     {
-        return JsonSerializer.Deserialize(json, jsonTypeInfo);
+        return JsonSerializer.Deserialize<T>(json, JsonSerializerOptions);
     }
 #else
-    internal static T? DeserializeFromFile<T>(string filePath)
+    internal static T? DeserializeFromFile<T>(string filePath, JsonTypeInfo<T> jsonTypeInfo)
     {
         using (var stream = GetStream(filePath))
         {
-            return JsonSerializer.Deserialize<T>(stream, JsonSerializerOptions);
+            return JsonSerializer.Deserialize(stream, jsonTypeInfo);
         }
     }
 
-    internal static T? DeserializeFromString<T>(string json)
+    internal static T? DeserializeFromString<T>(string json, JsonTypeInfo<T> jsonTypeInfo)
     {
-        return JsonSerializer.Deserialize<T>(json, JsonSerializerOptions);
+        return JsonSerializer.Deserialize(json, jsonTypeInfo);
     }
 #endif
 

src/OpenTelemetry.Resources.AWS/SourceGenerationContext.cs

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if NET
+#if !NETFRAMEWORK
 using System.Text.Json.Serialization;
 using OpenTelemetry.Resources.AWS.Models;