Metrics AOT ready, New SerializationContext

Author: hjgraca

libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj

@@ -5,14 +5,12 @@
         <Description>Powertools for AWS Lambda (.NET) - Metrics package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Metrics</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Metrics</RootNamespace>
+        <Version>1.9.3</Version>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Serializer\" />
+        <TrimmerRootAssembly Include="AWS.Lambda.Powertools.Common" />
     </ItemGroup>
 
 </Project>

libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricResolution.cs

@@ -6,7 +6,6 @@ namespace AWS.Lambda.Powertools.Metrics;
 /// <summary>
 /// Enum MetricResolution
 /// </summary>
-// [JsonConverter(typeof(StringEnumConverter))]
 public enum MetricResolution
 {
     /// <summary>

libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricUnit.cs

@@ -21,7 +21,11 @@ namespace AWS.Lambda.Powertools.Metrics;
 /// <summary>
 /// Enum MetricUnit
 /// </summary>
+#if NET8_0_OR_GREATER
+[JsonConverter(typeof(JsonStringEnumConverter<MetricUnit>))]
+#else
 [JsonConverter(typeof(StringEnumConverter))]
+#endif
 public enum MetricUnit
 {
     /// <summary>

libraries/src/AWS.Lambda.Powertools.Metrics/Model/RootNode.cs

@@ -65,6 +65,11 @@ public string Serialize()
     {
         if (string.IsNullOrWhiteSpace(AWS.GetNamespace())) throw new SchemaValidationException("namespace");
 
+#if NET8_0_OR_GREATER
+
+        return JsonSerializer.Serialize(this, typeof(RootNode), MetricsSerializationContext.Default);
+#else
         return JsonSerializer.Serialize(this);
+#endif
     }
 }

libraries/src/AWS.Lambda.Powertools.Metrics/Serializer/MetricsSerializationContext.cs

@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace AWS.Lambda.Powertools.Metrics;
+
+#if NET8_0_OR_GREATER
+/// <summary>
+/// Source generator for Metrics types
+/// </summary>
+[JsonSerializable(typeof(string))]
+[JsonSerializable(typeof(double))]
+[JsonSerializable(typeof(List<double>))]
+[JsonSerializable(typeof(MetricUnit))]
+[JsonSerializable(typeof(MetricDefinition))]
+[JsonSerializable(typeof(DimensionSet))]
+[JsonSerializable(typeof(Metadata))]
+[JsonSerializable(typeof(MetricDirective))]
+[JsonSerializable(typeof(MetricResolution))]
+[JsonSerializable(typeof(MetricsContext))]
+[JsonSerializable(typeof(RootNode))]
+public partial class MetricsSerializationContext : JsonSerializerContext
+{
+
+}
+#endif

libraries/src/AWS.Lambda.Powertools.Metrics/Serializer/StringEnumConverter.cs

@@ -22,9 +22,12 @@
 
 namespace AWS.Lambda.Powertools.Metrics;
 
+#if NET6_0
+
 /// <summary>
 ///     Class StringEnumConverter.
 ///     Implements the <see cref="System.Text.Json.Serialization.JsonConverterFactory" />
+///     .NET 6 only
 /// </summary>
 /// <seealso cref="System.Text.Json.Serialization.JsonConverterFactory" />
 public class StringEnumConverter : JsonConverterFactory
@@ -95,4 +98,5 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
                 _allowIntegerValues).CreateConverter(typeToConvert, options)
             : _baseConverter.CreateConverter(typeToConvert, options);
     }
-}
+}
+#endif

libraries/src/Directory.Build.props

@@ -19,6 +19,14 @@
 
     </PropertyGroup>
 
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+<!--        Enable to force errors on AOT common warnings -->
+<!--        <WarningsAsErrors>IL2026,IL2067,IL2075</WarningsAsErrors>-->
+        <IsTrimmable>true</IsTrimmable>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="\" />
         <None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />