Merge pull request aws#710 from gauravbrills/master

aws#701 Added ClientConfiguration to Cloud Watch Metrics configurations
ilmarmors · May 31, 2016 · 7f81841 · 7f81841
2 parents 4a9fe14 + 4047754
commit 7f81841
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/...trics/src/main/java/com/amazonaws/metrics/internal/cloudwatch/CloudWatchMetricConfig.java b/...trics/src/main/java/com/amazonaws/metrics/internal/cloudwatch/CloudWatchMetricConfig.java
@@ -17,6 +17,7 @@
 
 import org.apache.http.annotation.NotThreadSafe;
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.metrics.AwsSdkMetrics;
 
@@ -78,6 +79,9 @@ public class CloudWatchMetricConfig {
 
     /** Credentials for the uploader to communicate with Amazon CloudWatch */
     private AWSCredentialsProvider credentialsProvider;
+
+    /** ClientConfiguration for connecting to Amazon CloudWatch */
+    private ClientConfiguration clientConfiguration;
 
     /**
      * Number of milliseconds to wait before the polling of the metrics queue
@@ -109,7 +113,28 @@ public void setCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
         this.credentialsProvider = credentialsProvider;
     }
 
-    public CloudWatchMetricConfig withCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
+    /**
+     * Returns the Client Configuration used to connect to
+     * Amazon CloudWatch.
+     */
+    public ClientConfiguration getClientConfiguration() {
+		return clientConfiguration;
+	}
+
+    /**
+     * Sets the Client Configuration. This client
+     * configuration is used by the uploader thread to connect to Amazon CloudWatch.
+     */
+	public void setClientConfiguration(ClientConfiguration clientConfiguration) {
+		this.clientConfiguration = clientConfiguration;
+	}
+
+	public CloudWatchMetricConfig withClientConfiguration(ClientConfiguration clientConfiguration) {
+		setClientConfiguration(clientConfiguration);
+        return this;
+    }
+
+	public CloudWatchMetricConfig withCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
         setCredentialsProvider(credentialsProvider);
         return this;
     }

diff --git a/...rc/main/java/com/amazonaws/metrics/internal/cloudwatch/DefaultMetricCollectorFactory.java b/...rc/main/java/com/amazonaws/metrics/internal/cloudwatch/DefaultMetricCollectorFactory.java
@@ -14,6 +14,7 @@
  */
 package com.amazonaws.metrics.internal.cloudwatch;
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.SDKGlobalConfiguration;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.metrics.AwsSdkMetrics;
@@ -39,6 +40,7 @@ public MetricCollector getInstance() {
         Integer qSize = AwsSdkMetrics.getMetricQueueSize();
         Long timeoutMilli = AwsSdkMetrics.getQueuePollTimeoutMilli();
         CloudWatchMetricConfig config = new CloudWatchMetricConfig();
+        ClientConfiguration clientConfig = new ClientConfiguration();
         if (provider != null)
             config.setCredentialsProvider(provider);
         if (region != null) {
@@ -49,6 +51,7 @@ public MetricCollector getInstance() {
             config.setMetricQueueSize(qSize.intValue());
         if (timeoutMilli != null)
             config.setQueuePollTimeoutMilli(timeoutMilli.longValue());
+        config.setClientConfiguration(clientConfig);
         MetricCollectorSupport.startSingleton(config);
         return MetricCollectorSupport.getInstance();
     }

diff --git a/...metrics/src/main/java/com/amazonaws/metrics/internal/cloudwatch/MetricUploaderThread.java b/...metrics/src/main/java/com/amazonaws/metrics/internal/cloudwatch/MetricUploaderThread.java
@@ -39,11 +39,24 @@ class MetricUploaderThread extends Thread {
             BlockingQueue<MetricDatum> queue) {
         this(config,
              queue,
-             config.getCredentialsProvider() == null
-             ? new AmazonCloudWatchClient()
-             : new AmazonCloudWatchClient(config.getCredentialsProvider()));
+             createCloudWatchClient(config));
     }
 
+	private static AmazonCloudWatchClient createCloudWatchClient(CloudWatchMetricConfig config) {
+		AmazonCloudWatchClient amazonCloudWatchClient = null;
+		if (config.getCredentialsProvider() == null && config.getClientConfiguration() == null) {
+			amazonCloudWatchClient = new AmazonCloudWatchClient();
+		} else if (config.getCredentialsProvider() != null && config.getClientConfiguration() == null) {
+			amazonCloudWatchClient = new AmazonCloudWatchClient(config.getCredentialsProvider());
+		} else if (config.getClientConfiguration() != null && config.getCredentialsProvider() == null) {
+			amazonCloudWatchClient = new AmazonCloudWatchClient(config.getClientConfiguration());
+		} else if (config.getClientConfiguration() != null && config.getCredentialsProvider() != null) {
+			amazonCloudWatchClient = new AmazonCloudWatchClient(config.getCredentialsProvider(),
+					config.getClientConfiguration());
+		}
+		return amazonCloudWatchClient;
+	}
+
     MetricUploaderThread(CloudWatchMetricConfig config,
         BlockingQueue<MetricDatum> queue,
         AmazonCloudWatchClient client)