diff --git a/pom.xml b/pom.xml
index d8d0b9f4..fbd9020e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,19 +44,19 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-cloudwatch</artifactId>
-      <version>1.11.839</version>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatch</artifactId>
+      <version>2.15.20</version>
     </dependency>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-sts</artifactId>
-      <version>1.11.839</version>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>sts</artifactId>
+      <version>2.15.20</version>
     </dependency>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-resourcegroupstaggingapi</artifactId>
-      <version>1.11.839</version>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>resourcegroupstaggingapi</artifactId>
+      <version>2.15.20</version>
     </dependency>
     <!--
       Older versions of jackson-databind have remote code execution vulnerabilities
diff --git a/src/main/java/io/prometheus/cloudwatch/CloudWatchCollector.java b/src/main/java/io/prometheus/cloudwatch/CloudWatchCollector.java
index bdb3c1f3..c401c7e4 100644
--- a/src/main/java/io/prometheus/cloudwatch/CloudWatchCollector.java
+++ b/src/main/java/io/prometheus/cloudwatch/CloudWatchCollector.java
@@ -1,25 +1,5 @@
 package io.prometheus.cloudwatch;
 
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
-import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
-import com.amazonaws.services.cloudwatch.model.Datapoint;
-import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.cloudwatch.model.DimensionFilter;
-import com.amazonaws.services.cloudwatch.model.GetMetricStatisticsRequest;
-import com.amazonaws.services.cloudwatch.model.GetMetricStatisticsResult;
-import com.amazonaws.services.cloudwatch.model.ListMetricsRequest;
-import com.amazonaws.services.cloudwatch.model.ListMetricsResult;
-import com.amazonaws.services.cloudwatch.model.Metric;
-import com.amazonaws.services.resourcegroupstaggingapi.AWSResourceGroupsTaggingAPI;
-import com.amazonaws.services.resourcegroupstaggingapi.AWSResourceGroupsTaggingAPIClientBuilder;
-import com.amazonaws.services.resourcegroupstaggingapi.model.GetResourcesRequest;
-import com.amazonaws.services.resourcegroupstaggingapi.model.GetResourcesResult;
-import com.amazonaws.services.resourcegroupstaggingapi.model.ResourceTagMapping;
-import com.amazonaws.services.resourcegroupstaggingapi.model.Tag;
-import com.amazonaws.services.resourcegroupstaggingapi.model.TagFilter;
-
 import io.prometheus.client.Collector;
 import io.prometheus.client.Collector.Describable;
 import io.prometheus.client.Counter;
