From 5237bc6ea1659192888f1dc7d2570a19eed60bd1 Mon Sep 17 00:00:00 2001
From: Slava Markeyev <slavamarkeyev@gmail.com>
Date: Wed, 23 May 2018 18:48:42 -0700
Subject: [PATCH] Update to using AmazonCloudWatch client (#73)

---
 .../bender/monitoring/cw/CloudwatchReporter.java      |  7 +++----
 .../monitoring/cw/CloudwatchReporterFactory.java      | 11 +++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporter.java b/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporter.java
index c00f6d1d..ded944c1 100644
--- a/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporter.java
+++ b/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporter.java
@@ -23,8 +23,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.ListUtils;
-
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
+import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
 import com.amazonaws.services.cloudwatch.model.Dimension;
 import com.amazonaws.services.cloudwatch.model.MetricDatum;
 import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest;
@@ -38,11 +37,11 @@
  * Writes metrics to Amazon Cloudwatch.
  */
 public class CloudwatchReporter implements Reporter {
-  private final AmazonCloudWatchClient client;
+  private final AmazonCloudWatch client;
   private final String namespace;
   private final List<StatFilter> statFilters;
 
-  public CloudwatchReporter(AmazonCloudWatchClient client, final String namespace,
+  public CloudwatchReporter(AmazonCloudWatch client, final String namespace,
       final List<StatFilter> statFilters) {
     this.client = client;
     this.namespace = namespace;
diff --git a/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporterFactory.java b/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporterFactory.java
index a0ea5a7f..5a9e5df3 100644
--- a/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporterFactory.java
+++ b/reporters/src/main/java/com/nextdoor/bender/monitoring/cw/CloudwatchReporterFactory.java
@@ -15,7 +15,8 @@
 
 package com.nextdoor.bender.monitoring.cw;
 
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
+import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
 import com.nextdoor.bender.config.AbstractConfig;
 import com.nextdoor.bender.monitoring.ReporterFactory;
 
@@ -24,16 +25,18 @@
  */
 public class CloudwatchReporterFactory implements ReporterFactory {
   private CloudwatchReporterConfig config;
-  private AmazonCloudWatchClient client;
+  private AmazonCloudWatch client;
 
   @Override
   public void setConf(AbstractConfig config) {
     this.config = (CloudwatchReporterConfig) config;
-    this.client = new AmazonCloudWatchClient();
+    AmazonCloudWatchClientBuilder clientBuilder = AmazonCloudWatchClientBuilder.standard();
 
     if (this.config.getRegion() != null) {
-      this.client = this.client.withRegion(this.config.getRegion());
+      clientBuilder.withRegion(this.config.getRegion());
     }
+
+    this.client = clientBuilder.build();
   }
 
   @Override