Support 30 dimensions per dimension set (#25)

* Support 30 dimensions per dimension set
* Bump version to 1.0.0

Co-authored-by: Himtanaya Bhadada <[email protected]>

Author: Himtanaya

src/Amazon.CloudWatch.EMF.Web/Amazon.CloudWatch.EMF.Web.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Library</OutputType>
-    <VersionPrefix>0.1.0</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
     <Authors>Amazon Web Services</Authors>
     <Description>Amazon CloudWatch Embedded Metric Format Client Library for ASP.Net Core Applications</Description>
     <Language>en-US</Language>

src/Amazon.CloudWatch.EMF/Amazon.CloudWatch.EMF.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <PackageId>Amazon.CloudWatch.EMF</PackageId>
-        <VersionPrefix>0.1.1</VersionPrefix>
+        <VersionPrefix>1.0.0</VersionPrefix>
         <Authors>Amazon Web Services</Authors>
         <Description>Amazon CloudWatch Embedded Metric Format Client Library</Description>
         <Language>en-US</Language>

src/Amazon.CloudWatch.EMF/Constants.cs

@@ -6,6 +6,8 @@ public class Constants
 
         public const string UNKNOWN = "Unknown";
 
+        public const int MAX_DIMENSION_SET_SIZE = 30;
+
         public const int MAX_METRICS_PER_EVENT = 100;
 
         public const string DEFAULT_NAMESPACE = "aws-embedded-metrics";

src/Amazon.CloudWatch.EMF/Exception/DimensionSetExceededException.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Amazon.CloudWatch.EMF
+{
+    public class DimensionSetExceededException : Exception
+    {
+        public DimensionSetExceededException()
+            : base("Maximum number of dimensions per dimension set allowed are " + Constants.MAX_DIMENSION_SET_SIZE +
+                   ". Account for default dimensions if not using SetDimensions.")
+        {
+        }
+
+        public DimensionSetExceededException(string message)
+            : base(message)
+        {
+        }
+
+        public DimensionSetExceededException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
+}

src/Amazon.CloudWatch.EMF/Model/DimensionSet.cs

@@ -31,6 +31,9 @@ public DimensionSet(string key, string value)
         /// <param name="value">the dimension value</param>
         public void AddDimension(string key, string value)
         {
+            if (Dimensions.Count >= Constants.MAX_DIMENSION_SET_SIZE)
+                throw new DimensionSetExceededException();
+
             Dimensions[key] = value;
         }
 
@@ -41,6 +44,10 @@ public void AddDimension(string key, string value)
         /// <returns>this dimension set with the other appended</returns>
         public DimensionSet AddRange(DimensionSet other)
         {
+            var mergedDimensionSetSize = other.DimensionKeys.Count + Dimensions.Count;
+            if (mergedDimensionSetSize > Constants.MAX_DIMENSION_SET_SIZE)
+                throw new DimensionSetExceededException();
+
             foreach (var dimension in other?.Dimensions)
             {
                 Dimensions[dimension.Key] = dimension.Value;

tests/Amazon.CloudWatch.EMF.Tests/Model/DimensionSetTests.cs

@@ -0,0 +1,52 @@
+using Amazon.CloudWatch.EMF.Model;
+using Xunit;
+
+namespace Amazon.CloudWatch.EMF.Tests.Model
+{
+    public class DimensionSetTests
+    {
+        private static DimensionSet Get_DimensionSet(int dimensionSetSize, string key = "key")
+        {
+            var dimensionSet = new DimensionSet();
+            for (var i = 0; i < dimensionSetSize; i++)
+            {
+                dimensionSet.AddDimension(key + i, "value" + i);
+            }
+
+            return dimensionSet;
+        }
+
+        [Fact]
+        public void AddDimension_30_Dimensions()
+        {
+            const int dimensionSetSize = 30;
+            var dimensionSet = Get_DimensionSet(dimensionSetSize);
+
+            Assert.Equal(dimensionSetSize, dimensionSet.DimensionKeys.Count);
+        }
+
+        [Fact]
+        public void AddDimension_Limit_Exceeded_Error()
+        {
+            Assert.Throws<DimensionSetExceededException>(() =>
+            {
+                const int dimensionSetSize = 33;
+                Get_DimensionSet(dimensionSetSize);
+            });
+        }
+
+        [Fact]
+        public void AddRange_Limit_Exceeded_Error() {
+            Assert.Throws<DimensionSetExceededException>(() =>
+            {
+                const int dimensionSetSize = 28;
+                const int otherDimensionSetSize = 5;
+                var dimensionSet = Get_DimensionSet(dimensionSetSize);
+                var otherDimensionSet = Get_DimensionSet(otherDimensionSetSize, key: "otherKey");
+
+                dimensionSet.AddRange(otherDimensionSet);
+            });
+        }
+
+    }
+}