From 5e549ef724aa97a37aa49195c1f2fbf9c99031b0 Mon Sep 17 00:00:00 2001
From: Chris Larsen <clarsen@netflix.com>
Date: Mon, 20 Mar 2023 15:06:19 -0700
Subject: [PATCH] Atlas Cloud Watch: Add a unit test validating separate
 min/max rules (#423)

via streaming.
---
 .../src/test/resources/test-rules.conf        | 10 +++++
 .../CloudWatchMetricsProcessorSuite.scala     | 45 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/atlas-cloudwatch/src/test/resources/test-rules.conf b/atlas-cloudwatch/src/test/resources/test-rules.conf
index 8dcb4b2f..2658a25e 100644
--- a/atlas-cloudwatch/src/test/resources/test-rules.conf
+++ b/atlas-cloudwatch/src/test/resources/test-rules.conf
@@ -30,6 +30,16 @@ atlas {
           name = "Max"
           alias = "aws.utm.max"
           conversion = "max"
+        },
+        {
+          name = "TwoRuleMatch"
+          alias = "aws.utm.2rulematch"
+          conversion = "min"
+        },
+        {
+          name = "TwoRuleMatch"
+          alias = "aws.utm.2rulematch"
+          conversion = "max"
         }
       ]
     }
diff --git a/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CloudWatchMetricsProcessorSuite.scala b/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CloudWatchMetricsProcessorSuite.scala
index 61d772b3..e9095fd0 100644
--- a/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CloudWatchMetricsProcessorSuite.scala
+++ b/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CloudWatchMetricsProcessorSuite.scala
@@ -686,6 +686,49 @@ class CloudWatchMetricsProcessorSuite extends FunSuite with TestKitBase with Imp
     assertCounters(1, publishFuture = 1)
   }
 
+  test("processDatapoints 2 rules match") {
+    processor.processDatapoints(
+      List(
+        makeFirehoseMetric(
+          "AWS/UT1",
+          "TwoRuleMatch",
+          List(Dimension.builder().name("MyTag").value("Val").build()),
+          Array(39.0, 1.0, 7.0, 19),
+          "None",
+          timestamp - 60_00
+        )
+      ),
+      timestamp - 60_00
+    )
+
+    // yup, two values with the same tag set. Just the min and max values.
+    assertPublished(
+      List(
+        com.netflix.atlas.core.model.Datapoint(
+          Map(
+            "name"         -> "aws.utm.2rulematch",
+            "nf.region"    -> "us-west-2",
+            "aws.tag"      -> "Val",
+            "atlas.dstype" -> "gauge"
+          ),
+          timestamp,
+          1
+        ),
+        com.netflix.atlas.core.model.Datapoint(
+          Map(
+            "name"         -> "aws.utm.2rulematch",
+            "nf.region"    -> "us-west-2",
+            "aws.tag"      -> "Val",
+            "atlas.dstype" -> "gauge"
+          ),
+          timestamp,
+          7
+        )
+      )
+    )
+    assertCounters(1)
+  }
+
   test("normalize") {
     assertEquals(1677706140000L, normalize(1677706164123L, 60))
     assertEquals(1677705900000L, normalize(1677706164123L, 300))
@@ -941,7 +984,7 @@ class CloudWatchMetricsProcessorSuite extends FunSuite with TestKitBase with Imp
     assertEquals(routerCaptor.values.size, dps.size)
 
     dps.foreach { dp =>
-      val metric = routerCaptor.values.filter(_.tags.equals(dp.tags)).headOption match {
+      val metric = routerCaptor.values.filter(_.equals(dp)).headOption match {
         case Some(d) => d
         case None =>
           throw new AssertionError(s"Data point not found: ${dp} in ${routerCaptor.values}")