Use RecentlyActive feature to only list metrics older than 3 hours when necessary

pom.xml

@@ -46,17 +46,17 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-cloudwatch</artifactId>
-      <version>1.11.708</version>
+      <version>1.11.839</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-sts</artifactId>
-      <version>1.11.708</version>
+      <version>1.11.839</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-resourcegroupstaggingapi</artifactId>
-      <version>1.11.708</version>
+      <version>1.11.839</version>
     </dependency>
     <!--
       Older versions of jackson-databind have remote code execution vulnerabilities

src/main/java/io/prometheus/cloudwatch/CloudWatchCollector.java

@@ -154,7 +154,6 @@ private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchC
         if (config.containsKey("set_timestamp")) {
             defaultCloudwatchTimestamp = (Boolean)config.get("set_timestamp");
         }
-
 
         String region = (String) config.get("region");
 
@@ -374,6 +373,12 @@ private List<List<Dimension>> listDimensions(MetricRule rule, List<String> tagBa
       ListMetricsRequest request = new ListMetricsRequest();
       request.setNamespace(rule.awsNamespace);
       request.setMetricName(rule.awsMetricName);
+
+      // 10800 seconds is 3 hours, this setting causes metrics older than 3 hours to not be listed
+      if (rule.rangeSeconds < 10800) {
+        request.setRecentlyActive("PT3H");
+      }
+
       List<DimensionFilter> dimensionFilters = new ArrayList<DimensionFilter>();
       for (String dimension: rule.awsDimensions) {
         dimensionFilters.add(new DimensionFilter().withName(dimension));

src/test/java/io/prometheus/cloudwatch/CloudWatchCollectorTest.java

@@ -56,6 +56,7 @@ class ListMetricsRequestMatcher extends ArgumentMatcher {
     String namespace;
     String metricName;
     String nextToken;
+    String recentlyActive;
     List<DimensionFilter> dimensions = new ArrayList<DimensionFilter>();
 
     public ListMetricsRequestMatcher Namespace(String namespace) {
@@ -77,6 +78,10 @@ public ListMetricsRequestMatcher Dimensions(String... dimensions) {
       }
       return this;
     }
+    public ListMetricsRequestMatcher RecentlyActive(String recentlyActive) {
+      this.recentlyActive = recentlyActive;
+      return this;
+    }
 
     public boolean matches(Object o) {
      ListMetricsRequest request = (ListMetricsRequest) o;
@@ -96,6 +101,9 @@ public boolean matches(Object o) {
      if (!dimensions.equals(request.getDimensions())) {
        return false;
      }
+     if (recentlyActive != null && !recentlyActive.equals(request.getRecentlyActive())) {
+       return false;
+     }
      return true;
     }
   }
@@ -688,4 +696,37 @@ public void testOptionalTagSelection() throws Exception {
     assertEquals(1.0, registry.getSampleValue("aws_resource_info", new String[]{"job", "instance", "arn", "instance_id", "tag_Monitoring"}, new String[]{"aws_ec2", "", "arn:aws:ec2:us-east-1:121212121212:instance/i-2", "i-2", "enabled"}), .01);
     assertNull(registry.getSampleValue("aws_resource_info", new String[]{"job", "instance", "arn", "instance_id", "tag_Monitoring"}, new String[]{"aws_ec2", "", "arn:aws:ec2:us-east-1:121212121212:instance/i-no-tag", "i-no-tag", "enabled"}));
   }
+
+  @Test
+  public void testNotRecentlyActive() throws Exception {
+    new CloudWatchCollector(
+            "---\nregion: reg\nmetrics:\n- aws_namespace: AWS/ELB\n  aws_metric_name: RequestCount\n  aws_dimensions:\n  - AvailabilityZone\n  - LoadBalancerName\n  range_seconds: 12000", cloudWatchClient, taggingClient).register(registry);
+
+    Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
+            new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName").RecentlyActive(null))))
+            .thenReturn(new ListMetricsResult().withMetrics(
+                    new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myLB")),
+                    new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myLB"), new Dimension().withName("ThisExtraDimensionIsIgnored").withValue("dummy")),
+                    new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("b"), new Dimension().withName("LoadBalancerName").withValue("myOtherLB"))));
+
+    Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
+            new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "a").Dimension("LoadBalancerName", "myLB"))))
+            .thenReturn(new GetMetricStatisticsResult().withDatapoints(
+                    new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+    Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
+            new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "b").Dimension("LoadBalancerName", "myOtherLB"))))
+            .thenReturn(new GetMetricStatisticsResult().withDatapoints(
+                    new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+
+    registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""});
+
+
+    Mockito.verify(cloudWatchClient).listMetrics((ListMetricsRequest) argThat(
+            new ListMetricsRequestMatcher()
+                    .RecentlyActive(null).
+                    Namespace("AWS/ELB").
+                    MetricName("RequestCount").
+                    Dimensions("AvailabilityZone", "LoadBalancerName")
+    ));
+  }
 }