Updated Tests and wordings

Author: lksfrnz

src/main/java/software/amazon/cloudwatchlogs/emf/model/StatisticSetBuilder.java

@@ -18,12 +18,11 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
 import lombok.NonNull;
 
 /** Represents the StatisticSet of the EMF schema. */
 class StatisticSet extends Metric {
-    @JsonIgnore @NonNull @Getter protected Statistics values;
+    @JsonIgnore @NonNull protected Statistics values;
 
     StatisticSet(
             Unit unit,
@@ -51,6 +50,11 @@ class StatisticSet extends Metric {
         this.values = statistics;
     }
 
+    @Override
+    Statistics getValues() {
+        return values;
+    }
+
     @Override
     protected Metric getMetricValuesUnderSize(int size) {
         return this;
@@ -116,7 +120,8 @@ class Statistics {
                 || (count == 1 && max != min)
                 || min + max * (count - 1) < sum
                 || max + min * (count - 1) > sum) {
-            throw new IllegalArgumentException("This is an impossible statistic set");
+            throw new IllegalArgumentException(
+                    "This is an impossible statistic set, there is no set of values that can create these statistics.");
         }
         this.max = max;
         this.min = min;

src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricsContextTest.java

@@ -46,7 +46,7 @@ void testSerializeLessThan100Metrics() throws JsonProcessingException, InvalidMe
         List<String> events = mc.serialize();
         Assertions.assertEquals(1, events.size());
 
-        List<MetricDefinition> metrics = parseMetrics(events.get(0));
+        List<MetricDefinition> metrics = parseMetricDefinitions(events.get(0));
         Assertions.assertEquals(metrics.size(), metricCount);
         for (MetricDefinition metric : metrics) {
             MetricDefinition originalMetric =
@@ -71,7 +71,7 @@ void testSerializeMoreThen100Metrics() throws JsonProcessingException, InvalidMe
 
         List<MetricDefinition> allMetrics = new ArrayList<>();
         for (String event : events) {
-            allMetrics.addAll(parseMetrics(event));
+            allMetrics.addAll(parseMetricDefinitions(event));
         }
         Assertions.assertEquals(metricCount, allMetrics.size());
         for (MetricDefinition metric : allMetrics) {
@@ -97,7 +97,7 @@ void testSerializeAMetricWith101DataPoints()
         Assertions.assertEquals(expectedEventCount, events.size());
         List<MetricDefinition> allMetrics = new ArrayList<>();
         for (String event : events) {
-            allMetrics.addAll(parseMetrics(event));
+            allMetrics.addAll(parseMetricDefinitions(event));
         }
         List<Double> expectedValues = new ArrayList<>();
         for (int i = 0; i < Constants.MAX_DATAPOINTS_PER_METRIC; i++) {
@@ -122,8 +122,8 @@ void testSerializeMetricsWith101DataPoints()
         List<String> events = mc.serialize();
         Assertions.assertEquals(expectedEventCount, events.size());
 
-        List<MetricDefinition> metricsFromEvent1 = parseMetrics(events.get(0));
-        List<MetricDefinition> metricsFromEvent2 = parseMetrics(events.get(1));
+        List<MetricDefinition> metricsFromEvent1 = parseMetricDefinitions(events.get(0));
+        List<MetricDefinition> metricsFromEvent2 = parseMetricDefinitions(events.get(1));
 
         Assertions.assertEquals(2, metricsFromEvent1.size());
         List<Double> expectedValues = new ArrayList<>();
@@ -155,6 +155,23 @@ void testSerializeZeroMetric()
         Assertions.assertFalse(rootNode.containsKey("_aws"));
     }
 
+    @Test
+    void testSerializeStatisticSetMetric() throws JsonProcessingException {
+        MetricsContext mc = new MetricsContext();
+        int dataPointCount = 100;
+        String metricName = "metric1";
+        for (int i = 0; i < dataPointCount; i++) {
+            mc.putMetric(metricName, i, AggregationType.STATISTIC_SET);
+        }
+
+        List<String> events = mc.serialize();
+        System.out.println(events);
+        List<StatisticSet> statisticSets = parseStatisticSetMetrics(events.get(0));
+        Assertions.assertEquals(1, statisticSets.size());
+        Assertions.assertEquals(
+                new Statistics(99., 0., 100, 4950.), statisticSets.get(0).getValues());
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     void testSetTimestamp()
@@ -189,7 +206,8 @@ void testPutMetadata() {
     }
 
     @SuppressWarnings("unchecked")
-    private ArrayList<MetricDefinition> parseMetrics(String event) throws JsonProcessingException {
+    private ArrayList<MetricDefinition> parseMetricDefinitions(String event)
+            throws JsonProcessingException {
         Map<String, Object> rootNode = parseRootNode(event);
         Map<String, Object> metadata = (Map<String, Object>) rootNode.get("_aws");
         ArrayList<Map<String, Object>> metricDirectives =
@@ -215,6 +233,35 @@ private ArrayList<MetricDefinition> parseMetrics(String event) throws JsonProces
         return metricDefinitions;
     }
 
+    @SuppressWarnings("unchecked")
+    private ArrayList<StatisticSet> parseStatisticSetMetrics(String event)
+            throws JsonProcessingException {
+        Map<String, Object> rootNode = parseRootNode(event);
+        Map<String, Object> metadata = (Map<String, Object>) rootNode.get("_aws");
+        ArrayList<Map<String, Object>> metricDirectives =
+                (ArrayList<Map<String, Object>>) metadata.get("CloudWatchMetrics");
+        ArrayList<Map<String, String>> metrics =
+                (ArrayList<Map<String, String>>) metricDirectives.get(0).get("Metrics");
+
+        ArrayList<StatisticSet> statisticSets = new ArrayList<>();
+        for (Map<String, String> metric : metrics) {
+            String name = metric.get("Name");
+            Unit unit = Unit.fromValue(metric.get("Unit"));
+            Map value = (Map) rootNode.get(name);
+            statisticSets.add(
+                    new StatisticSet(
+                            name,
+                            unit,
+                            StorageResolution.STANDARD,
+                            new Statistics(
+                                    (Double) value.get("Max"),
+                                    (Double) value.get("Min"),
+                                    (int) value.get("Count"),
+                                    (Double) value.get("Sum"))));
+        }
+        return statisticSets;
+    }
+
     private Map<String, Object> parseRootNode(String event) throws JsonProcessingException {
         return new JsonMapper().readValue(event, new TypeReference<Map<String, Object>>() {});
     }