@@ -42,13 +22,37 @@
 
 import org.yaml.snakeyaml.Yaml;
 
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
+import software.amazon.awssdk.services.cloudwatch.model.Datapoint;
+import software.amazon.awssdk.services.cloudwatch.model.Dimension;
+import software.amazon.awssdk.services.cloudwatch.model.DimensionFilter;
+import software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsRequest;
+import software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsResponse;
+import software.amazon.awssdk.services.cloudwatch.model.ListMetricsRequest;
+import software.amazon.awssdk.services.cloudwatch.model.ListMetricsResponse;
+import software.amazon.awssdk.services.cloudwatch.model.Metric;
+import software.amazon.awssdk.services.cloudwatch.model.Statistic;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClient;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClientBuilder;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.GetResourcesRequest;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.GetResourcesResponse;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.ResourceTagMapping;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.Tag;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.TagFilter;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
+import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
+
 public class CloudWatchCollector extends Collector implements Describable {
     private static final Logger LOGGER = Logger.getLogger(CloudWatchCollector.class.getName());
 
     static class ActiveConfig implements Cloneable {
         ArrayList<MetricRule> rules;
-        AmazonCloudWatch cloudWatchClient;
-        AWSResourceGroupsTaggingAPI taggingClient;
+        CloudWatchClient cloudWatchClient;
+        ResourceGroupsTaggingApiClient taggingClient;
 
         @Override
         public Object clone() throws CloneNotSupportedException {
@@ -62,7 +66,7 @@ static class MetricRule {
       int periodSeconds;
       int rangeSeconds;
       int delaySeconds;
-      List<String> awsStatistics;
+      List<Statistic> awsStatistics;
       List<String> awsExtendedStatistics;
       List<String> awsDimensions;
       Map<String,List<String>> awsDimensionSelect;
@@ -77,7 +81,7 @@ static class AWSTagSelect {
       String resourceIdDimension;
       Map<String,List<String>> tagSelections;
     }
-    
+
     ActiveConfig activeConfig = new ActiveConfig();
 
     private static final Counter cloudwatchRequests = Counter.build()
@@ -87,7 +91,7 @@ static class AWSTagSelect {
     private static final Counter taggingApiRequests = Counter.build()
         .labelNames("action", "resource_type")
         .name("tagging_api_requests_total").help("API requests made to the Resource Groups Tagging API").register();
-    
+
     private static final List<String> brokenDynamoMetrics = Arrays.asList(
             "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits",
             "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits",
@@ -101,11 +105,11 @@ public CloudWatchCollector(String yamlConfig) {
     }
 
     /* For unittests. */
-    protected CloudWatchCollector(String jsonConfig, AmazonCloudWatch cloudWatchClient, AWSResourceGroupsTaggingAPI taggingClient) {
+    protected CloudWatchCollector(String jsonConfig, CloudWatchClient cloudWatchClient, ResourceGroupsTaggingApiClient taggingClient) {
         this((Map<String, Object>)new Yaml().load(jsonConfig), cloudWatchClient, taggingClient);
     }
 
-    private CloudWatchCollector(Map<String, Object> config, AmazonCloudWatch cloudWatchClient, AWSResourceGroupsTaggingAPI taggingClient) {
+    private CloudWatchCollector(Map<String, Object> config, CloudWatchClient cloudWatchClient, ResourceGroupsTaggingApiClient taggingClient) {
         loadConfig(config, cloudWatchClient, taggingClient);
     }
 
@@ -124,15 +128,15 @@ protected void reloadConfig() throws IOException {
           if (reader != null) {
             reader.close();
           }
-          
+
         }
     }
 
-    protected void loadConfig(Reader in, AmazonCloudWatch cloudWatchClient, AWSResourceGroupsTaggingAPI taggingClient) throws IOException {
+    protected void loadConfig(Reader in, CloudWatchClient cloudWatchClient, ResourceGroupsTaggingApiClient taggingClient) throws IOException {
         loadConfig((Map<String, Object>)new Yaml().load(in), cloudWatchClient, taggingClient);
     }
 
-    private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchClient, AWSResourceGroupsTaggingAPI taggingClient) {
+    private void loadConfig(Map<String, Object> config, CloudWatchClient cloudWatchClient, ResourceGroupsTaggingApiClient taggingClient) {
         if(config == null) {  // Yaml config empty, set config to empty map.
             config = new HashMap<String, Object>();
         }
@@ -158,27 +162,27 @@ private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchC
         String region = (String) config.get("region");
 
         if (cloudWatchClient == null) {
-          AmazonCloudWatchClientBuilder clientBuilder = AmazonCloudWatchClientBuilder.standard();
+          CloudWatchClientBuilder clientBuilder = CloudWatchClient.builder();
 
           if (config.containsKey("role_arn")) {
-            clientBuilder.setCredentials(getRoleCredentialProvider(config));
+            clientBuilder.credentialsProvider(getRoleCredentialProvider(config));
           }
 
           if (region != null) {
-            clientBuilder.setRegion(region);
+            clientBuilder.region(Region.of(region));
           }
 
           cloudWatchClient = clientBuilder.build();
         }
 
         if (taggingClient == null) {
-          AWSResourceGroupsTaggingAPIClientBuilder clientBuilder = AWSResourceGroupsTaggingAPIClientBuilder.standard();
+          ResourceGroupsTaggingApiClientBuilder clientBuilder = ResourceGroupsTaggingApiClient.builder();
 
           if (config.containsKey("role_arn")) {
-            clientBuilder.setCredentials(getRoleCredentialProvider(config));
+            clientBuilder.credentialsProvider(getRoleCredentialProvider(config));
           }
           if (region != null) {
-            clientBuilder.setRegion(region);
+            clientBuilder.region(Region.of(region));
           }
           taggingClient = clientBuilder.build();
         }
@@ -214,9 +218,15 @@ private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchC
             rule.awsDimensionSelectRegex = (Map<String,List<String>>)yamlMetricRule.get("aws_dimension_select_regex");
           }
           if (yamlMetricRule.containsKey("aws_statistics")) {
-            rule.awsStatistics = (List<String>)yamlMetricRule.get("aws_statistics");
+            rule.awsStatistics = new ArrayList<Statistic>();
+            for (String statistic : (List<String>)yamlMetricRule.get("aws_statistics")) {
+              rule.awsStatistics.add(Statistic.fromValue(statistic));
+            }
           } else if (!yamlMetricRule.containsKey("aws_extended_statistics")) {
-            rule.awsStatistics = new ArrayList(Arrays.asList("Sum", "SampleCount", "Minimum", "Maximum", "Average"));
+            rule.awsStatistics = new ArrayList<Statistic>();
+            for (String statistic : Arrays.asList("Sum", "SampleCount", "Minimum", "Maximum", "Average")) {
+              rule.awsStatistics.add(Statistic.fromValue(statistic));
+            }
           }
           if (yamlMetricRule.containsKey("aws_extended_statistics")) {
             rule.awsExtendedStatistics = (List<String>)yamlMetricRule.get("aws_extended_statistics");
@@ -252,7 +262,7 @@ private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchC
 
             awsTagSelect.resourceTypeSelection = (String)yamlAwsTagSelect.get("resource_type_selection");
             awsTagSelect.resourceIdDimension = (String)yamlAwsTagSelect.get("resource_id_dimension");
-            
+
             if (yamlAwsTagSelect.containsKey("tag_selections")) {
               awsTagSelect.tagSelections = (Map<String, List<String>>)yamlAwsTagSelect.get("tag_selections");
             }
@@ -262,7 +272,7 @@ private void loadConfig(Map<String, Object> config, AmazonCloudWatch cloudWatchC
         loadConfig(rules, cloudWatchClient, taggingClient);
     }
 
-    private void loadConfig(ArrayList<MetricRule> rules, AmazonCloudWatch cloudWatchClient, AWSResourceGroupsTaggingAPI taggingClient) {
+    private void loadConfig(ArrayList<MetricRule> rules, CloudWatchClient cloudWatchClient, ResourceGroupsTaggingApiClient taggingClient) {
         synchronized (activeConfig) {
             activeConfig.cloudWatchClient = cloudWatchClient;
             activeConfig.taggingClient = taggingClient;
@@ -270,13 +280,17 @@ private void loadConfig(ArrayList<MetricRule> rules, AmazonCloudWatch cloudWatch
         }
     }
 
-    private AWSCredentialsProvider getRoleCredentialProvider(Map<String, Object> config) {
-      STSAssumeRoleSessionCredentialsProvider credentialsProvider = new STSAssumeRoleSessionCredentialsProvider.Builder(
-	  (String) config.get("role_arn"), "cloudwatch_exporter").build();
-      return credentialsProvider;
+    private AwsCredentialsProvider getRoleCredentialProvider(Map<String, Object> config) {
+      StsClient stsClient = StsClient.builder().region(Region.of((String) config.get("region"))).build();
+      AssumeRoleRequest assumeRoleRequest = AssumeRoleRequest.builder()
+              .roleArn((String) config.get("role_arn"))
+              .roleSessionName("cloudwatch_exporter").build();
+      return StsAssumeRoleCredentialsProvider.builder()
+              .stsClient(stsClient)
+              .refreshRequest(assumeRoleRequest).build();
     }
 
-    private List<ResourceTagMapping> getResourceTagMappings(MetricRule rule, AWSResourceGroupsTaggingAPI taggingClient) {
+    private List<ResourceTagMapping> getResourceTagMappings(MetricRule rule, ResourceGroupsTaggingApiClient taggingClient) {
       if (rule.awsTagSelect == null) {
         return Collections.emptyList();
       }
@@ -284,35 +298,35 @@ private List<ResourceTagMapping> getResourceTagMappings(MetricRule rule, AWSReso
       List<TagFilter> tagFilters = new ArrayList<TagFilter>();
       if (rule.awsTagSelect.tagSelections != null) {
         for (Map.Entry<String, List<String>> entry : rule.awsTagSelect.tagSelections.entrySet()) {
-          tagFilters.add(new TagFilter().withKey(entry.getKey()).withValues(entry.getValue()));
+          tagFilters.add(TagFilter.builder().key(entry.getKey()).values(entry.getValue()).build());
         }
       }
 
       List<ResourceTagMapping> resourceTagMappings = new ArrayList<ResourceTagMapping>();
-      GetResourcesRequest request = new GetResourcesRequest().withTagFilters(tagFilters).withResourceTypeFilters(rule.awsTagSelect.resourceTypeSelection);
+      GetResourcesRequest.Builder requestBuilder = GetResourcesRequest.builder().tagFilters(tagFilters).resourceTypeFilters(rule.awsTagSelect.resourceTypeSelection);
       String paginationToken = "";
       do {
-        request.setPaginationToken(paginationToken);
+        requestBuilder.paginationToken(paginationToken);
 
-        GetResourcesResult result = taggingClient.getResources(request);
+        GetResourcesResponse response = taggingClient.getResources(requestBuilder.build());
         taggingApiRequests.labels("getResources", rule.awsTagSelect.resourceTypeSelection).inc();
-        
-        resourceTagMappings.addAll(result.getResourceTagMappingList());
 
-        paginationToken = result.getPaginationToken();
+        resourceTagMappings.addAll(response.resourceTagMappingList());
+
+        paginationToken = response.paginationToken();
       } while (paginationToken != null && paginationToken != "");
 
       return resourceTagMappings;
     }
-    
+
     private List<String> extractResourceIds(List<ResourceTagMapping> resourceTagMappings) {
       List<String> resourceIds = new ArrayList<String>();
       for (ResourceTagMapping resourceTagMapping : resourceTagMappings) {
-        resourceIds.add(extractResourceIdFromArn(resourceTagMapping.getResourceARN()));
+        resourceIds.add(extractResourceIdFromArn(resourceTagMapping.resourceARN()));
       }
       return resourceIds;
     }
-    
+
     private String extractResourceIdFromArn(String arn) {
       // ARN parsing is based on https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
       String[] arnArray = arn.split(":");
@@ -323,8 +337,8 @@ private String extractResourceIdFromArn(String arn) {
       }
       return resourceId;
     }
-    
-    private List<List<Dimension>> getDimensions(MetricRule rule, List<String> tagBasedResourceIds, AmazonCloudWatch cloudWatchClient) {
+
+    private List<List<Dimension>> getDimensions(MetricRule rule, List<String> tagBasedResourceIds, CloudWatchClient cloudWatchClient) {
         if (
                 rule.awsDimensions != null &&
                 rule.awsDimensionSelect != null &&
@@ -350,11 +364,11 @@ private List<List<Dimension>> permuteDimensions(List<String> dimensions, Map<Str
             String dimensionName = dimensionsCopy.remove(dimensionsCopy.size() - 1);
             for (List<Dimension> permutation : permuteDimensions(dimensionsCopy, dimensionValues)) {
                 for (String dimensionValue : dimensionValues.get(dimensionName)) {
-                    Dimension dimension = new Dimension();
-                    dimension.setValue(dimensionValue);
-                    dimension.setName(dimensionName);
+                    Dimension.Builder dimensionBuilder = Dimension.builder();
+                    dimensionBuilder.value(dimensionValue);
+                    dimensionBuilder.name(dimensionName);
                     ArrayList<Dimension> permutationCopy = new ArrayList<Dimension>(permutation);
-                    permutationCopy.add(dimension);
+                    permutationCopy.add(dimensionBuilder.build());
                     result.add(permutationCopy);
                 }
             }
@@ -363,44 +377,44 @@ private List<List<Dimension>> permuteDimensions(List<String> dimensions, Map<Str
         return result;
     }
 
-    private List<List<Dimension>> listDimensions(MetricRule rule, List<String> tagBasedResourceIds, AmazonCloudWatch cloudWatchClient) {
+    private List<List<Dimension>> listDimensions(MetricRule rule, List<String> tagBasedResourceIds, CloudWatchClient cloudWatchClient) {
       List<List<Dimension>> dimensions = new ArrayList<List<Dimension>>();
       if (rule.awsDimensions == null) {
         dimensions.add(new ArrayList<Dimension>());
         return dimensions;
       }
 
-      ListMetricsRequest request = new ListMetricsRequest();
-      request.setNamespace(rule.awsNamespace);
-      request.setMetricName(rule.awsMetricName);
+      ListMetricsRequest.Builder requestBuilder = ListMetricsRequest.builder();
+      requestBuilder.namespace(rule.awsNamespace);
+      requestBuilder.metricName(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");
+        requestBuilder.recentlyActive("PT3H");
       }
 
       List<DimensionFilter> dimensionFilters = new ArrayList<DimensionFilter>();
       for (String dimension: rule.awsDimensions) {
-        dimensionFilters.add(new DimensionFilter().withName(dimension));
+        dimensionFilters.add(DimensionFilter.builder().name(dimension).build());
       }
-      request.setDimensions(dimensionFilters);
+      requestBuilder.dimensions(dimensionFilters);
 
       String nextToken = null;
       do {
-        request.setNextToken(nextToken);
-        ListMetricsResult result = cloudWatchClient.listMetrics(request);
+        requestBuilder.nextToken(nextToken);
+        ListMetricsResponse response = cloudWatchClient.listMetrics(requestBuilder.build());
         cloudwatchRequests.labels("listMetrics", rule.awsNamespace).inc();
-        for (Metric metric: result.getMetrics()) {
-          if (metric.getDimensions().size() != dimensionFilters.size()) {
+        for (Metric metric: response.metrics()) {
+          if (metric.dimensions().size() != dimensionFilters.size()) {
             // AWS returns all the metrics with dimensions beyond the ones we ask for,
             // so filter them out.
             continue;
           }
           if (useMetric(rule, tagBasedResourceIds, metric)) {
-            dimensions.add(metric.getDimensions());
+            dimensions.add(metric.dimensions());
           }
         }
-        nextToken = result.getNextToken();
+        nextToken = response.nextToken();
       } while (nextToken != null);
 
       return dimensions;
@@ -427,9 +441,9 @@ private boolean useMetric(MetricRule rule, List<String> tagBasedResourceIds, Met
      */
     private boolean metricsIsInAwsDimensionSelect(MetricRule rule, Metric metric) {
       Set<String> dimensionSelectKeys = rule.awsDimensionSelect.keySet();
-      for (Dimension dimension : metric.getDimensions()) {
-        String dimensionName = dimension.getName();
-        String dimensionValue = dimension.getValue();
+      for (Dimension dimension : metric.dimensions()) {
+        String dimensionName = dimension.name();
+        String dimensionValue = dimension.value();
         if (dimensionSelectKeys.contains(dimensionName)) {
           List<String> allowedDimensionValues = rule.awsDimensionSelect.get(dimensionName);
           if (!allowedDimensionValues.contains(dimensionValue)) {
@@ -445,9 +459,9 @@ private boolean metricsIsInAwsDimensionSelect(MetricRule rule, Metric metric) {
      */
     private boolean metricIsInAwsDimensionSelectRegex(MetricRule rule, Metric metric) {
       Set<String> dimensionSelectRegexKeys = rule.awsDimensionSelectRegex.keySet();
-      for (Dimension dimension : metric.getDimensions()) {
-        String dimensionName = dimension.getName();
-        String dimensionValue = dimension.getValue();
+      for (Dimension dimension : metric.dimensions()) {
+        String dimensionName = dimension.name();
+        String dimensionValue = dimension.value();
         if (dimensionSelectRegexKeys.contains(dimensionName)) {
           List<String> allowedDimensionValues = rule.awsDimensionSelectRegex.get(dimensionName);
           if (!regexListMatch(allowedDimensionValues, dimensionValue)) {
@@ -477,9 +491,9 @@ private boolean metricIsInAwsTagSelect(MetricRule rule, List<String> tagBasedRes
       if (rule.awsTagSelect.tagSelections == null) {
         return true;
       }
-      for (Dimension dimension : metric.getDimensions()) {
-        String dimensionName = dimension.getName();
-        String dimensionValue = dimension.getValue();
+      for (Dimension dimension : metric.dimensions()) {
+        String dimensionName = dimension.name();
+        String dimensionValue = dimension.value();
         if (rule.awsTagSelect.resourceIdDimension.equals(dimensionName)) {
           if (!tagBasedResourceIds.contains(dimensionValue)) {
             return false;
@@ -488,11 +502,11 @@ private boolean metricIsInAwsTagSelect(MetricRule rule, List<String> tagBasedRes
       }
       return true;
     }
-    
+
     private Datapoint getNewestDatapoint(java.util.List<Datapoint> datapoints) {
       Datapoint newest = null;
       for (Datapoint d: datapoints) {
-        if (newest == null || newest.getTimestamp().before(d.getTimestamp())) {
+        if (newest == null || newest.timestamp().isBefore(d.timestamp())) {
           newest = d;
         }
       }
@@ -531,14 +545,14 @@ private void scrape(List<MetricFamilySamples> mfs) throws CloneNotSupportedExcep
       for (MetricRule rule: config.rules) {
         Date startDate = new Date(start - 1000 * rule.delaySeconds);
         Date endDate = new Date(start - 1000 * (rule.delaySeconds + rule.rangeSeconds));
-        GetMetricStatisticsRequest request = new GetMetricStatisticsRequest();
-        request.setNamespace(rule.awsNamespace);
-        request.setMetricName(rule.awsMetricName);
-        request.setStatistics(rule.awsStatistics);
-        request.setExtendedStatistics(rule.awsExtendedStatistics);
-        request.setEndTime(startDate);
-        request.setStartTime(endDate);
-        request.setPeriod(rule.periodSeconds);
+        GetMetricStatisticsRequest.Builder requestBuilder = GetMetricStatisticsRequest.builder();
+        requestBuilder.namespace(rule.awsNamespace);
+        requestBuilder.metricName(rule.awsMetricName);
+        requestBuilder.statistics(rule.awsStatistics);
+        requestBuilder.extendedStatistics(rule.awsExtendedStatistics);
+        requestBuilder.endTime(startDate.toInstant());
+        requestBuilder.startTime(endDate.toInstant());
+        requestBuilder.period(rule.periodSeconds);
 
         String baseName = safeName(rule.awsNamespace.toLowerCase() + "_" + toSnakeCase(rule.awsMetricName));
         String jobName = safeName(rule.awsNamespace.toLowerCase());
@@ -560,17 +574,17 @@ private void scrape(List<MetricFamilySamples> mfs) throws CloneNotSupportedExcep
 
         List<ResourceTagMapping> resourceTagMappings = getResourceTagMappings(rule, config.taggingClient);
         List<String> tagBasedResourceIds = extractResourceIds(resourceTagMappings);
-        
+
         for (List<Dimension> dimensions: getDimensions(rule, tagBasedResourceIds, config.cloudWatchClient)) {
-          request.setDimensions(dimensions);
+          requestBuilder.dimensions(dimensions);
 
-          GetMetricStatisticsResult result = config.cloudWatchClient.getMetricStatistics(request);
+          GetMetricStatisticsResponse response = config.cloudWatchClient.getMetricStatistics(requestBuilder.build());
           cloudwatchRequests.labels("getMetricStatistics", rule.awsNamespace).inc();
-          Datapoint dp = getNewestDatapoint(result.getDatapoints());
+          Datapoint dp = getNewestDatapoint(response.datapoints());
           if (dp == null) {
             continue;
           }
-          unit = dp.getUnit();
+          unit = dp.unitAsString();
 
           List<String> labelNames = new ArrayList<String>();
           List<String> labelValues = new ArrayList<String>();
@@ -579,37 +593,37 @@ private void scrape(List<MetricFamilySamples> mfs) throws CloneNotSupportedExcep
           labelNames.add("instance");
           labelValues.add("");
           for (Dimension d: dimensions) {
-            labelNames.add(safeLabelName(toSnakeCase(d.getName())));
-            labelValues.add(d.getValue());
+            labelNames.add(safeLabelName(toSnakeCase(d.name())));
+            labelValues.add(d.value());
           }
 
           Long timestamp = null;
           if (rule.cloudwatchTimestamp) {
-            timestamp = dp.getTimestamp().getTime();
+            timestamp = dp.timestamp().toEpochMilli();
           }
 
-          if (dp.getSum() != null) {
+          if (dp.sum() != null) {
             sumSamples.add(new MetricFamilySamples.Sample(
-                baseName + "_sum", labelNames, labelValues, dp.getSum(), timestamp));
+                baseName + "_sum", labelNames, labelValues, dp.sum(), timestamp));
           }
-          if (dp.getSampleCount() != null) {
+          if (dp.sampleCount() != null) {
             sampleCountSamples.add(new MetricFamilySamples.Sample(
-                baseName + "_sample_count", labelNames, labelValues, dp.getSampleCount(), timestamp));
+                baseName + "_sample_count", labelNames, labelValues, dp.sampleCount(), timestamp));
           }
-          if (dp.getMinimum() != null) {
+          if (dp.minimum() != null) {
             minimumSamples.add(new MetricFamilySamples.Sample(
-                baseName + "_minimum", labelNames, labelValues, dp.getMinimum(), timestamp));
+                baseName + "_minimum", labelNames, labelValues, dp.minimum(), timestamp));
           }
-          if (dp.getMaximum() != null) {
+          if (dp.maximum() != null) {
             maximumSamples.add(new MetricFamilySamples.Sample(
-                baseName + "_maximum",labelNames, labelValues, dp.getMaximum(), timestamp));
+                baseName + "_maximum",labelNames, labelValues, dp.maximum(), timestamp));
           }
-          if (dp.getAverage() != null) {
+          if (dp.average() != null) {
             averageSamples.add(new MetricFamilySamples.Sample(
-                baseName + "_average", labelNames, labelValues, dp.getAverage(), timestamp));
+                baseName + "_average", labelNames, labelValues, dp.average(), timestamp));
           }
-          if (dp.getExtendedStatistics() != null) {
-            for (Map.Entry<String, Double> entry : dp.getExtendedStatistics().entrySet()) {
+          if (dp.extendedStatistics() != null) {
+            for (Map.Entry<String, Double> entry : dp.extendedStatistics().entrySet()) {
               ArrayList<MetricFamilySamples.Sample> samples = extendedSamples.get(entry.getKey());
               if (samples == null) {
                 samples = new ArrayList<MetricFamilySamples.Sample>();
@@ -639,10 +653,10 @@ private void scrape(List<MetricFamilySamples> mfs) throws CloneNotSupportedExcep
         for (Map.Entry<String, ArrayList<MetricFamilySamples.Sample>> entry : extendedSamples.entrySet()) {
           mfs.add(new MetricFamilySamples(baseName + "_" + safeName(toSnakeCase(entry.getKey())), Type.GAUGE, help(rule, unit, entry.getKey()), entry.getValue()));
         }
-        
+
         // Add the "aws_resource_info" metric for existing tag mappings
         for (ResourceTagMapping resourceTagMapping : resourceTagMappings) {
-          if (!publishedResourceInfo.contains(resourceTagMapping.getResourceARN())) {
+          if (!publishedResourceInfo.contains(resourceTagMapping.resourceARN())) {
             List<String> labelNames = new ArrayList<String>();
             List<String> labelValues = new ArrayList<String>();
             labelNames.add("job");
@@ -650,19 +664,19 @@ private void scrape(List<MetricFamilySamples> mfs) throws CloneNotSupportedExcep
             labelNames.add("instance");
             labelValues.add("");
             labelNames.add("arn");
-            labelValues.add(resourceTagMapping.getResourceARN());
+            labelValues.add(resourceTagMapping.resourceARN());
             labelNames.add(safeLabelName(toSnakeCase(rule.awsTagSelect.resourceIdDimension)));
-            labelValues.add(extractResourceIdFromArn(resourceTagMapping.getResourceARN()));
-            for (Tag tag: resourceTagMapping.getTags()) {
+            labelValues.add(extractResourceIdFromArn(resourceTagMapping.resourceARN()));
+            for (Tag tag: resourceTagMapping.tags()) {
               // Avoid potential collision between resource tags and other metric labels by adding the "tag_" prefix
               // The AWS tags are case sensitive, so to avoid loosing information and label collisions, tag keys are not snaked cased
-              labelNames.add("tag_" + safeLabelName(tag.getKey()));
-              labelValues.add(tag.getValue());
+              labelNames.add("tag_" + safeLabelName(tag.key()));
+              labelValues.add(tag.value());
             }
 
             infoSamples.add(new MetricFamilySamples.Sample("aws_resource_info", labelNames, labelValues, 1));
 
-            publishedResourceInfo.add(resourceTagMapping.getResourceARN());
+            publishedResourceInfo.add(resourceTagMapping.resourceARN());
           }
         }
       }
diff --git a/src/test/java/io/prometheus/cloudwatch/CloudWatchCollectorTest.java b/src/test/java/io/prometheus/cloudwatch/CloudWatchCollectorTest.java
index fd2aef34..ab8e46db 100644
--- a/src/test/java/io/prometheus/cloudwatch/CloudWatchCollectorTest.java
+++ b/src/test/java/io/prometheus/cloudwatch/CloudWatchCollectorTest.java
@@ -4,22 +4,6 @@
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.argThat;
 
-import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
-import com.amazonaws.services.cloudwatch.model.Datapoint;
-import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.cloudwatch.model.DimensionFilter;
-import com.amazonaws.services.cloudwatch.model.GetMetricStatisticsRequest;
-import com.amazonaws.services.cloudwatch.model.GetMetricStatisticsResult;
-import com.amazonaws.services.cloudwatch.model.ListMetricsRequest;
-import com.amazonaws.services.cloudwatch.model.ListMetricsResult;
-import com.amazonaws.services.cloudwatch.model.Metric;
-import com.amazonaws.services.resourcegroupstaggingapi.AWSResourceGroupsTaggingAPI;
-import com.amazonaws.services.resourcegroupstaggingapi.model.GetResourcesRequest;
-import com.amazonaws.services.resourcegroupstaggingapi.model.GetResourcesResult;
-import com.amazonaws.services.resourcegroupstaggingapi.model.ResourceTagMapping;
-import com.amazonaws.services.resourcegroupstaggingapi.model.Tag;
-import com.amazonaws.services.resourcegroupstaggingapi.model.TagFilter;
-
 import io.prometheus.client.Collector;
 import io.prometheus.client.CollectorRegistry;
 
@@ -40,15 +24,24 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.model.*;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClient;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.GetResourcesRequest;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.GetResourcesResponse;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.ResourceTagMapping;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.TagFilter;
+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.Tag;
+
 public class CloudWatchCollectorTest {
-  AmazonCloudWatch cloudWatchClient;
-  AWSResourceGroupsTaggingAPI taggingClient;
+  CloudWatchClient cloudWatchClient;
+  ResourceGroupsTaggingApiClient taggingClient;
   CollectorRegistry registry;
 
   @Before
   public void setUp() {
-    cloudWatchClient = Mockito.mock(AmazonCloudWatch.class);
-    taggingClient = Mockito.mock(AWSResourceGroupsTaggingAPI.class);
+    cloudWatchClient = Mockito.mock(CloudWatchClient.class);
+    taggingClient = Mockito.mock(ResourceGroupsTaggingApiClient.class);
     registry = new CollectorRegistry();
   }
   
@@ -74,7 +67,7 @@ public ListMetricsRequestMatcher NextToken(String nextToken) {
     public ListMetricsRequestMatcher Dimensions(String... dimensions) {
       this.dimensions = new ArrayList<DimensionFilter>();
       for (int i = 0; i < dimensions.length; i++) {
-        this.dimensions.add(new DimensionFilter().withName(dimensions[i]));
+        this.dimensions.add(DimensionFilter.builder().name(dimensions[i]).build());
       }
       return this;
     }
@@ -86,22 +79,22 @@ public ListMetricsRequestMatcher RecentlyActive(String recentlyActive) {
     public boolean matches(Object o) {
      ListMetricsRequest request = (ListMetricsRequest) o;
      if (request == null) return false;
-     if (namespace != null && !namespace.equals(request.getNamespace())){
+     if (namespace != null && !namespace.equals(request.namespace())){
        return false;
      }
-     if (metricName != null && !metricName.equals(request.getMetricName())){
+     if (metricName != null && !metricName.equals(request.metricName())){
        return false;
      }
-     if (nextToken == null ^ request.getNextToken() == null) {
+     if (nextToken == null ^ request.nextToken() == null) {
        return false;
      }
-     if (nextToken != null && !nextToken.equals(request.getNextToken())) {
+     if (nextToken != null && !nextToken.equals(request.nextToken())) {
        return false;
      }
-     if (!dimensions.equals(request.getDimensions())) {
+     if (!dimensions.equals(request.dimensions())) {
        return false;
      }
-     if (recentlyActive != null && !recentlyActive.equals(request.getRecentlyActive())) {
+     if (recentlyActive != null && !recentlyActive.equals(request.recentlyActive())) {
        return false;
      }
      return true;
@@ -123,7 +116,7 @@ public GetMetricStatisticsRequestMatcher MetricName(String metricName) {
       return this;
     }
     public GetMetricStatisticsRequestMatcher Dimension(String name, String value) {
-      dimensions.add(new Dimension().withName(name).withValue(value));
+      dimensions.add(Dimension.builder().name(name).value(value).build());
       return this;
     }
     public GetMetricStatisticsRequestMatcher Period(int period) {
@@ -134,16 +127,16 @@ public GetMetricStatisticsRequestMatcher Period(int period) {
     public boolean matches(Object o) {
      GetMetricStatisticsRequest request = (GetMetricStatisticsRequest) o;
      if (request == null) return false;
-     if (namespace != null && !namespace.equals(request.getNamespace())){
+     if (namespace != null && !namespace.equals(request.namespace())){
        return false;
      }
-     if (metricName != null && !metricName.equals(request.getMetricName())){
+     if (metricName != null && !metricName.equals(request.metricName())){
        return false;
      }
-     if (!dimensions.equals(request.getDimensions())) {
+     if (!dimensions.equals(request.dimensions())) {
        return false;
      }
-     if (period != null && !period.equals(request.getPeriod())) {
+     if (period != null && !period.equals(request.period())) {
          return false;
      }
      return true;
@@ -164,23 +157,23 @@ public GetResourcesRequestMatcher ResourceTypeFilter(String resourceTypeFilter)
       return this;
     }
     public GetResourcesRequestMatcher TagFilter(String key, List<String> values ) {
-      tagFilters.add(new TagFilter().withKey(key).withValues(values));
+      tagFilters.add(TagFilter.builder().key(key).values(values).build());
       return this;
     }
     
     public boolean matches(Object o) {
      GetResourcesRequest request = (GetResourcesRequest) o;
      if (request == null) return false;
-     if (paginationToken == "" ^ request.getPaginationToken() == "") {
+     if (paginationToken == "" ^ request.paginationToken() == "") {
        return false;
      }
-     if (paginationToken != "" && !paginationToken.equals(request.getPaginationToken())) {
+     if (paginationToken != "" && !paginationToken.equals(request.paginationToken())) {
        return false;
      }
-     if (!resourceTypeFilters.equals(request.getResourceTypeFilters())) {
+     if (!resourceTypeFilters.equals(request.resourceTypeFilters())) {
        return false;
      }
-     if (!tagFilters.equals(request.getTagFilters())) {
+     if (!tagFilters.equals(request.tagFilters())) {
        return false;
      }
      return true;
@@ -193,7 +186,7 @@ public void testMetricPeriod() {
             "---\nregion: reg\nmetrics:\n- aws_namespace: AWS/ELB\n  aws_metric_name: RequestCount\n  period_seconds: 100\n  range_seconds: 200\n  delay_seconds: 300", cloudWatchClient, taggingClient).register(registry);
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest) anyObject()))
-            .thenReturn(new GetMetricStatisticsResult());
+            .thenReturn(GetMetricStatisticsResponse.builder().build());
 
     registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""});
 
@@ -212,7 +205,7 @@ public void testDefaultPeriod() {
                     "---\nregion: reg\nperiod_seconds: 100\nrange_seconds: 200\ndelay_seconds: 300\nmetrics:\n- aws_namespace: AWS/ELB\n  aws_metric_name: RequestCount", cloudWatchClient, taggingClient).register(registry);
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest) anyObject()))
-            .thenReturn(new GetMetricStatisticsResult());
+            .thenReturn(GetMetricStatisticsResponse.builder().build());
 
     registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""});
 
@@ -232,9 +225,9 @@ public void testAllStatistics() throws Exception {
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(1.0)
-                .withMaximum(2.0).withMinimum(3.0).withSampleCount(4.0).withSum(5.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(1.0)
+                .maximum(2.0).minimum(3.0).sampleCount(4.0).sum(5.0).build()).build());
 
     assertEquals(1.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_maximum", new String[]{"job", "instance"}, new String[]{"aws_elb", ""}), .01);
@@ -252,13 +245,13 @@ public void testCloudwatchTimestamps() throws Exception {
     Date timestamp = new Date();
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
             new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount"))))
-            .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-                    new Datapoint().withTimestamp(timestamp).withAverage(1.0)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(timestamp.toInstant()).average(1.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
             new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("HTTPCode_Backend_2XX"))))
-            .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-                    new Datapoint().withTimestamp(timestamp).withAverage(1.0)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(timestamp.toInstant()).average(1.0).build()).build());
 
     assertMetricTimestampEquals(registry, "aws_elb_request_count_average", timestamp.getTime());
     assertMetricTimestampEquals(registry, "aws_elb_httpcode_backend_2_xx_average", null);
@@ -288,10 +281,10 @@ public void testUsesNewestDatapoint() throws Exception {
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date(1)).withAverage(1.0),
-            new Datapoint().withTimestamp(new Date(3)).withAverage(3.0),
-            new Datapoint().withTimestamp(new Date(2)).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date(1).toInstant()).average(1.0).build(),
+                Datapoint.builder().timestamp(new Date(3).toInstant()).average(3.0).build(),
+                Datapoint.builder().timestamp(new Date(2).toInstant()).average(2.0).build()).build());
 
     assertEquals(3.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""}), .01);
   }
@@ -303,19 +296,20 @@ public void testDimensions() throws Exception {
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName"))))
-        .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"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+                Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build()).build(),
+                Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build(), Dimension.builder().name("ThisExtraDimensionIsIgnored").value("dummy").build()).build(),
+                Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("b").build(), Dimension.builder().name("LoadBalancerName").value("myOtherLB").build()).build()
+                ).build());
 
     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)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     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)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "a", "myLB"}), .01);
     assertEquals(3.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "b", "myOtherLB"}), .01);
@@ -328,20 +322,21 @@ public void testDimensionSelect() throws Exception {
         "---\nregion: reg\nmetrics:\n- aws_namespace: AWS/ELB\n  aws_metric_name: RequestCount\n  aws_dimensions:\n  - AvailabilityZone\n  - LoadBalancerName\n  aws_dimension_select:\n    LoadBalancerName:\n    - myLB", cloudWatchClient, taggingClient).register(registry);
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName"))))
-        .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("b"), new Dimension().withName("LoadBalancerName").withValue("myLB")),
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myOtherLB"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("b").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myOtherLB").build()).build()
+            ).build());
 
     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)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "b").Dimension("LoadBalancerName", "myLB"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "a", "myLB"}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "b", "myLB"}), .01);
@@ -354,13 +349,13 @@ public void testAllSelectDimensionsKnown() throws Exception {
             "---\nregion: reg\nmetrics:\n- aws_namespace: AWS/ELB\n  aws_metric_name: RequestCount\n  aws_dimensions:\n  - AvailabilityZone\n  - LoadBalancerName\n  aws_dimension_select:\n    LoadBalancerName:\n    - myLB\n    AvailabilityZone:\n    - a\n    - b", cloudWatchClient, taggingClient).register(registry);
     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)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
             new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "b").Dimension("LoadBalancerName", "myLB"))))
-            .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-                    new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "a", "myLB"}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "b", "myLB"}), .01);
@@ -374,20 +369,21 @@ public void testDimensionSelectRegex() throws Exception {
 
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest) argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myLB1")),
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("b"), new Dimension().withName("LoadBalancerName").withValue("myLB2")),
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myOtherLB"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("b").build(), Dimension.builder().name("LoadBalancerName").value("myLB2").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myOtherLB").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest) argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "a").Dimension("LoadBalancerName", "myLB1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest) argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimension("AvailabilityZone", "b").Dimension("LoadBalancerName", "myLB2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "a", "myLB1"}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "b", "myLB2"}), .01);
@@ -401,16 +397,16 @@ public void testGetDimensionsUsesNextToken() throws Exception {
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName"))))
-        .thenReturn(new ListMetricsResult().withNextToken("ABC"));
+        .thenReturn(ListMetricsResponse.builder().nextToken("ABC").build());
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancerName").NextToken("ABC"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancerName").withValue("myLB"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build()).build()).build());
 
     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)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer_name"}, new String[]{"aws_elb", "", "a", "myLB"}), .01);
   }
@@ -426,8 +422,8 @@ public void testExtendedStatistics() throws Exception {
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ELB").MetricName("Latency"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withExtendedStatistics(extendedStatistics)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).extendedStatistics(extendedStatistics).build()).build());
 
     assertEquals(1.0, registry.getSampleValue("aws_elb_latency_p95", new String[]{"job", "instance"}, new String[]{"aws_elb", ""}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_elb_latency_p99_99", new String[]{"job", "instance"}, new String[]{"aws_elb", ""}), .01);
@@ -439,29 +435,29 @@ public void testDynamoIndexDimensions() throws Exception {
         "---\nregion: reg\nmetrics:\n- aws_namespace: AWS/DynamoDB\n  aws_metric_name: ConsumedReadCapacityUnits\n  aws_dimensions:\n  - TableName\n  - GlobalSecondaryIndexName\n- aws_namespace: AWS/DynamoDB\n  aws_metric_name: OnlineIndexConsumedWriteCapacity\n  aws_dimensions:\n  - TableName\n  - GlobalSecondaryIndexName\n- aws_namespace: AWS/DynamoDB\n  aws_metric_name: ConsumedReadCapacityUnits\n  aws_dimensions:\n  - TableName", cloudWatchClient, taggingClient).register(registry);
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("ConsumedReadCapacityUnits").Dimensions("TableName", "GlobalSecondaryIndexName"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-          new Metric().withDimensions(new Dimension().withName("TableName").withValue("myTable"), new Dimension().withName("GlobalSecondaryIndexName").withValue("myIndex"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+          Metric.builder().dimensions(Dimension.builder().name("TableName").value("myTable").build(), Dimension.builder().name("GlobalSecondaryIndexName").value("myIndex").build()).build()).build());
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("OnlineIndexConsumedWriteCapacity").Dimensions("TableName", "GlobalSecondaryIndexName"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-          new Metric().withDimensions(new Dimension().withName("TableName").withValue("myTable"), new Dimension().withName("GlobalSecondaryIndexName").withValue("myIndex"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+          Metric.builder().dimensions(Dimension.builder().name("TableName").value("myTable").build(), Dimension.builder().name("GlobalSecondaryIndexName").value("myIndex").build()).build()).build());
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("ConsumedReadCapacityUnits").Dimensions("TableName"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-          new Metric().withDimensions(new Dimension().withName("TableName").withValue("myTable"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+          Metric.builder().dimensions(Dimension.builder().name("TableName").value("myTable").build()).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("ConsumedReadCapacityUnits").Dimension("TableName", "myTable").Dimension("GlobalSecondaryIndexName", "myIndex"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withSum(1.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).sum(1.0).build()).build());
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("OnlineIndexConsumedWriteCapacity").Dimension("TableName", "myTable").Dimension("GlobalSecondaryIndexName", "myIndex"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withSum(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).sum(2.0).build()).build());
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("ConsumedReadCapacityUnits").Dimension("TableName", "myTable"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withSum(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).sum(3.0).build()).build());
 
     assertEquals(1.0, registry.getSampleValue("aws_dynamodb_consumed_read_capacity_units_index_sum", new String[]{"job", "instance", "table_name", "global_secondary_index_name"}, new String[]{"aws_dynamodb", "", "myTable", "myIndex"}), .01);
     assertEquals(2.0, registry.getSampleValue("aws_dynamodb_online_index_consumed_write_capacity_sum", new String[]{"job", "instance", "table_name", "global_secondary_index_name"}, new String[]{"aws_dynamodb", "", "myTable", "myIndex"}), .01);
@@ -475,8 +471,8 @@ public void testDynamoNoDimensions() throws Exception {
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/DynamoDB").MetricName("AccountProvisionedReadCapacityUtilization"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withSum(1.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).sum(1.0).build()).build());
 
     assertEquals(1.0, registry.getSampleValue("aws_dynamodb_account_provisioned_read_capacity_utilization_sum", new String[]{"job", "instance"}, new String[]{"aws_dynamodb", ""}), .01);
   }
@@ -489,24 +485,25 @@ public void testTagSelectEC2() throws Exception {
     
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().ResourceTypeFilter("ec2:instance").TagFilter("Monitoring", Arrays.asList("enabled")))))
-        .thenReturn(new GetResourcesResult().withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1")));
+        .thenReturn(GetResourcesResponse.builder().resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1").build()).build());
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimensions("InstanceId"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-1")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-2"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-2").build()).build()
+        ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-1"}), .01);
     assertNull(registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-2"}));
@@ -522,30 +519,31 @@ public void testTagSelectALB() throws Exception {
     
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().ResourceTypeFilter("elasticloadbalancing:loadbalancer/app").TagFilter("Monitoring", Arrays.asList("enabled")))))
-        .thenReturn(new GetResourcesResult().withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:elasticloadbalancing:us-east-1:121212121212:loadbalancer/app/myLB/123")));
+        .thenReturn(GetResourcesResponse.builder().resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:elasticloadbalancing:us-east-1:121212121212:loadbalancer/app/myLB/123").build()).build());
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/ApplicationELB").MetricName("RequestCount").Dimensions("AvailabilityZone", "LoadBalancer"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancer").withValue("app/myLB/123")),
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("b"), new Dimension().withName("LoadBalancer").withValue("app/myLB/123")),
-            new Metric().withDimensions(new Dimension().withName("AvailabilityZone").withValue("a"), new Dimension().withName("LoadBalancer").withValue("app/myOtherLB/456"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancer").value("app/myLB/123").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("b").build(), Dimension.builder().name("LoadBalancer").value("app/myLB/123").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancer").value("app/myOtherLB/456").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ApplicationELB").MetricName("RequestCount").Dimension("AvailabilityZone", "a").Dimension("LoadBalancer", "app/myLB/123"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ApplicationELB").MetricName("RequestCount").Dimension("AvailabilityZone", "b").Dimension("LoadBalancer", "app/myLB/123"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/ApplicationELB").MetricName("RequestCount").Dimension("AvailabilityZone", "a").Dimension("LoadBalancer", "app/myOtherLB/456"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(4.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(4.0).build()).build());
     
     assertEquals(2.0, registry.getSampleValue("aws_applicationelb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer"}, new String[]{"aws_applicationelb", "", "a", "app/myLB/123"}), .01);
     assertEquals(3.0, registry.getSampleValue("aws_applicationelb_request_count_average", new String[]{"job", "instance", "availability_zone", "load_balancer"}, new String[]{"aws_applicationelb", "", "b", "app/myLB/123"}), .01);
@@ -562,29 +560,30 @@ public void testTagSelectUsesPaginationToken() throws Exception {
 
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().ResourceTypeFilter("ec2:instance").TagFilter("Monitoring", Arrays.asList("enabled")))))
-        .thenReturn(new GetResourcesResult().withPaginationToken("ABC").withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1")));
+        .thenReturn(GetResourcesResponse.builder().paginationToken("ABC").resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1").build()).build());
     
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().PaginationToken("ABC").ResourceTypeFilter("ec2:instance").TagFilter("Monitoring", Arrays.asList("enabled")))))
-        .thenReturn(new GetResourcesResult().withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2")));
+        .thenReturn(GetResourcesResponse.builder().resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2").build()).build());
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimensions("InstanceId"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-1")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-2"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-2").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-1"}), .01);
     assertEquals(3.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-2"}), .01);
@@ -601,19 +600,20 @@ public void testNoSelection() throws Exception {
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimensions("InstanceId"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-1")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-2"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-2").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-1"}), .01);
     assertEquals(3.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-2"}), .01);
@@ -628,25 +628,26 @@ public void testMultipleSelection() throws Exception {
     
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().ResourceTypeFilter("ec2:instance").TagFilter("Monitoring", Arrays.asList("enabled")))))
-        .thenReturn(new GetResourcesResult().withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1"),
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2")));
+        .thenReturn(GetResourcesResponse.builder().resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1").build(),
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2").build()).build());
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimensions("InstanceId"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-1")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-2"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-2").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-1"}), .01);
     assertNull(registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-2"}));
@@ -663,31 +664,32 @@ public void testOptionalTagSelection() throws Exception {
     
     Mockito.when(taggingClient.getResources((GetResourcesRequest)argThat(
         new GetResourcesRequestMatcher().ResourceTypeFilter("ec2:instance"))))
-        .thenReturn(new GetResourcesResult().withResourceTagMappingList(
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1"),
-            new ResourceTagMapping().withTags(new Tag().withKey("Monitoring").withValue("enabled")).withResourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2")));
+        .thenReturn(GetResourcesResponse.builder().resourceTagMappingList(
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-1").build(),
+            ResourceTagMapping.builder().tags(Tag.builder().key("Monitoring").value("enabled").build()).resourceARN("arn:aws:ec2:us-east-1:121212121212:instance/i-2").build()).build());
     
     Mockito.when(cloudWatchClient.listMetrics((ListMetricsRequest)argThat(
         new ListMetricsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimensions("InstanceId"))))
-        .thenReturn(new ListMetricsResult().withMetrics(
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-1")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-2")),
-            new Metric().withDimensions(new Dimension().withName("InstanceId").withValue("i-no-tag"))));
+        .thenReturn(ListMetricsResponse.builder().metrics(
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-1").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-2").build()).build(),
+            Metric.builder().dimensions(Dimension.builder().name("InstanceId").value("i-no-tag").build()).build()
+            ).build());
 
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-1"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(2.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-2"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(3.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
     
     Mockito.when(cloudWatchClient.getMetricStatistics((GetMetricStatisticsRequest)argThat(
         new GetMetricStatisticsRequestMatcher().Namespace("AWS/EC2").MetricName("CPUUtilization").Dimension("InstanceId", "i-no-tag"))))
-        .thenReturn(new GetMetricStatisticsResult().withDatapoints(
-            new Datapoint().withTimestamp(new Date()).withAverage(4.0)));
+        .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+            Datapoint.builder().timestamp(new Date().toInstant()).average(4.0).build()).build());
 
     assertEquals(2.0, registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-1"}), .01);
     assertNull(registry.getSampleValue("aws_ec2_cpuutilization_average", new String[]{"job", "instance", "instance_id"}, new String[]{"aws_ec2", "", "i-2"}));
@@ -704,19 +706,20 @@ public void testNotRecentlyActive() throws Exception {
 
     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"))));
+            .thenReturn(ListMetricsResponse.builder().metrics(
+                    Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build()).build(),
+                    Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("a").build(), Dimension.builder().name("LoadBalancerName").value("myLB").build(), Dimension.builder().name("ThisExtraDimensionIsIgnored").value("dummy").build()).build(),
+                    Metric.builder().dimensions(Dimension.builder().name("AvailabilityZone").value("b").build(), Dimension.builder().name("LoadBalancerName").value("myOtherLB").build()).build()
+                    ).build());
 
     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)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(new Date().toInstant()).average(2.0).build()).build());
     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)));
+            .thenReturn(GetMetricStatisticsResponse.builder().datapoints(
+                    Datapoint.builder().timestamp(new Date().toInstant()).average(3.0).build()).build());
 
     registry.getSampleValue("aws_elb_request_count_average", new String[]{"job", "instance"}, new String[]{"aws_elb", ""});