Merge pull request #6 from Appdynamics/aws-commons-update

Aws commons update to 2.2.0
Appdynamics · Feb 11, 2020 · 53366f4 · 53366f4
2 parents 989d9e4 + 60013dc
commit 53366f4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
+### 2.0.2
+    1. Updated aws-cloudwatch-exts-commons 2.0.0 to 2.2.0
+### 2.0.1 - March 22, 2019
+    1. Updated the aws-cloudwatch-exts-commons to 2.0.1.1 from 2.0.0
+
 ### 2.0.0 - August 10, 2018
     1. Porting to aws-cloudwatch-exts-commons 2.0.1
     2. Moved all the region-endpoints into config.yml
     3. Covered tests
     4. Updated readme as per the guidelines.
 
-### 2.0.1 - March 22, 2019
-    1. Updated the aws-cloudwatch-exts-commons to 2.0.1.1 from 2.0.0
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # AWS Lambda Monitoring Extension
 
 ## Use Case
-AWS LAmbda Monitoring Extension captures Lambda statistics from Amazon CloudWatch and displays them in the AppDynamics Metric Browser.
+AWS Lambda Monitoring Extension captures Lambda statistics from Amazon CloudWatch and displays them in the AppDynamics Metric Browser.
 **Note : By default, the Machine agent can only send a fixed number of metrics to the controller. This extension potentially reports thousands of metrics, so to change this limit, please follow the instructions mentioned [here](https://docs.appdynamics.com/display/PRO40/Metrics+Limits).**
 
 ## Prerequisites
@@ -12,8 +12,13 @@ Please give the following permissions to the account being used to with the exte
   **cloudwatch:GetMetricStatistics**
 ```
 In order to use this extension, you do need a [Standalone JAVA Machine Agent](https://docs.appdynamics.com/display/PRO44/Standalone+Machine+Agents) or [SIM Agent](https://docs.appdynamics.com/display/PRO44/Server+Visibility).  For more details on downloading these products, please  visit [here](https://download.appdynamics.com/).
-The extension needs to be able to connect to the HAProxy in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics.
+The extension needs to be able to connect to the AWS Lamda in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics.
 
+**Note : This extension is compatible with Machine Agent version 4.5.13 or later.
+
+* If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs to httpclient-4.5.9 and httpcore-4.4.12 to make this warning go away.                                                                                                            
+* To make AWS extensions work on Machine Agent < 4.5.13: 
+  The http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs has to be manually be updated to httpclient-4.5.9 and httpcore-4.4.12
 
 ## Installation
 1. Run 'mvn clean install' from aws-lambda-monitoring-extension
@@ -215,8 +220,8 @@ Always feel free to fork and contribute any changes directly here on [GitHub](ht
 ## Version
    |          Name            |  Version   |
    |--------------------------|------------|
-   |Extension Version         |2.0.1       |
+   |Extension Version         |2.0.2      |
    |Controller Compatibility  |4.4 or Later|
-   |Last Update               |22nd Mar, 2019 |
-
+   |Agent Compatibility        | 4.5.13 or later|
+   |Last Update               |04 Feb, 2020 |
 List of changes to this extension can be found [here](https://github.com/Appdynamics/aws-lambda-monitoring-extension/blob/master/CHANGELOG.md)
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>aws-lambda-monitoring-extension</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <name>AWS Lambda Monitoring Extension</name>
 
     <properties>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.appdynamics.extensions</groupId>
             <artifactId>aws-cloudwatch-exts-commons</artifactId>
-            <version>2.0.1.1</version>
+            <version>2.2.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java b/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java
@@ -14,6 +14,11 @@
 import com.appdynamics.extensions.aws.metric.processors.MetricsProcessor;
 import org.apache.log4j.Logger;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import static com.appdynamics.extensions.aws.Constants.METRIC_PATH_SEPARATOR;
 
 /**
@@ -43,10 +48,12 @@ public String getMonitorName() {
     }
 
     @Override
-    protected int getTaskCount() {
-        return 3;
+    protected List<Map<String, ?>> getServers() {
+        Map<String, String> serversMap = new HashMap<String, String>();
+        List<Map<String, ?>> serversList = new ArrayList<Map<String, ?>>();
+        serversList.add(serversMap);
+        return serversList;
     }
-
     @Override
     protected NamespaceMetricStatisticsCollector getNamespaceMetricsCollector(Configuration config) {
         MetricsProcessor metricsProcessor = createMetricsProcessor(config);